diff --git a/BUILD.bazel b/BUILD.bazel
index 2bf69ec03d3..cc2c901c880 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -242,6 +242,19 @@ swift_syntax_library(
     ],
 )
 
+swift_syntax_library(
+    name = "SwiftSyntaxMacrosGenericTestSupport",
+    testonly = True,
+    deps = [
+        ":SwiftDiagnostics",
+        ":SwiftIDEUtils",
+        ":SwiftParser",
+        ":SwiftSyntaxMacroExpansion",
+        ":SwiftSyntaxMacros",
+        ":_SwiftSyntaxGenericTestSupport",
+    ],
+)
+
 swift_syntax_library(
     name = "SwiftSyntaxMacrosTestSupport",
     testonly = True,
@@ -251,6 +264,7 @@ swift_syntax_library(
         ":SwiftParser",
         ":SwiftSyntaxMacroExpansion",
         ":SwiftSyntaxMacros",
+        ":SwiftSyntaxMacrosGenericTestSupport",
         ":_SwiftSyntaxTestSupport",
     ],
 )
@@ -299,6 +313,13 @@ cc_library(
     visibility = ["//visibility:private"],
 )
 
+swift_syntax_library(
+    name = "_SwiftSyntaxGenericTestSupport",
+    testonly = True,
+    deps = [
+    ],
+)
+
 swift_syntax_library(
     name = "_SwiftSyntaxTestSupport",
     testonly = True,
@@ -307,6 +328,7 @@ swift_syntax_library(
         ":SwiftSyntax",
         ":SwiftSyntaxBuilder",
         ":SwiftSyntaxMacroExpansion",
+        ":_SwiftSyntaxGenericTestSupport",
     ],
 )