diff --git a/ash/public/cpp/external_arc/BUILD.gn b/ash/public/cpp/external_arc/BUILD.gn
index 8f83d7faa8631..36e6966da1401 100644
--- a/ash/public/cpp/external_arc/BUILD.gn
+++ b/ash/public/cpp/external_arc/BUILD.gn
@@ -30,10 +30,6 @@ static_library("external_arc") {
     "overlay/arc_overlay_controller_impl.h",
     "overlay/arc_overlay_manager.cc",
     "overlay/arc_overlay_manager.h",
-    "overlay/test/fake_arc_overlay_controller_impl.cc",
-    "overlay/test/fake_arc_overlay_controller_impl.h",
-    "overlay/test/test_arc_overlay_manager.cc",
-    "overlay/test/test_arc_overlay_manager.h",
     "toast/arc_toast_surface_manager.cc",
     "toast/arc_toast_surface_manager.h",
   ]
@@ -96,6 +92,10 @@ source_set("test_support") {
     "message_center/mock_arc_notification_item.h",
     "message_center/mock_arc_notification_surface.cc",
     "message_center/mock_arc_notification_surface.h",
+    "overlay/test/fake_arc_overlay_controller_impl.cc",
+    "overlay/test/fake_arc_overlay_controller_impl.h",
+    "overlay/test/test_arc_overlay_manager.cc",
+    "overlay/test/test_arc_overlay_manager.h",
   ]
   deps = [
     ":external_arc",
diff --git a/components/payments/content/BUILD.gn b/components/payments/content/BUILD.gn
index 454066a68f0f5..4a499723163b6 100644
--- a/components/payments/content/BUILD.gn
+++ b/components/payments/content/BUILD.gn
@@ -80,7 +80,7 @@ static_library("content") {
     sources += [ "android_app_communication_chrome_os.cc" ]
 
     deps += [
-      "//ash/public/cpp/external_arc:external_arc",
+      "//ash/public/cpp/external_arc",
       "//components/arc",
       "//components/arc/mojom",
     ]
@@ -232,7 +232,7 @@ source_set("unit_tests") {
     sources += [ "android_app_communication_test_support_chrome_os.cc" ]
 
     deps += [
-      "//ash/public/cpp/external_arc:external_arc",
+      "//ash/public/cpp/external_arc:test_support",
       "//components/arc",
       "//components/arc:arc_test_support",
       "//components/arc/mojom",