2 files changed, 21 insertions, 3 deletions
diff --git a/tools/build_defs/apple/BUILD b/tools/build_defs/apple/BUILD
index 4c1f6ab112..f102fef3b1 100644
--- a/tools/build_defs/apple/BUILD
+++ b/tools/build_defs/apple/BUILD
@@ -2,6 +2,24 @@ package(default_visibility = ["//visibility:public"])
 
 filegroup(
     name = "srcs",
-    srcs = glob(["*.bzl"]) + ["BUILD"],
-    visibility = ["//tools:__pkg__"],
+    srcs = glob(["*.bzl"]) + [
+        "BUILD",
+        "//tools/build_defs/apple/test:srcs",
+    ],
+    visibility = ["//tools/build_defs:__pkg__"],
+)
+
+test_suite(
+    name = "windows_tests",
+    tags = [
+        "-no_windows",
+        "-slow",
+    ],
+    visibility = ["//visibility:private"],
+)
+
+test_suite(
+    name = "all_windows_tests",
+    tests = [":windows_tests"],
+    visibility = ["//tools/build_defs:__pkg__"],
 )
diff --git a/tools/build_defs/apple/test/BUILD b/tools/build_defs/apple/test/BUILD
index 053bb1652a..8729718f21 100644
--- a/tools/build_defs/apple/test/BUILD
+++ b/tools/build_defs/apple/test/BUILD
@@ -3,6 +3,6 @@ filegroup(
     srcs = glob(["**"]),
     visibility = [
         "//src/test/shell/bazel/apple:__pkg__",
-        "//tools:__pkg__",
+        "//tools/build_defs/apple:__pkg__",
     ],
 )