diff --git a/audio/BUILD.gn b/audio/BUILD.gn
index c0b0d62d93..1a06502b6f 100644
--- a/audio/BUILD.gn
+++ b/audio/BUILD.gn
@@ -135,7 +135,7 @@ if (rtc_include_tests) {
       "../call:fake_network",
       "../call:simulated_network",
       "../modules/audio_device:audio_device_api",
-      "../modules/audio_device:audio_device_impl",
+      "../modules/audio_device:test_audio_device_module",
       "../system_wrappers",
       "../test:test_common",
       "../test:test_support",
diff --git a/call/BUILD.gn b/call/BUILD.gn
index 85192746c1..bf22820b69 100644
--- a/call/BUILD.gn
+++ b/call/BUILD.gn
@@ -579,7 +579,7 @@ if (rtc_include_tests) {
         "../media:rtc_simulcast_encoder_adapter",
         "../modules/audio_coding",
         "../modules/audio_device",
-        "../modules/audio_device:audio_device_impl",
+        "../modules/audio_device:test_audio_device_module",
         "../modules/audio_mixer:audio_mixer_impl",
         "../modules/rtp_rtcp",
         "../modules/rtp_rtcp:rtp_rtcp_format",
diff --git a/modules/audio_device/BUILD.gn b/modules/audio_device/BUILD.gn
index 4a6a0ab41c..eb5b8fbad9 100644
--- a/modules/audio_device/BUILD.gn
+++ b/modules/audio_device/BUILD.gn
@@ -177,6 +177,36 @@ rtc_source_set("audio_device_module_from_input_and_output") {
   }
 }
 
+rtc_library("test_audio_device_module") {
+  visibility = [ "*" ]
+  sources = [
+    "include/test_audio_device.cc",
+    "include/test_audio_device.h",
+  ]
+  deps = [
+    ":audio_device_api",
+    ":audio_device_default",
+    "../../api:array_view",
+    "../../api:make_ref_counted",
+    "../../api:scoped_refptr",
+    "../../api/task_queue",
+    "../../common_audio",
+    "../../rtc_base:buffer",
+    "../../rtc_base:checks",
+    "../../rtc_base:logging",
+    "../../rtc_base:macromagic",
+    "../../rtc_base:platform_thread",
+    "../../rtc_base:random",
+    "../../rtc_base:rtc_event",
+    "../../rtc_base:rtc_task_queue",
+    "../../rtc_base:safe_conversions",
+    "../../rtc_base:timeutils",
+    "../../rtc_base/synchronization:mutex",
+    "../../rtc_base/task_utils:repeating_task",
+  ]
+  absl_deps = [ "//third_party/abseil-cpp/absl/strings" ]
+}
+
 # Contains default implementations of webrtc::AudioDeviceModule for Windows,
 # Linux, Mac, iOS and Android.
 rtc_library("audio_device_impl") {
@@ -186,6 +216,7 @@ rtc_library("audio_device_impl") {
     ":audio_device_buffer",
     ":audio_device_default",
     ":audio_device_generic",
+    ":test_audio_device_module",
     "../../api:array_view",
     "../../api:make_ref_counted",
     "../../api:refcountedbase",
@@ -228,7 +259,8 @@ rtc_library("audio_device_impl") {
     "dummy/file_audio_device.cc",
     "dummy/file_audio_device.h",
     "include/fake_audio_device.h",
-    "include/test_audio_device.cc",
+
+    # TODO(crbug.com/webrtc/1510): remove when migrated on the new target
     "include/test_audio_device.h",
   ]
 
@@ -420,6 +452,7 @@ if (rtc_include_tests && !build_with_chromium) {
       ":audio_device_buffer",
       ":audio_device_impl",
       ":mock_audio_device",
+      ":test_audio_device_module",
       "../../api:array_view",
       "../../api:scoped_refptr",
       "../../api:sequence_checker",
diff --git a/test/BUILD.gn b/test/BUILD.gn
index 29c52afd70..bd0ba3c81e 100644
--- a/test/BUILD.gn
+++ b/test/BUILD.gn
@@ -1113,7 +1113,7 @@ rtc_library("test_common") {
     "../call:simulated_packet_receiver",
     "../call:video_stream_api",
     "../modules/audio_device:audio_device_api",
-    "../modules/audio_device:audio_device_impl",
+    "../modules/audio_device:test_audio_device_module",
     "../modules/audio_mixer:audio_mixer_impl",
     "../modules/rtp_rtcp",
     "../modules/rtp_rtcp:rtp_rtcp_format",
@@ -1283,7 +1283,7 @@ rtc_library("copy_to_file_audio_capturer") {
   deps = [
     "../api:array_view",
     "../common_audio",
-    "../modules/audio_device:audio_device_impl",
+    "../modules/audio_device:test_audio_device_module",
     "../rtc_base:buffer",
   ]
   absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
@@ -1296,7 +1296,7 @@ rtc_library("copy_to_file_audio_capturer_unittest") {
     ":copy_to_file_audio_capturer",
     ":fileutils",
     ":test_support",
-    "../modules/audio_device:audio_device_impl",
+    "../modules/audio_device:test_audio_device_module",
   ]
 }
 
diff --git a/test/network/BUILD.gn b/test/network/BUILD.gn
index 20b17bc804..5a6cb31f4b 100644
--- a/test/network/BUILD.gn
+++ b/test/network/BUILD.gn
@@ -126,7 +126,7 @@ if (rtc_include_tests && !build_with_chromium) {
       "../../call:simulated_network",
       "../../media:rtc_audio_video",
       "../../media:rtc_media_engine_defaults",
-      "../../modules/audio_device:audio_device_impl",
+      "../../modules/audio_device:test_audio_device_module",
       "../../p2p:rtc_p2p",
       "../../pc:pc_test_utils",
       "../../pc:peerconnection_wrapper",
diff --git a/test/pc/e2e/BUILD.gn b/test/pc/e2e/BUILD.gn
index e49b01072c..ebe4d9b08c 100644
--- a/test/pc/e2e/BUILD.gn
+++ b/test/pc/e2e/BUILD.gn
@@ -49,7 +49,7 @@ if (!build_with_chromium) {
       ]
       deps = [
         "../../../api/test/pclf:media_configuration",
-        "../../../modules/audio_device:audio_device_impl",
+        "../../../modules/audio_device:test_audio_device_module",
         "../../../rtc_base:swap_queue",
       ]
     }
@@ -107,7 +107,7 @@ if (!build_with_chromium) {
         "../../../api/video_codecs:builtin_video_encoder_factory",
         "../../../media:rtc_audio_video",
         "../../../media:rtc_media_engine_defaults",
-        "../../../modules/audio_device:audio_device_impl",
+        "../../../modules/audio_device:test_audio_device_module",
         "../../../modules/audio_processing/aec_dump",
         "../../../p2p:rtc_p2p",
         "../../../rtc_base:rtc_task_queue",
diff --git a/test/peer_scenario/BUILD.gn b/test/peer_scenario/BUILD.gn
index bd7c02ad9e..18f81a56e6 100644
--- a/test/peer_scenario/BUILD.gn
+++ b/test/peer_scenario/BUILD.gn
@@ -51,7 +51,7 @@ if (rtc_include_tests) {
       "../../media:rtc_audio_video",
       "../../media:rtc_media_base",
       "../../media:rtp_utils",
-      "../../modules/audio_device:audio_device_impl",
+      "../../modules/audio_device:test_audio_device_module",
       "../../modules/rtp_rtcp:rtp_rtcp_format",
       "../../p2p:rtc_p2p",
       "../../pc:channel",
diff --git a/test/scenario/BUILD.gn b/test/scenario/BUILD.gn
index 7051b34573..d63d591f05 100644
--- a/test/scenario/BUILD.gn
+++ b/test/scenario/BUILD.gn
@@ -115,8 +115,8 @@ if (rtc_include_tests && !build_with_chromium) {
       "../../media:rtc_internal_video_codecs",
       "../../media:rtc_media_base",
       "../../modules/audio_device",
-      "../../modules/audio_device:audio_device_impl",
       "../../modules/audio_device:mock_audio_device",
+      "../../modules/audio_device:test_audio_device_module",
       "../../modules/audio_mixer:audio_mixer_impl",
       "../../modules/audio_processing",
       "../../modules/congestion_controller/goog_cc:test_goog_cc_printer",