diff --git a/core/java/androidx/test/core/BUILD b/core/java/androidx/test/core/BUILD
index a681b04de..85c55351b 100644
--- a/core/java/androidx/test/core/BUILD
+++ b/core/java/androidx/test/core/BUILD
@@ -30,7 +30,6 @@ licenses(["notice"])
 # for the bootstrap activities
 android_library(
     name = "manifest",
-    testonly = 0,
     exports_manifest = 1,
     manifest = "AndroidManifest.xml",
     resource_files = glob(["res/**"]),
@@ -38,7 +37,6 @@ android_library(
 
 kt_android_library(
     name = "core_internal",
-    testonly = 0,
     srcs = glob(
         [
             "**/*.java",
@@ -67,7 +65,6 @@ android_library(
 
 android_library(
     name = "core_not_test_only",
-    testonly = 0,
     visibility = ["//espresso/core/java/androidx/test/espresso:__subpackages__"],
     exports = [":core_internal"],
 )
diff --git a/espresso/contrib/java/androidx/test/espresso/contrib/BUILD b/espresso/contrib/java/androidx/test/espresso/contrib/BUILD
index 60f9b8786..80df262f1 100644
--- a/espresso/contrib/java/androidx/test/espresso/contrib/BUILD
+++ b/espresso/contrib/java/androidx/test/espresso/contrib/BUILD
@@ -70,7 +70,6 @@ COMMON_JAVACOPTS = [
 
 jetify_android_library(
     name = "recycler_view",
-    testonly = 0,
     srcs = ["RecyclerViewActions.java"],
     javacopts = COMMON_JAVACOPTS,
     jetify_sources = True,
diff --git a/espresso/core/java/androidx/test/espresso/BUILD b/espresso/core/java/androidx/test/espresso/BUILD
index 72c4a0770..fc3db03ab 100644
--- a/espresso/core/java/androidx/test/espresso/BUILD
+++ b/espresso/core/java/androidx/test/espresso/BUILD
@@ -67,7 +67,6 @@ INTERNAL_API_ANNOTATION = [
 
 android_library(
     name = "view-interaction",
-    testonly = 0,
     srcs = VIEW_INTERACTION,
     visibility = ["//visibility:private"],
     deps = [
@@ -102,7 +101,6 @@ ESPRESSO_GRAPH = [
 
 android_library(
     name = "espresso-graph",
-    testonly = 0,
     srcs = ESPRESSO_GRAPH,
     visibility = ["//visibility:private"],
     deps = [
@@ -123,7 +121,6 @@ android_library(
 
 android_library(
     name = "espresso",
-    testonly = 0,
     srcs = glob(
         ["*.java"],
         exclude = BASE_LAYER_INTERFACES + PUBLIC_FRAMEWORK_LAYER + ESPRESSO_GRAPH + VIEW_INTERACTION + INTERNAL_API_ANNOTATION,
@@ -173,7 +170,6 @@ android_library(
 
 android_library(
     name = "framework",
-    testonly = 0,
     srcs = PUBLIC_FRAMEWORK_LAYER,
     deps = [
         ":interface",
@@ -184,7 +180,6 @@ android_library(
 
 android_library(
     name = "interface",
-    testonly = 0,
     srcs = BASE_LAYER_INTERFACES,
     manifest = "AndroidManifest.xml",
     deps = [
diff --git a/espresso/core/java/androidx/test/espresso/action/BUILD b/espresso/core/java/androidx/test/espresso/action/BUILD
index 9f1e679bb..93de0c3f7 100644
--- a/espresso/core/java/androidx/test/espresso/action/BUILD
+++ b/espresso/core/java/androidx/test/espresso/action/BUILD
@@ -23,7 +23,6 @@ COMMON_JAVACOPTS = [
 
 android_library(
     name = "adapter_view_protocol",
-    testonly = 0,
     srcs = ADAPTER_VIEW_PROTOCOL,
     deps = [
         "//espresso/core/java/androidx/test/espresso/matcher",
@@ -35,7 +34,6 @@ android_library(
 
 kt_android_library(
     name = "action",
-    testonly = 0,
     srcs = glob(
         [
             "*.java",
diff --git a/espresso/core/java/androidx/test/espresso/assertion/BUILD b/espresso/core/java/androidx/test/espresso/assertion/BUILD
index b28a297b6..174cc2906 100644
--- a/espresso/core/java/androidx/test/espresso/assertion/BUILD
+++ b/espresso/core/java/androidx/test/espresso/assertion/BUILD
@@ -13,7 +13,6 @@ package(
 
 android_library(
     name = "assertion",
-    testonly = 0,
     srcs = glob(
         ["*.java"],
     ),
diff --git a/espresso/core/java/androidx/test/espresso/base/BUILD b/espresso/core/java/androidx/test/espresso/base/BUILD
index 2fbfaf56c..24c5fa01e 100644
--- a/espresso/core/java/androidx/test/espresso/base/BUILD
+++ b/espresso/core/java/androidx/test/espresso/base/BUILD
@@ -13,7 +13,6 @@ package(
 
 android_library(
     name = "base",
-    testonly = 0,
     srcs = glob(
         ["*.java"],
         exclude = [
@@ -62,7 +61,6 @@ android_library(
 
 android_library(
     name = "idling_resource_registry",
-    testonly = 0,
     srcs = [
         "IdleNotifier.java",
         "IdlingResourceRegistry.java",
@@ -82,7 +80,6 @@ android_library(
 
 android_library(
     name = "idling_uicontroller_interface",
-    testonly = 0,
     srcs = ["IdlingUiController.java"],
     deps = [
         ":idling_resource_registry",
@@ -92,7 +89,6 @@ android_library(
 
 android_library(
     name = "default_failure_handler",
-    testonly = 0,
     srcs = [
         "AssertionErrorHandler.java",
         "DefaultFailureHandler.java",
diff --git a/espresso/core/java/androidx/test/espresso/core/internal/deps/guava/base/BUILD b/espresso/core/java/androidx/test/espresso/core/internal/deps/guava/base/BUILD
index 775e6eb39..4c87d0b89 100644
--- a/espresso/core/java/androidx/test/espresso/core/internal/deps/guava/base/BUILD
+++ b/espresso/core/java/androidx/test/espresso/core/internal/deps/guava/base/BUILD
@@ -13,7 +13,6 @@ package(
 
 android_library(
     name = "base",
-    testonly = 0,
     srcs = glob(["*java"]),
     deps = [
         "//opensource/androidx:annotation",
diff --git a/espresso/core/java/androidx/test/espresso/internal/data/BUILD b/espresso/core/java/androidx/test/espresso/internal/data/BUILD
index 0cd8f37b6..e4be4a1b4 100644
--- a/espresso/core/java/androidx/test/espresso/internal/data/BUILD
+++ b/espresso/core/java/androidx/test/espresso/internal/data/BUILD
@@ -11,7 +11,6 @@ package(
 
 android_library(
     name = "data",
-    testonly = 0,
     srcs = glob([
         "*.java",
     ]),
diff --git a/espresso/core/java/androidx/test/espresso/internal/data/model/BUILD b/espresso/core/java/androidx/test/espresso/internal/data/model/BUILD
index d0f01b4f3..aef2ff83a 100644
--- a/espresso/core/java/androidx/test/espresso/internal/data/model/BUILD
+++ b/espresso/core/java/androidx/test/espresso/internal/data/model/BUILD
@@ -11,7 +11,6 @@ package(
 
 kt_android_library(
     name = "model",
-    testonly = 0,
     srcs = glob([
         "*.kt",
         "*.java",
diff --git a/espresso/core/java/androidx/test/espresso/internal/inject/BUILD b/espresso/core/java/androidx/test/espresso/internal/inject/BUILD
index f788bad99..cdaed60b0 100644
--- a/espresso/core/java/androidx/test/espresso/internal/inject/BUILD
+++ b/espresso/core/java/androidx/test/espresso/internal/inject/BUILD
@@ -12,7 +12,6 @@ licenses(["notice"])
 
 android_library(
     name = "inject",
-    testonly = 0,
     srcs = glob(["*java"]),
     visibility = [
         "//:__subpackages__",
diff --git a/espresso/core/java/androidx/test/espresso/matcher/BUILD b/espresso/core/java/androidx/test/espresso/matcher/BUILD
index 8a35c6ef8..12427b505 100644
--- a/espresso/core/java/androidx/test/espresso/matcher/BUILD
+++ b/espresso/core/java/androidx/test/espresso/matcher/BUILD
@@ -13,7 +13,6 @@ package(
 
 android_library(
     name = "matcher",
-    testonly = 0,
     srcs = glob(
         ["*.java"],
     ),
diff --git a/espresso/core/java/androidx/test/espresso/remote/BUILD b/espresso/core/java/androidx/test/espresso/remote/BUILD
index 633a9a3a4..f8436ae23 100644
--- a/espresso/core/java/androidx/test/espresso/remote/BUILD
+++ b/espresso/core/java/androidx/test/espresso/remote/BUILD
@@ -24,7 +24,6 @@ REMOTE_INTERFACES = [
 
 android_library(
     name = "interface",
-    testonly = 0,
     srcs = REMOTE_INTERFACES,
     visibility = ["//visibility:public"],
     deps = [
@@ -45,7 +44,6 @@ REFLECTION_UTILS = [
 
 android_library(
     name = "reflectionUtils",
-    testonly = 0,
     srcs = REFLECTION_UTILS,
     visibility = ["//visibility:public"],
     deps = [
@@ -57,7 +55,6 @@ android_library(
 
 android_library(
     name = "aidls",
-    testonly = 0,
     custom_package = "androidx.test.espresso.remote",
     idl_import_root = "idls",
     idl_srcs = glob(["idls/**"]),
@@ -75,7 +72,6 @@ REMOTE_EXCEPTIONS = [
 
 android_library(
     name = "exceptions",
-    testonly = 0,
     srcs = REMOTE_EXCEPTIONS,
     visibility = ["//visibility:public"],
     deps = [
@@ -89,6 +85,5 @@ BINDABLE = [
 
 android_library(
     name = "bindable",
-    testonly = 0,
     srcs = BINDABLE,
 )
diff --git a/espresso/core/java/androidx/test/espresso/remote/annotation/BUILD b/espresso/core/java/androidx/test/espresso/remote/annotation/BUILD
index 709a712c0..bfaadd8cb 100644
--- a/espresso/core/java/androidx/test/espresso/remote/annotation/BUILD
+++ b/espresso/core/java/androidx/test/espresso/remote/annotation/BUILD
@@ -20,7 +20,6 @@ REMOTE_MSG_ANNOTATIONS = [
 
 android_library(
     name = "remote_msg_annotations",
-    testonly = 0,
     srcs = REMOTE_MSG_ANNOTATIONS,
     visibility = ["//visibility:public"],
 )
diff --git a/espresso/core/java/androidx/test/espresso/util/BUILD b/espresso/core/java/androidx/test/espresso/util/BUILD
index 7285aa89b..9c6e3cbcd 100644
--- a/espresso/core/java/androidx/test/espresso/util/BUILD
+++ b/espresso/core/java/androidx/test/espresso/util/BUILD
@@ -13,7 +13,6 @@ package(
 
 kt_android_library(
     name = "util",
-    testonly = 0,
     srcs = glob([
         "*.java",
         "*.kt",
diff --git a/espresso/core/java/androidx/test/espresso/util/concurrent/BUILD b/espresso/core/java/androidx/test/espresso/util/concurrent/BUILD
index d77d64efc..8fbfec08d 100644
--- a/espresso/core/java/androidx/test/espresso/util/concurrent/BUILD
+++ b/espresso/core/java/androidx/test/espresso/util/concurrent/BUILD
@@ -13,7 +13,6 @@ package(
 
 android_library(
     name = "concurrent",
-    testonly = 0,
     srcs = glob([
         "*.java",
         "*.kt",
diff --git a/espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent/BUILD b/espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent/BUILD
index bb53ad30b..ee67762b7 100644
--- a/espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent/BUILD
+++ b/espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent/BUILD
@@ -17,7 +17,6 @@ licenses(["notice"])
 
 android_library(
     name = "scheduled_thread_pool_idling_resource",
-    testonly = 0,
     srcs = [
         "IdlingScheduledThreadPoolExecutor.java",
     ],
@@ -29,7 +28,6 @@ android_library(
 
 android_library(
     name = "thread_pool_idling_resource",
-    testonly = 0,
     srcs = [
         "IdlingThreadPoolExecutor.java",
     ],
@@ -41,7 +39,6 @@ android_library(
 
 android_library(
     name = "idling_concurrent",
-    testonly = 0,
     srcs = [
         "IdlingScheduledThreadPoolExecutor.java",
         "IdlingThreadPoolExecutor.java",
diff --git a/espresso/idling_resource/java/androidx/test/espresso/BUILD b/espresso/idling_resource/java/androidx/test/espresso/BUILD
index a9a84c99f..1076ccbcf 100644
--- a/espresso/idling_resource/java/androidx/test/espresso/BUILD
+++ b/espresso/idling_resource/java/androidx/test/espresso/BUILD
@@ -25,7 +25,6 @@ IDLING_INTERFACE = [
 
 java_library(
     name = "idling_resource_internal",
-    testonly = 0,
     srcs = IDLING_INTERFACE,
     visibility = [
         "//:__subpackages__",
@@ -36,13 +35,11 @@ java_library(
 
 alias(
     name = "idling_resource",
-    testonly = 0,
     actual = "//espresso/idling_resource/java/androidx/test/espresso:idling_resource_internal",
 )
 
 alias(
     name = "counting_idling_resource",
-    testonly = 0,
     actual = "//espresso/idling_resource/java/androidx/test/espresso:idling_resource_internal",
 )
 
@@ -53,7 +50,6 @@ alias(
 
 alias(
     name = "thread_pool_idling_resource",
-    testonly = 0,
     actual = "//espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent:thread_pool_idling_resource",
 )
 
diff --git a/espresso/idling_resource/net/java/androidx/test/espresso/idling/net/BUILD b/espresso/idling_resource/net/java/androidx/test/espresso/idling/net/BUILD
index 401126512..9e2a5b89d 100644
--- a/espresso/idling_resource/net/java/androidx/test/espresso/idling/net/BUILD
+++ b/espresso/idling_resource/net/java/androidx/test/espresso/idling/net/BUILD
@@ -16,7 +16,6 @@ package(
 
 android_library(
     name = "uri_idling_resource",
-    testonly = 0,
     srcs = ["UriIdlingResource.java"],
     manifest = "AndroidManifest.xml",
     visibility = ["//visibility:public"],
diff --git a/espresso/remote/java/androidx/test/espresso/proto/BUILD b/espresso/remote/java/androidx/test/espresso/proto/BUILD
index c85e461f1..467d29f2d 100644
--- a/espresso/remote/java/androidx/test/espresso/proto/BUILD
+++ b/espresso/remote/java/androidx/test/espresso/proto/BUILD
@@ -14,7 +14,6 @@ package(
 
 proto_library(
     name = "ui_interaction_proto",
-    testonly = 0,
     srcs = ["ui_interaction.proto"],
     deps = [
         "@com_google_protobuf//:any_proto",
diff --git a/espresso/remote/java/androidx/test/espresso/proto/action/BUILD b/espresso/remote/java/androidx/test/espresso/proto/action/BUILD
index fbfc7138a..687104c33 100644
--- a/espresso/remote/java/androidx/test/espresso/proto/action/BUILD
+++ b/espresso/remote/java/androidx/test/espresso/proto/action/BUILD
@@ -14,7 +14,6 @@ package(
 
 proto_library(
     name = "view_actions_proto",
-    testonly = 0,
     srcs = ["view_actions.proto"],
     deps = [
         "@com_google_protobuf//:any_proto",
@@ -28,7 +27,6 @@ java_lite_proto_library(
 
 java_library(
     name = "package-info",
-    testonly = 0,
     srcs = ["package-info.java"],
     deps = [
         "//opensource/androidx:annotation",
diff --git a/espresso/remote/java/androidx/test/espresso/proto/assertion/BUILD b/espresso/remote/java/androidx/test/espresso/proto/assertion/BUILD
index 4d432efa5..6de80e787 100644
--- a/espresso/remote/java/androidx/test/espresso/proto/assertion/BUILD
+++ b/espresso/remote/java/androidx/test/espresso/proto/assertion/BUILD
@@ -14,7 +14,6 @@ package(
 
 proto_library(
     name = "view_assertions_proto",
-    testonly = 0,
     srcs = ["view_assertions.proto"],
     deps = [
         "@com_google_protobuf//:any_proto",
@@ -28,7 +27,6 @@ java_lite_proto_library(
 
 java_library(
     name = "package-info",
-    testonly = 0,
     srcs = ["package-info.java"],
     deps = [
         "//opensource/androidx:annotation",
diff --git a/espresso/remote/java/androidx/test/espresso/proto/matcher/BUILD b/espresso/remote/java/androidx/test/espresso/proto/matcher/BUILD
index 2e5f73c87..07ea38f54 100644
--- a/espresso/remote/java/androidx/test/espresso/proto/matcher/BUILD
+++ b/espresso/remote/java/androidx/test/espresso/proto/matcher/BUILD
@@ -14,7 +14,6 @@ package(
 
 proto_library(
     name = "root_matchers_proto",
-    testonly = 0,
     srcs = ["root_matchers.proto"],
     deps = [
         "@com_google_protobuf//:any_proto",
@@ -28,7 +27,6 @@ java_lite_proto_library(
 
 proto_library(
     name = "view_matchers_proto",
-    testonly = 0,
     srcs = ["view_matchers.proto"],
     deps = [
         "@com_google_protobuf//:any_proto",
@@ -42,7 +40,6 @@ java_lite_proto_library(
 
 proto_library(
     name = "hamcrest_matchersv1_3_proto",
-    testonly = 0,
     srcs = ["hamcrest_matchersv1_3.proto"],
     deps = [
         "@com_google_protobuf//:any_proto",
@@ -56,7 +53,6 @@ java_lite_proto_library(
 
 java_library(
     name = "package-info",
-    testonly = 0,
     srcs = ["package-info.java"],
     deps = [
         "//opensource/androidx:annotation",
diff --git a/espresso/remote/java/androidx/test/espresso/web/proto/action/BUILD b/espresso/remote/java/androidx/test/espresso/web/proto/action/BUILD
index 0d5942205..f639b5e41 100644
--- a/espresso/remote/java/androidx/test/espresso/web/proto/action/BUILD
+++ b/espresso/remote/java/androidx/test/espresso/web/proto/action/BUILD
@@ -14,7 +14,6 @@ package(
 
 proto_library(
     name = "web_actions_proto",
-    testonly = 0,
     srcs = ["web_actions.proto"],
     deps = [
         "@com_google_protobuf//:any_proto",
@@ -28,7 +27,6 @@ java_lite_proto_library(
 
 java_library(
     name = "package-info",
-    testonly = 0,
     srcs = ["package-info.java"],
     deps = [
         "//opensource/androidx:annotation",
diff --git a/espresso/remote/java/androidx/test/espresso/web/proto/assertion/BUILD b/espresso/remote/java/androidx/test/espresso/web/proto/assertion/BUILD
index 7c2612a9a..752c1d5ee 100644
--- a/espresso/remote/java/androidx/test/espresso/web/proto/assertion/BUILD
+++ b/espresso/remote/java/androidx/test/espresso/web/proto/assertion/BUILD
@@ -14,7 +14,6 @@ package(
 
 proto_library(
     name = "web_assertions_proto",
-    testonly = 0,
     srcs = ["web_assertions.proto"],
     deps = [
         "@com_google_protobuf//:any_proto",
@@ -28,7 +27,6 @@ java_lite_proto_library(
 
 java_library(
     name = "package-info",
-    testonly = 0,
     srcs = ["package-info.java"],
     deps = [
         "//opensource/androidx:annotation",
diff --git a/espresso/remote/java/androidx/test/espresso/web/proto/matcher/BUILD b/espresso/remote/java/androidx/test/espresso/web/proto/matcher/BUILD
index 39384f4b9..c55bbf4ea 100644
--- a/espresso/remote/java/androidx/test/espresso/web/proto/matcher/BUILD
+++ b/espresso/remote/java/androidx/test/espresso/web/proto/matcher/BUILD
@@ -14,7 +14,6 @@ package(
 
 proto_library(
     name = "remote_web_matchers_proto",
-    testonly = 0,
     srcs = ["remote_web_matchers.proto"],
     deps = [
         "@com_google_protobuf//:any_proto",
@@ -28,7 +27,6 @@ java_lite_proto_library(
 
 java_library(
     name = "package-info",
-    testonly = 0,
     srcs = ["package-info.java"],
     deps = [
         "//opensource/androidx:annotation",
diff --git a/espresso/remote/java/androidx/test/espresso/web/proto/model/BUILD b/espresso/remote/java/androidx/test/espresso/web/proto/model/BUILD
index 9a517c957..393423173 100644
--- a/espresso/remote/java/androidx/test/espresso/web/proto/model/BUILD
+++ b/espresso/remote/java/androidx/test/espresso/web/proto/model/BUILD
@@ -14,7 +14,6 @@ package(
 
 proto_library(
     name = "remote_web_model_atoms_proto",
-    testonly = 0,
     srcs = ["web_model_atoms.proto"],
     deps = [
         "@com_google_protobuf//:any_proto",
@@ -28,7 +27,6 @@ java_lite_proto_library(
 
 java_library(
     name = "package-info",
-    testonly = 0,
     srcs = ["package-info.java"],
     deps = [
         "//opensource/androidx:annotation",
diff --git a/espresso/remote/java/androidx/test/espresso/web/proto/sugar/BUILD b/espresso/remote/java/androidx/test/espresso/web/proto/sugar/BUILD
index dd94a00ba..426f907ed 100644
--- a/espresso/remote/java/androidx/test/espresso/web/proto/sugar/BUILD
+++ b/espresso/remote/java/androidx/test/espresso/web/proto/sugar/BUILD
@@ -14,7 +14,6 @@ package(
 
 proto_library(
     name = "web_sugar_proto",
-    testonly = 0,
     srcs = ["web_sugar.proto"],
     deps = [
         "@com_google_protobuf//:any_proto",
@@ -28,7 +27,6 @@ java_lite_proto_library(
 
 java_library(
     name = "package-info",
-    testonly = 0,
     srcs = ["package-info.java"],
     deps = [
         "//opensource/androidx:annotation",
diff --git a/espresso/remote/java/androidx/test/espresso/web/proto/webdriver/BUILD b/espresso/remote/java/androidx/test/espresso/web/proto/webdriver/BUILD
index 78578bb12..f0e5ab03b 100644
--- a/espresso/remote/java/androidx/test/espresso/web/proto/webdriver/BUILD
+++ b/espresso/remote/java/androidx/test/espresso/web/proto/webdriver/BUILD
@@ -14,7 +14,6 @@ package(
 
 proto_library(
     name = "web_driver_atoms_proto",
-    testonly = 0,
     srcs = ["web_webdriver_atoms.proto"],
     deps = [
         "@com_google_protobuf//:any_proto",
@@ -28,7 +27,6 @@ java_lite_proto_library(
 
 java_library(
     name = "package-info",
-    testonly = 0,
     srcs = ["package-info.java"],
     deps = [
         "//opensource/androidx:annotation",
diff --git a/espresso/remote/javatests/androidx/test/espresso/proto/BUILD b/espresso/remote/javatests/androidx/test/espresso/proto/BUILD
index 93e33d025..6c9d5083a 100644
--- a/espresso/remote/javatests/androidx/test/espresso/proto/BUILD
+++ b/espresso/remote/javatests/androidx/test/espresso/proto/BUILD
@@ -13,7 +13,6 @@ package(
 
 proto_library(
     name = "test_protos",
-    testonly = 0,
     srcs = ["test_protos.proto"],
     deps = [
         "@com_google_protobuf//:any_proto",
diff --git a/espresso/web/java/androidx/test/espresso/web/action/BUILD b/espresso/web/java/androidx/test/espresso/web/action/BUILD
index 73d2fa2e5..59715966e 100644
--- a/espresso/web/java/androidx/test/espresso/web/action/BUILD
+++ b/espresso/web/java/androidx/test/espresso/web/action/BUILD
@@ -17,7 +17,6 @@ package(
 
 android_library(
     name = "action",
-    testonly = 0,
     srcs = glob(
         ["*.java"],
     ),
diff --git a/espresso/web/java/androidx/test/espresso/web/assertion/BUILD b/espresso/web/java/androidx/test/espresso/web/assertion/BUILD
index 2938bb9a5..39a2da0ba 100644
--- a/espresso/web/java/androidx/test/espresso/web/assertion/BUILD
+++ b/espresso/web/java/androidx/test/espresso/web/assertion/BUILD
@@ -13,7 +13,6 @@ package(
 
 android_library(
     name = "assertion",
-    testonly = 0,
     srcs = glob(
         ["*.java"],
     ),
diff --git a/espresso/web/java/androidx/test/espresso/web/bridge/BUILD b/espresso/web/java/androidx/test/espresso/web/bridge/BUILD
index 06330dad9..339876565 100644
--- a/espresso/web/java/androidx/test/espresso/web/bridge/BUILD
+++ b/espresso/web/java/androidx/test/espresso/web/bridge/BUILD
@@ -16,7 +16,6 @@ package_group(
 
 android_library(
     name = "bridge",
-    testonly = 0,
     srcs = glob(
         ["*java"],
     ),
diff --git a/espresso/web/java/androidx/test/espresso/web/model/BUILD b/espresso/web/java/androidx/test/espresso/web/model/BUILD
index e4e8c8556..9ca9bf363 100644
--- a/espresso/web/java/androidx/test/espresso/web/model/BUILD
+++ b/espresso/web/java/androidx/test/espresso/web/model/BUILD
@@ -14,7 +14,6 @@ licenses(["notice"])
 
 android_library(
     name = "model",
-    testonly = 0,
     srcs = glob(
         ["*.java"],
     ),
diff --git a/espresso/web/java/androidx/test/espresso/web/sugar/BUILD b/espresso/web/java/androidx/test/espresso/web/sugar/BUILD
index 2e0cc82c4..c337f19d1 100644
--- a/espresso/web/java/androidx/test/espresso/web/sugar/BUILD
+++ b/espresso/web/java/androidx/test/espresso/web/sugar/BUILD
@@ -10,7 +10,6 @@ package(
 
 android_library(
     name = "sugar",
-    testonly = 0,
     srcs = glob(
         ["*.java"],
     ),
diff --git a/espresso/web/java/androidx/test/espresso/web/util/concurrent/BUILD b/espresso/web/java/androidx/test/espresso/web/util/concurrent/BUILD
index 4494e6889..0ca60c82c 100644
--- a/espresso/web/java/androidx/test/espresso/web/util/concurrent/BUILD
+++ b/espresso/web/java/androidx/test/espresso/web/util/concurrent/BUILD
@@ -13,7 +13,6 @@ package(
 
 android_library(
     name = "concurrent",
-    testonly = 0,
     srcs = glob(
         ["*.java"],
     ),
diff --git a/espresso/web/java/androidx/test/espresso/web/webdriver/BUILD b/espresso/web/java/androidx/test/espresso/web/webdriver/BUILD
index 320e84043..bf02486b1 100644
--- a/espresso/web/java/androidx/test/espresso/web/webdriver/BUILD
+++ b/espresso/web/java/androidx/test/espresso/web/webdriver/BUILD
@@ -17,7 +17,6 @@ package(
 
 android_library(
     name = "webdriver",
-    testonly = 0,
     srcs = glob(
         ["*java"],
     ),
diff --git a/runner/android_junit_runner/BUILD b/runner/android_junit_runner/BUILD
index a75329175..521194d76 100644
--- a/runner/android_junit_runner/BUILD
+++ b/runner/android_junit_runner/BUILD
@@ -11,7 +11,6 @@ licenses(["notice"])
 
 alias(
     name = "android_junit_runner",
-    testonly = 0,
     actual = "//runner/android_junit_runner/java/androidx/test:runner",
     visibility = ["//visibility:public"],
 )
diff --git a/runner/android_junit_runner/java/androidx/test/BUILD b/runner/android_junit_runner/java/androidx/test/BUILD
index 53850edfd..1de888ecf 100644
--- a/runner/android_junit_runner/java/androidx/test/BUILD
+++ b/runner/android_junit_runner/java/androidx/test/BUILD
@@ -26,7 +26,6 @@ licenses(["notice"])
 
 android_library(
     name = "runner",
-    testonly = 0,
     srcs = glob(
         ["**/*.java"],
     ),
diff --git a/runner/android_test_orchestrator/BUILD b/runner/android_test_orchestrator/BUILD
index 2674f5f8e..25b201432 100644
--- a/runner/android_test_orchestrator/BUILD
+++ b/runner/android_test_orchestrator/BUILD
@@ -10,7 +10,6 @@ licenses(["notice"])
 
 alias(
     name = "android_test_orchestrator",
-    testonly = 0,
     actual = "//runner/android_test_orchestrator/java/androidx/test/orchestrator",
     visibility = [":odo"],
 )
diff --git a/runner/android_test_orchestrator/java/androidx/test/orchestrator/BUILD b/runner/android_test_orchestrator/java/androidx/test/orchestrator/BUILD
index d84f33589..656289efa 100644
--- a/runner/android_test_orchestrator/java/androidx/test/orchestrator/BUILD
+++ b/runner/android_test_orchestrator/java/androidx/test/orchestrator/BUILD
@@ -13,7 +13,6 @@ package(
 
 android_library(
     name = "orchestrator",
-    testonly = 0,
     srcs = glob(["**/*java"]),
     idl_srcs = glob(["**/*.aidl"]),
     visibility = [
diff --git a/runner/android_test_orchestrator/stubapp/BUILD b/runner/android_test_orchestrator/stubapp/BUILD
index f2cac831c..2c40b80e5 100644
--- a/runner/android_test_orchestrator/stubapp/BUILD
+++ b/runner/android_test_orchestrator/stubapp/BUILD
@@ -13,7 +13,6 @@ package(
 # Dummy app to allow the On Device Orchestration to run and execute.
 android_binary(
     name = "stubapp",
-    testonly = 0,
     srcs = ["src/androidx/test/orchestrator/Orchestrator.java"],
     custom_package = "androidx.test.orchestrator.stubapp",
     manifest = "src/AndroidManifest.xml",
diff --git a/runner/monitor/BUILD b/runner/monitor/BUILD
index b681f9c76..1e5e3749d 100644
--- a/runner/monitor/BUILD
+++ b/runner/monitor/BUILD
@@ -12,7 +12,6 @@ licenses(["notice"])
 # This needs to be a java_library instead of an alias, so java_* based rules can reference it
 java_library(
     name = "monitor",
-    testonly = 0,
     visibility = ["//visibility:public"],
     exports = ["//runner/monitor/java/androidx/test:monitor"],
 )
diff --git a/runner/monitor/java/androidx/test/BUILD b/runner/monitor/java/androidx/test/BUILD
index 3fc0fc6b1..b85bd8fa0 100644
--- a/runner/monitor/java/androidx/test/BUILD
+++ b/runner/monitor/java/androidx/test/BUILD
@@ -28,7 +28,6 @@ licenses(["notice"])
 
 kt_android_library(
     name = "monitor",
-    testonly = 0,
     srcs = glob(
         [
             "**/*.java",
@@ -54,7 +53,6 @@ kt_android_library(
 # avoid the runtime dependency on errorprone
 java_library(
     name = "errorprone_neverlink",
-    testonly = 0,
     neverlink = 1,
     exports = [
         "@maven//:com_google_errorprone_error_prone_annotations",
@@ -63,7 +61,6 @@ java_library(
 
 android_library(
     name = "runtime_hidden_apis",
-    testonly = 0,
     srcs = [
         "internal/runner/runtime/ExposedInstrumentationApi.java",
     ],
@@ -72,7 +69,6 @@ android_library(
 
 android_library(
     name = "compiletime_hidden_apis",
-    testonly = 0,
     srcs = [
         "internal/runner/hidden/ExposedInstrumentationApi.java",
     ],
@@ -85,7 +81,6 @@ android_library(
 # group of targets to use to produce release binary + docs
 android_library(
     name = "monitor_release_lib",
-    testonly = 0,
     srcs = [
         # only needed for external release backwards compatibility
         "internal/platform/app/ActivityInvoker$$CC.java",
diff --git a/runner/rules/BUILD b/runner/rules/BUILD
index 4d732d852..9414d699d 100644
--- a/runner/rules/BUILD
+++ b/runner/rules/BUILD
@@ -12,7 +12,6 @@ licenses(["notice"])
 # This needs to be a java_library instead of an alias, so java_* based rules can reference it
 java_library(
     name = "rules",
-    testonly = 0,
     visibility = ["//visibility:public"],
     exports = ["//runner/rules/java/androidx/test:rules"],
 )
diff --git a/runner/rules/java/androidx/test/BUILD b/runner/rules/java/androidx/test/BUILD
index e5480fce1..181578964 100644
--- a/runner/rules/java/androidx/test/BUILD
+++ b/runner/rules/java/androidx/test/BUILD
@@ -19,7 +19,6 @@ package(
 # test rules
 android_library(
     name = "rules",
-    testonly = 0,
     srcs = glob(["**/*.java"]),
     custom_package = "androidx.test.rules",
     manifest = "AndroidManifest.xml",
diff --git a/services/BUILD b/services/BUILD
index 9030a5ff5..df41f2d0c 100644
--- a/services/BUILD
+++ b/services/BUILD
@@ -25,7 +25,6 @@ exports_files(["LICENSE"])
 # Standard test services that can be installed on any device.
 android_binary(
     name = "test_services",
-    testonly = 0,
     custom_package = "androidx.test.services",
     licenses = ["permissive"],
     main_dex_proguard_specs = ["//build_extensions:mainDexClasses.rules"],
diff --git a/services/events/java/androidx/test/services/events/BUILD b/services/events/java/androidx/test/services/events/BUILD
index 49faef4c8..a25676d79 100644
--- a/services/events/java/androidx/test/services/events/BUILD
+++ b/services/events/java/androidx/test/services/events/BUILD
@@ -12,7 +12,6 @@ package(
 
 android_library(
     name = "events",
-    testonly = 0,
     srcs = glob(["**/*.java"]),
     idl_parcelables = [
         "discovery/TestDiscoveryEvent.aidl",
diff --git a/services/shellexecutor/BUILD b/services/shellexecutor/BUILD
index 4be920209..9b80e9480 100644
--- a/services/shellexecutor/BUILD
+++ b/services/shellexecutor/BUILD
@@ -11,14 +11,12 @@ licenses(["notice"])
 
 android_library(
     name = "exec_server",
-    testonly = 0,
     visibility = [":server_access"],
     exports = ["//services/shellexecutor/java/androidx/test/services/shellexecutor:exec_server"],
 )
 
 alias(
     name = "exec_client",
-    testonly = 0,
     actual = "//services/shellexecutor/java/androidx/test/services/shellexecutor:exec_client",
     visibility = ["//visibility:public"],
 )
diff --git a/services/shellexecutor/java/androidx/test/services/shellexecutor/BUILD b/services/shellexecutor/java/androidx/test/services/shellexecutor/BUILD
index 78b0c7033..e1d5b78df 100644
--- a/services/shellexecutor/java/androidx/test/services/shellexecutor/BUILD
+++ b/services/shellexecutor/java/androidx/test/services/shellexecutor/BUILD
@@ -14,13 +14,11 @@ licenses(["notice"])
 
 proto_library(
     name = "local_socket_protocol_pb",
-    testonly = 0,
     srcs = ["local_socket_protocol.proto"],
 )
 
 java_lite_proto_library(
     name = "local_socket_protocol_pb_java_proto_lite",
-    testonly = 0,
     visibility = [
         "//services/shellexecutor/javatests/androidx/test/services/shellexecutor:__subpackages__",
     ],
@@ -29,7 +27,6 @@ java_lite_proto_library(
 
 kt_android_library(
     name = "local_socket_protocol",
-    testonly = 0,
     srcs = ["LocalSocketProtocol.kt"],
     visibility = [
         "//services/shellexecutor/javatests/androidx/test/services/shellexecutor:__subpackages__",
@@ -43,7 +40,6 @@ kt_android_library(
 
 kt_android_library(
     name = "exec_server",
-    testonly = 0,
     srcs = [
         "BlockingPublish.java",
         "LocalSocketShellMain.kt",
@@ -69,7 +65,6 @@ kt_android_library(
 
 kt_android_library(
     name = "exec_client",
-    testonly = 0,
     srcs = [
         "BlockingFind.java",
         "ClientNotConnected.java",
@@ -97,7 +92,6 @@ kt_android_library(
 # Make it easy to deserialize exceptions that are sent over from device to host.
 java_library(
     name = "exceptions",
-    testonly = 0,
     srcs = [
         "ClientNotConnected.java",
     ],
diff --git a/services/speakeasy/java/androidx/test/services/speakeasy/BUILD b/services/speakeasy/java/androidx/test/services/speakeasy/BUILD
index 289ff0413..958072e3e 100644
--- a/services/speakeasy/java/androidx/test/services/speakeasy/BUILD
+++ b/services/speakeasy/java/androidx/test/services/speakeasy/BUILD
@@ -9,7 +9,6 @@ licenses(["notice"])
 
 android_library(
     name = "protocol",
-    testonly = 0,
     srcs = ["SpeakEasyProtocol.java"],
     visibility = [
         "//services:__subpackages__",
diff --git a/services/speakeasy/java/androidx/test/services/speakeasy/client/BUILD b/services/speakeasy/java/androidx/test/services/speakeasy/client/BUILD
index f4cc3f778..be9df7bdc 100644
--- a/services/speakeasy/java/androidx/test/services/speakeasy/client/BUILD
+++ b/services/speakeasy/java/androidx/test/services/speakeasy/client/BUILD
@@ -9,14 +9,12 @@ licenses(["notice"])
 
 android_library(
     name = "connection",
-    testonly = 0,
     srcs = ["Connection.java"],
     deps = [":receivers"],
 )
 
 android_library(
     name = "tool_connection",
-    testonly = 0,
     srcs = ["ToolConnection.java"],
     visibility = [
         "//services:__subpackages__",
@@ -35,7 +33,6 @@ android_library(
 
 android_library(
     name = "receivers",
-    testonly = 0,
     srcs = [
         "FindResultReceiver.java",
         "PublishResultReceiver.java",
@@ -47,7 +44,6 @@ android_library(
 
 android_library(
     name = "client",
-    testonly = 0,
     srcs = [
         "AppConnection.java",
     ],
diff --git a/services/speakeasy/java/androidx/test/services/speakeasy/compilehelp/hidden_api/BUILD b/services/speakeasy/java/androidx/test/services/speakeasy/compilehelp/hidden_api/BUILD
index 24f52c507..87e87989c 100644
--- a/services/speakeasy/java/androidx/test/services/speakeasy/compilehelp/hidden_api/BUILD
+++ b/services/speakeasy/java/androidx/test/services/speakeasy/compilehelp/hidden_api/BUILD
@@ -9,7 +9,6 @@ licenses(["notice"])
 
 android_library(
     name = "IActivityManager",
-    testonly = 0,
     srcs = ["IActivityManager.java"],
     neverlink = 1,
     deps = [
@@ -19,7 +18,6 @@ android_library(
 
 android_library(
     name = "ActivityManagerNative",
-    testonly = 0,
     srcs = ["ActivityManagerNative.java"],
     neverlink = 1,
     visibility = [
@@ -30,6 +28,5 @@ android_library(
 
 android_library(
     name = "IApplicationThread",
-    testonly = 0,
     srcs = ["IApplicationThread.java"],
 )
diff --git a/services/speakeasy/java/androidx/test/services/speakeasy/server/BUILD b/services/speakeasy/java/androidx/test/services/speakeasy/server/BUILD
index e86122586..baf0a6841 100644
--- a/services/speakeasy/java/androidx/test/services/speakeasy/server/BUILD
+++ b/services/speakeasy/java/androidx/test/services/speakeasy/server/BUILD
@@ -13,7 +13,6 @@ licenses(["notice"])
 
 android_library(
     name = "speak_easy_core",
-    testonly = 0,
     srcs = ["SpeakEasy.java"],
     deps = [
         "//services/speakeasy/java/androidx/test/services/speakeasy:protocol",
@@ -23,7 +22,6 @@ android_library(
 
 android_library(
     name = "speak_easy_service",
-    testonly = 0,
     srcs = [
         "SpeakEasyContentProvider.java",
         "SpeakEasyService.java",
@@ -44,6 +42,5 @@ android_library(
 
 android_library(
     name = "server",
-    testonly = 0,
     exports = [":speak_easy_service"],
 )
diff --git a/services/storage/BUILD b/services/storage/BUILD
index a87b93749..734543de4 100644
--- a/services/storage/BUILD
+++ b/services/storage/BUILD
@@ -8,7 +8,6 @@ licenses(["notice"])
 # AndroidX Test storage API.
 alias(
     name = "storage",
-    testonly = 0,
     actual = "//services/storage/java/androidx/test/services/storage",
     visibility = ["//visibility:public"],
 )
@@ -17,7 +16,6 @@ alias(
 # infrastructure for the storage service.
 alias(
     name = "storage_constants",
-    testonly = 0,
     actual = "//services/storage/java/androidx/test/services/storage:test_storage_constants",
     visibility = ["//visibility:public"],
 )
diff --git a/services/storage/java/androidx/test/services/storage/BUILD b/services/storage/java/androidx/test/services/storage/BUILD
index 8c554adc4..236224451 100644
--- a/services/storage/java/androidx/test/services/storage/BUILD
+++ b/services/storage/java/androidx/test/services/storage/BUILD
@@ -22,7 +22,6 @@ licenses(["notice"])
 
 android_library(
     name = "storage",
-    testonly = 0,
     srcs = [
         "TestStorage.java",
         "TestStorageException.java",
@@ -46,7 +45,6 @@ android_library(
 # infrastructure for the storage service.
 java_library(
     name = "test_storage_constants",
-    testonly = 0,
     srcs = ["TestStorageConstants.java"],
     deps = [
         "//opensource/androidx:annotation",
@@ -56,13 +54,11 @@ java_library(
 # Proto libs for the storage service.
 proto_library(
     name = "storage_service_pb",
-    testonly = 0,
     srcs = ["test_storage_service.proto"],
 )
 
 java_lite_proto_library(
     name = "storage_service_pb_java_proto_lite",
-    testonly = 0,
     deps = [":storage_service_pb"],
 )
 
diff --git a/services/storage/java/androidx/test/services/storage/file/BUILD b/services/storage/java/androidx/test/services/storage/file/BUILD
index 1f27e9b36..3100f6ee4 100644
--- a/services/storage/java/androidx/test/services/storage/file/BUILD
+++ b/services/storage/java/androidx/test/services/storage/file/BUILD
@@ -13,7 +13,6 @@ licenses(["notice"])
 # Intended for internal use only.
 android_library(
     name = "file",
-    testonly = 0,
     srcs = glob(["*.java"]),
     deps = [
         "//opensource/androidx:annotation",
diff --git a/services/storage/java/androidx/test/services/storage/provider/BUILD b/services/storage/java/androidx/test/services/storage/provider/BUILD
index ad73d9ec9..4bb3cc8ca 100644
--- a/services/storage/java/androidx/test/services/storage/provider/BUILD
+++ b/services/storage/java/androidx/test/services/storage/provider/BUILD
@@ -11,7 +11,6 @@ licenses(["notice"])
 # Content providers that provide read write or read only access to the SDCard.
 android_library(
     name = "storage_content_providers",
-    testonly = 0,
     srcs = glob(["*.java"]),
     manifest = "AndroidManifest.xml",
     deps = [
diff --git a/testapps/foldable_testapp/java/androidx/test/foldable/app/BUILD b/testapps/foldable_testapp/java/androidx/test/foldable/app/BUILD
index 70a688a8a..a20868b25 100644
--- a/testapps/foldable_testapp/java/androidx/test/foldable/app/BUILD
+++ b/testapps/foldable_testapp/java/androidx/test/foldable/app/BUILD
@@ -18,7 +18,6 @@ package(
 
 jetify_android_library(
     name = "lib",
-    testonly = 0,
     srcs = glob(
         ["**/*.java"],
     ),
diff --git a/testapps/multiwindow_testapp/java/androidx/test/multiwindow/app/BUILD b/testapps/multiwindow_testapp/java/androidx/test/multiwindow/app/BUILD
index 9a8bd96ac..996bd6895 100644
--- a/testapps/multiwindow_testapp/java/androidx/test/multiwindow/app/BUILD
+++ b/testapps/multiwindow_testapp/java/androidx/test/multiwindow/app/BUILD
@@ -18,7 +18,6 @@ package(
 
 jetify_android_library(
     name = "lib",
-    testonly = 0,
     srcs = glob(
         ["**/*.java"],
     ),