diff --git a/BUILD b/BUILD
index 2a10be9..5a8aa17 100644
--- a/BUILD
+++ b/BUILD
@@ -1,5 +1,3 @@
-package(default_visibility = ["//visibility:public"])
-
 licenses(["notice"])
 
 exports_files(["LICENSE"])
@@ -14,4 +12,8 @@ filegroup(
         "@build_bazel_apple_support//rules:for_bazel_tests",
         "@build_bazel_apple_support//tools:for_bazel_tests",
     ],
+    # Exposed publicly just so other rules can use this if they set up
+    # integration tests that need to copy all the support files into
+    # a temporary workspace for the tests.
+    visibility = ["//visibility:public"],
 )
diff --git a/lib/BUILD b/lib/BUILD
index ce8483b..a1630b9 100644
--- a/lib/BUILD
+++ b/lib/BUILD
@@ -1,10 +1,9 @@
 licenses(["notice"])
 
-package(default_visibility = ["//visibility:public"])
-
 # Consumed by bazel tests.
 filegroup(
     name = "for_bazel_tests",
     testonly = 1,
     srcs = glob(["**"]),
+    visibility = ["//:__pkg__"],
 )
diff --git a/rules/BUILD b/rules/BUILD
index ce8483b..a1630b9 100644
--- a/rules/BUILD
+++ b/rules/BUILD
@@ -1,10 +1,9 @@
 licenses(["notice"])
 
-package(default_visibility = ["//visibility:public"])
-
 # Consumed by bazel tests.
 filegroup(
     name = "for_bazel_tests",
     testonly = 1,
     srcs = glob(["**"]),
+    visibility = ["//:__pkg__"],
 )
diff --git a/tools/BUILD b/tools/BUILD
index ec83a38..1572a73 100644
--- a/tools/BUILD
+++ b/tools/BUILD
@@ -1,14 +1,18 @@
 licenses(["notice"])
 
-package(default_visibility = ["//visibility:public"])
-
 # Additional files, such as tools, that should be present in a test's runfiles
 # during coverage collection.
-filegroup(name = "coverage_support")
+filegroup(
+    name = "coverage_support",
+    # Public so other rules can add the dependencies via this group.
+    visibility = ["//visibility:public"],
+)
 
 sh_binary(
     name = "xcode_path_wrapper",
     srcs = ["xcode_path_wrapper.sh"],
+    # Added to rules as a private attribute, so it needs to be public.
+    visibility = ["//visibility:public"],
 )
 
 # Consumed by bazel tests.
@@ -16,4 +20,5 @@ filegroup(
     name = "for_bazel_tests",
     testonly = 1,
     srcs = glob(["**"]),
+    visibility = ["//:__pkg__"],
 )