diff --git a/modules/audio_coding/BUILD.gn b/modules/audio_coding/BUILD.gn
index fd1237b8a6..556e68ccae 100644
--- a/modules/audio_coding/BUILD.gn
+++ b/modules/audio_coding/BUILD.gn
@@ -1557,7 +1557,7 @@ if (rtc_include_tests) {
         ":neteq_test_tools",
         "../../api/audio_codecs:builtin_audio_decoder_factory",
         "../../api/neteq:neteq_api",
-        "../../test:audio_codec_mocks",
+        "../../test:audio_test_common",
         "../../test:field_trial",
         "../../test:test_support",
       ]
@@ -2111,6 +2111,7 @@ if (rtc_include_tests) {
         "../../rtc_base/system:arch",
         "../../system_wrappers",
         "../../test:audio_codec_mocks",
+        "../../test:audio_test_common",
         "../../test:field_trial",
         "../../test:fileutils",
         "../../test:rtc_expect_death",
diff --git a/test/BUILD.gn b/test/BUILD.gn
index 940232f242..4f526553d3 100644
--- a/test/BUILD.gn
+++ b/test/BUILD.gn
@@ -97,6 +97,7 @@ rtc_library("video_test_common") {
   sources = [
     "fake_texture_frame.cc",
     "fake_texture_frame.h",
+    "fake_videorenderer.h",
     "frame_forwarder.cc",
     "frame_forwarder.h",
     "frame_generator_capturer.cc",
@@ -106,6 +107,9 @@ rtc_library("video_test_common") {
     "test_video_capturer.cc",
     "test_video_capturer.h",
     "video_codec_settings.h",
+    "video_decoder_proxy_factory.h",
+    "video_encoder_nullable_proxy_factory.h",
+    "video_encoder_proxy_factory.h",
   ]
 
   deps = [
@@ -139,6 +143,20 @@ rtc_library("video_test_common") {
   ]
 }
 
+rtc_library("audio_test_common") {
+  visibility = [ "*" ]
+  testonly = true
+  sources = [
+    "audio_decoder_proxy_factory.h",
+    "function_audio_decoder_factory.h",
+  ]
+  deps = [
+    "../api/audio_codecs:audio_codecs_api",
+    "../rtc_base:checks",
+  ]
+  absl_deps = [ "//third_party/abseil-cpp/absl/memory" ]
+}
+
 if (!build_with_chromium) {
   if (is_mac || is_ios) {
     rtc_library("video_test_mac") {
@@ -919,13 +937,9 @@ rtc_library("test_common") {
     "call_test.h",
     "drifting_clock.cc",
     "drifting_clock.h",
-    "fake_videorenderer.h",
     "layer_filtering_transport.cc",
     "layer_filtering_transport.h",
     "rtp_rtcp_observer.h",
-    "video_decoder_proxy_factory.h",
-    "video_encoder_nullable_proxy_factory.h",
-    "video_encoder_proxy_factory.h",
   ]
 
   deps = [
@@ -1100,10 +1114,6 @@ rtc_library("test_renderer_generic") {
 rtc_library("audio_codec_mocks") {
   testonly = true
   sources = [
-    # TODO(nisse): Move these factories to their own target, to avoid
-    # unnecessary dependencies on gmock and gtest.
-    "audio_decoder_proxy_factory.h",
-    "function_audio_decoder_factory.h",
     "mock_audio_decoder.cc",
     "mock_audio_decoder.h",
     "mock_audio_decoder_factory.h",
@@ -1119,9 +1129,7 @@ rtc_library("audio_codec_mocks") {
     "../api:scoped_refptr",
     "../api/audio_codecs:audio_codecs_api",
     "../api/audio_codecs:builtin_audio_decoder_factory",
-    "../rtc_base:checks",
   ]
-  absl_deps = [ "//third_party/abseil-cpp/absl/memory" ]
 }
 
 rtc_library("copy_to_file_audio_capturer") {