3 files changed, 46 insertions, 1 deletions
diff --git a/tools/BUILD b/tools/BUILD
index 619257122f..c69f44e8f4 100644
--- a/tools/BUILD
+++ b/tools/BUILD
@@ -66,7 +66,7 @@ filegroup(
         "//tools/objc:srcs",
         "//tools/python:embedded_tools",
         "//tools/runfiles:embedded_tools",
-        "//tools/test:srcs",
+        "//tools/test:embedded_tools",
         "//tools/test/LcovMerger/java/com/google/devtools/lcovmerger:embedded_tools",
         "//tools/osx/crosstool:srcs",
         "//tools/osx:srcs",
diff --git a/tools/test/BUILD b/tools/test/BUILD
index c6a8311033..59c872e8b2 100644
--- a/tools/test/BUILD
+++ b/tools/test/BUILD
@@ -37,3 +37,14 @@ filegroup(
     name = "srcs",
     srcs = glob(["**"]),
 )
+
+filegroup(
+    name = "embedded_tools",
+    srcs = [
+        "BUILD.tools",
+        "test-setup.sh",
+        "generate-xml.sh",
+        "collect_coverage.sh",
+    ] + glob(["LcovMerger/**"]),
+    visibility = ["//tools:__pkg__"],
+)
diff --git a/tools/test/BUILD.tools b/tools/test/BUILD.tools
new file mode 100644
index 0000000000..5e4e5f55dc
--- /dev/null
+++ b/tools/test/BUILD.tools
@@ -0,0 +1,34 @@
+package(default_visibility = ["//visibility:public"])
+
+# Members of this filegroup shouldn't have duplicate basenames, otherwise
+# TestRunnerAction#getRuntimeArtifact() will get confused.
+# Deprecated, do not use.
+filegroup(
+    name = "runtime",
+    srcs = ["test-setup.sh"],
+)
+
+filegroup(
+    name = "test_setup",
+    srcs = ["test-setup.sh"],
+)
+
+filegroup(
+    name = "test_xml_generator",
+    srcs = ["generate-xml.sh"],
+)
+
+filegroup(
+    name = "collect_coverage",
+    srcs = ["collect_coverage.sh"],
+)
+
+filegroup(
+    name = "coverage_support",
+    srcs = ["collect_coverage.sh"],
+)
+
+filegroup(
+    name = "coverage_report_generator",
+    srcs = ["@bazel_tools//tools/test/LcovMerger/java/com/google/devtools/lcovmerger:Main"],
+)