diff --git a/api/BUILD.gn b/api/BUILD.gn
index a0a9563ce0..a9217400fe 100644
--- a/api/BUILD.gn
+++ b/api/BUILD.gn
@@ -445,27 +445,6 @@ rtc_source_set("make_ref_counted") {
   deps = [ "../rtc_base:refcount" ]
 }
 
-rtc_source_set("video_quality_test_fixture_api") {
-  visibility = [ "*" ]
-  testonly = true
-  sources = [ "test/video_quality_test_fixture.h" ]
-  deps = [
-    ":fec_controller_api",
-    ":libjingle_peerconnection_api",
-    ":network_state_predictor_api",
-    ":rtp_parameters",
-    ":simulated_network_api",
-    "../call:fake_network",
-    "../call:rtp_interfaces",
-    "../test:test_common",
-    "../test:video_test_common",
-    "../video/config:encoder_config",
-    "transport:bitrate_settings",
-    "transport:network_control",
-    "video_codecs:video_codecs_api",
-  ]
-}
-
 rtc_source_set("video_quality_analyzer_api") {
   visibility = [ "*" ]
   testonly = true
@@ -630,20 +609,6 @@ rtc_source_set("frame_generator_api") {
   absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
 }
 
-rtc_library("test_dependency_factory") {
-  visibility = [ "*" ]
-  testonly = true
-  sources = [
-    "test/test_dependency_factory.cc",
-    "test/test_dependency_factory.h",
-  ]
-  deps = [
-    ":video_quality_test_fixture_api",
-    "../rtc_base:checks",
-    "../rtc_base:platform_thread_types",
-  ]
-}
-
 if (rtc_include_tests) {
   # TODO(srte): Move to network_emulation sub directory.
   rtc_library("create_network_emulation_manager") {
@@ -660,6 +625,41 @@ if (rtc_include_tests) {
   }
 
   if (!build_with_chromium) {
+    rtc_source_set("video_quality_test_fixture_api") {
+      visibility = [ "*" ]
+      testonly = true
+      sources = [ "test/video_quality_test_fixture.h" ]
+      deps = [
+        ":fec_controller_api",
+        ":libjingle_peerconnection_api",
+        ":network_state_predictor_api",
+        ":rtp_parameters",
+        ":simulated_network_api",
+        "../call:fake_network",
+        "../call:rtp_interfaces",
+        "../test:test_common",
+        "../test:video_test_common",
+        "../video/config:encoder_config",
+        "transport:bitrate_settings",
+        "transport:network_control",
+        "video_codecs:video_codecs_api",
+      ]
+    }
+
+    rtc_library("test_dependency_factory") {
+      visibility = [ "*" ]
+      testonly = true
+      sources = [
+        "test/test_dependency_factory.cc",
+        "test/test_dependency_factory.h",
+      ]
+      deps = [
+        ":video_quality_test_fixture_api",
+        "../rtc_base:checks",
+        "../rtc_base:platform_thread_types",
+      ]
+    }
+
     rtc_library("create_video_quality_test_fixture_api") {
       visibility = [ "*" ]
       testonly = true
diff --git a/test/BUILD.gn b/test/BUILD.gn
index bda12289c2..33e835ea08 100644
--- a/test/BUILD.gn
+++ b/test/BUILD.gn
@@ -1070,78 +1070,6 @@ rtc_library("video_test_constants") {
   deps = [ "../api/units:time_delta" ]
 }
 
-rtc_library("test_common") {
-  testonly = true
-  sources = [
-    "call_test.cc",
-    "call_test.h",
-    "drifting_clock.cc",
-    "drifting_clock.h",
-    "layer_filtering_transport.cc",
-    "layer_filtering_transport.h",
-    "rtp_rtcp_observer.h",
-  ]
-
-  deps = [
-    ":direct_transport",
-    ":encoder_settings",
-    ":fake_video_codecs",
-    ":fileutils",
-    ":frame_generator_capturer",
-    ":mock_transport",
-    ":run_loop",
-    ":scoped_key_value_config",
-    ":test_support",
-    ":video_test_common",
-    ":video_test_constants",
-    "../api:array_view",
-    "../api:create_frame_generator",
-    "../api:frame_generator_api",
-    "../api:rtp_headers",
-    "../api:rtp_parameters",
-    "../api:simulated_network_api",
-    "../api:transport_api",
-    "../api/audio_codecs:builtin_audio_decoder_factory",
-    "../api/audio_codecs:builtin_audio_encoder_factory",
-    "../api/rtc_event_log",
-    "../api/task_queue",
-    "../api/task_queue:default_task_queue_factory",
-    "../api/test/video:function_video_factory",
-    "../api/transport:field_trial_based_config",
-    "../api/units:time_delta",
-    "../api/video:builtin_video_bitrate_allocator_factory",
-    "../api/video:video_bitrate_allocator_factory",
-    "../api/video:video_frame",
-    "../api/video_codecs:video_codecs_api",
-    "../call",
-    "../call:call_interfaces",
-    "../call:fake_network",
-    "../call:simulated_network",
-    "../call:simulated_packet_receiver",
-    "../call:video_stream_api",
-    "../modules/audio_device:audio_device_api",
-    "../modules/audio_device:test_audio_device_module",
-    "../modules/audio_mixer:audio_mixer_impl",
-    "../modules/rtp_rtcp",
-    "../modules/rtp_rtcp:rtp_rtcp_format",
-    "../modules/rtp_rtcp:rtp_video_header",
-    "../modules/video_coding:codec_globals_headers",
-    "../rtc_base:checks",
-    "../rtc_base:criticalsection",
-    "../rtc_base:rtc_event",
-    "../rtc_base:task_queue_for_test",
-    "../rtc_base:threading",
-    "../rtc_base:timeutils",
-    "../system_wrappers",
-    "../system_wrappers:field_trial",
-    "../video/config:encoder_config",
-  ]
-  absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
-  if (!is_android && !build_with_chromium) {
-    deps += [ "../modules/video_capture:video_capture_internal_impl" ]
-  }
-}
-
 rtc_library("mock_transport") {
   testonly = true
   sources = [
@@ -1281,30 +1209,104 @@ rtc_library("audio_codec_mocks") {
   ]
 }
 
-rtc_library("copy_to_file_audio_capturer") {
-  testonly = true
-  sources = [
-    "testsupport/copy_to_file_audio_capturer.cc",
-    "testsupport/copy_to_file_audio_capturer.h",
-  ]
-  deps = [
-    "../api:array_view",
-    "../common_audio",
-    "../modules/audio_device:test_audio_device_module",
-    "../rtc_base:buffer",
-  ]
-  absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
-}
+if (!build_with_chromium) {
+  rtc_library("copy_to_file_audio_capturer") {
+    testonly = true
+    sources = [
+      "testsupport/copy_to_file_audio_capturer.cc",
+      "testsupport/copy_to_file_audio_capturer.h",
+    ]
+    deps = [
+      "../api:array_view",
+      "../common_audio",
+      "../modules/audio_device:test_audio_device_module",
+      "../rtc_base:buffer",
+    ]
+    absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
+  }
 
-rtc_library("copy_to_file_audio_capturer_unittest") {
-  testonly = true
-  sources = [ "testsupport/copy_to_file_audio_capturer_unittest.cc" ]
-  deps = [
-    ":copy_to_file_audio_capturer",
-    ":fileutils",
-    ":test_support",
-    "../modules/audio_device:test_audio_device_module",
-  ]
+  rtc_library("copy_to_file_audio_capturer_unittest") {
+    testonly = true
+    sources = [ "testsupport/copy_to_file_audio_capturer_unittest.cc" ]
+    deps = [
+      ":copy_to_file_audio_capturer",
+      ":fileutils",
+      ":test_support",
+      "../modules/audio_device:test_audio_device_module",
+    ]
+  }
+
+  rtc_library("test_common") {
+    testonly = true
+    sources = [
+      "call_test.cc",
+      "call_test.h",
+      "drifting_clock.cc",
+      "drifting_clock.h",
+      "layer_filtering_transport.cc",
+      "layer_filtering_transport.h",
+      "rtp_rtcp_observer.h",
+    ]
+
+    deps = [
+      ":direct_transport",
+      ":encoder_settings",
+      ":fake_video_codecs",
+      ":fileutils",
+      ":frame_generator_capturer",
+      ":mock_transport",
+      ":run_loop",
+      ":scoped_key_value_config",
+      ":test_support",
+      ":video_test_common",
+      ":video_test_constants",
+      "../api:array_view",
+      "../api:create_frame_generator",
+      "../api:frame_generator_api",
+      "../api:rtp_headers",
+      "../api:rtp_parameters",
+      "../api:simulated_network_api",
+      "../api:transport_api",
+      "../api/audio_codecs:builtin_audio_decoder_factory",
+      "../api/audio_codecs:builtin_audio_encoder_factory",
+      "../api/rtc_event_log",
+      "../api/task_queue",
+      "../api/task_queue:default_task_queue_factory",
+      "../api/test/video:function_video_factory",
+      "../api/transport:field_trial_based_config",
+      "../api/units:time_delta",
+      "../api/video:builtin_video_bitrate_allocator_factory",
+      "../api/video:video_bitrate_allocator_factory",
+      "../api/video:video_frame",
+      "../api/video_codecs:video_codecs_api",
+      "../call",
+      "../call:call_interfaces",
+      "../call:fake_network",
+      "../call:simulated_network",
+      "../call:simulated_packet_receiver",
+      "../call:video_stream_api",
+      "../modules/audio_device:audio_device_api",
+      "../modules/audio_device:test_audio_device_module",
+      "../modules/audio_mixer:audio_mixer_impl",
+      "../modules/rtp_rtcp",
+      "../modules/rtp_rtcp:rtp_rtcp_format",
+      "../modules/rtp_rtcp:rtp_video_header",
+      "../modules/video_coding:codec_globals_headers",
+      "../rtc_base:checks",
+      "../rtc_base:criticalsection",
+      "../rtc_base:rtc_event",
+      "../rtc_base:task_queue_for_test",
+      "../rtc_base:threading",
+      "../rtc_base:timeutils",
+      "../system_wrappers",
+      "../system_wrappers:field_trial",
+      "../video/config:encoder_config",
+    ]
+    absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
+    if (!is_android && !build_with_chromium) {
+      deps += [ "../modules/video_capture:video_capture_internal_impl" ]
+    }
+  }
 }
 
 if (!build_with_chromium && is_android) {