diff --git a/csharp/BUILD.bazel b/csharp/BUILD.bazel
index fbe4213ab9e1..49293c27095e 100644
--- a/csharp/BUILD.bazel
+++ b/csharp/BUILD.bazel
@@ -74,8 +74,10 @@ test_suite(
     name = "unit-tests",
     tags = ["csharp"],
     tests = [
-        "//csharp/autobuilder/Semmle.Autobuild.CSharp.Tests",
-        "//csharp/autobuilder/Semmle.Autobuild.Cpp.Tests",
-        "//csharp/extractor/Semmle.Extraction.Tests",
+        "//csharp/autobuilder/Semmle.Autobuild.CSharp.Tests:acst",
+        "//csharp/autobuilder/Semmle.Autobuild.Cpp.Tests:acpt",
+        "//csharp/extractor/Semmle.Extraction.Tests:et",
+        # this test suite currently fails, disable for now
+        # "//csharp/extractor/Semmle.Util.Tests:ut",
     ],
 )
diff --git a/csharp/autobuilder/Semmle.Autobuild.CSharp.Tests/BUILD.bazel b/csharp/autobuilder/Semmle.Autobuild.CSharp.Tests/BUILD.bazel
index 65371c893932..67f3470712dd 100644
--- a/csharp/autobuilder/Semmle.Autobuild.CSharp.Tests/BUILD.bazel
+++ b/csharp/autobuilder/Semmle.Autobuild.CSharp.Tests/BUILD.bazel
@@ -4,7 +4,8 @@ load(
 )
 
 codeql_xunit_test(
-    name = "Semmle.Autobuild.CSharp.Tests",
+    # short name as we run into long path limitations on Windows
+    name = "acst",
     srcs = glob([
         "*.cs",
     ]),
diff --git a/csharp/autobuilder/Semmle.Autobuild.Cpp.Tests/BUILD.bazel b/csharp/autobuilder/Semmle.Autobuild.Cpp.Tests/BUILD.bazel
index 10c8c6dc96c1..ad8f6e3d1f1a 100644
--- a/csharp/autobuilder/Semmle.Autobuild.Cpp.Tests/BUILD.bazel
+++ b/csharp/autobuilder/Semmle.Autobuild.Cpp.Tests/BUILD.bazel
@@ -4,7 +4,8 @@ load(
 )
 
 codeql_xunit_test(
-    name = "Semmle.Autobuild.Cpp.Tests",
+    # short name as we run into long path limitations on Windows
+    name = "acpt",
     srcs = glob([
         "*.cs",
     ]),
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/BUILD.bazel b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/BUILD.bazel
index 8be8aaa8408b..96ecccc31aa0 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/BUILD.bazel
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/BUILD.bazel
@@ -10,7 +10,7 @@ codeql_csharp_library(
         "SourceGenerators/**/*.cs",
     ]),
     allow_unsafe_blocks = True,
-    internals_visible_to = ["Semmle.Extraction.Tests"],
+    internals_visible_to = ["et"],
     visibility = ["//csharp:__subpackages__"],
     deps = [
         "//csharp/extractor/Semmle.Extraction.CSharp",
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.StubGenerator/BUILD.bazel b/csharp/extractor/Semmle.Extraction.CSharp.StubGenerator/BUILD.bazel
index 563168cdf480..a2c5a0c1c540 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.StubGenerator/BUILD.bazel
+++ b/csharp/extractor/Semmle.Extraction.CSharp.StubGenerator/BUILD.bazel
@@ -8,7 +8,7 @@ codeql_csharp_library(
     srcs = glob([
         "*.cs",
     ]),
-    internals_visible_to = ["Semmle.Extraction.Tests"],
+    internals_visible_to = ["et"],
     visibility = ["//csharp:__subpackages__"],
     deps = [
         "//csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching",
diff --git a/csharp/extractor/Semmle.Extraction.Tests/BUILD.bazel b/csharp/extractor/Semmle.Extraction.Tests/BUILD.bazel
index df9799d3f959..4d13f7f4fb82 100644
--- a/csharp/extractor/Semmle.Extraction.Tests/BUILD.bazel
+++ b/csharp/extractor/Semmle.Extraction.Tests/BUILD.bazel
@@ -4,7 +4,8 @@ load(
 )
 
 codeql_xunit_test(
-    name = "Semmle.Extraction.Tests",
+    # short name as we run into long path limitations on Windows
+    name = "et",
     srcs = glob([
         "*.cs",
     ]),
diff --git a/csharp/extractor/Semmle.Util.Tests/BUILD.bazel b/csharp/extractor/Semmle.Util.Tests/BUILD.bazel
index 6c3fb64e662c..5fde4efdb153 100644
--- a/csharp/extractor/Semmle.Util.Tests/BUILD.bazel
+++ b/csharp/extractor/Semmle.Util.Tests/BUILD.bazel
@@ -4,7 +4,8 @@ load(
 )
 
 codeql_xunit_test(
-    name = "Semmle.Util.Tests",
+    # short name as we run into long path limitations on Windows
+    name = "ut",
     srcs = glob([
         "*.cs",
     ]),