diff --git a/rtc_tools/BUILD.gn b/rtc_tools/BUILD.gn
index 9b1f1fecda..7e8f4738f4 100644
--- a/rtc_tools/BUILD.gn
+++ b/rtc_tools/BUILD.gn
@@ -277,6 +277,7 @@ if (!is_component_build) {
       "../test:test_common",
       "../test:test_renderer",
       "../test:test_support",
+      "../test:test_video_capturer",
       "../test:video_test_common",
       "../test:video_test_support",
       "../test/time_controller:time_controller",
diff --git a/test/BUILD.gn b/test/BUILD.gn
index 68ae709ad5..b50a203772 100644
--- a/test/BUILD.gn
+++ b/test/BUILD.gn
@@ -139,8 +139,6 @@ rtc_library("video_test_common") {
     "frame_generator_capturer.h",
     "mappable_native_buffer.cc",
     "mappable_native_buffer.h",
-    "test_video_capturer.cc",
-    "test_video_capturer.h",
     "video_codec_settings.h",
     "video_decoder_proxy_factory.h",
     "video_encoder_nullable_proxy_factory.h",
@@ -151,6 +149,7 @@ rtc_library("video_test_common") {
     ":fileutils",
     ":frame_utils",
     ":scoped_key_value_config",
+    ":test_video_capturer",
     "../api:array_view",
     "../api:create_frame_generator",
     "../api:frame_generator_api",
@@ -200,6 +199,7 @@ if (!build_with_chromium) {
         "mac_capturer.mm",
       ]
       deps = [
+        ":test_video_capturer",
         ":video_test_common",
         "../api:libjingle_peerconnection_api",
         "../api:media_stream_interface",
@@ -220,7 +220,10 @@ if (!build_with_chromium) {
       "platform_video_capturer.cc",
       "platform_video_capturer.h",
     ]
-    deps = [ ":video_test_common" ]
+    deps = [
+      ":test_video_capturer",
+      ":video_test_common",
+    ]
     absl_deps = [ "//third_party/abseil-cpp/absl/memory" ]
     if (is_mac || is_ios) {
       deps += [ ":video_test_mac" ]
diff --git a/test/fuzzers/utils/BUILD.gn b/test/fuzzers/utils/BUILD.gn
index c5744fc33b..dfb617857c 100644
--- a/test/fuzzers/utils/BUILD.gn
+++ b/test/fuzzers/utils/BUILD.gn
@@ -41,6 +41,7 @@ rtc_library("rtp_replayer") {
     "../../../test:run_test_interface",
     "../../../test:test_renderer",
     "../../../test:test_support",
+    "../../../test:test_video_capturer",
     "../../../test:video_test_common",
   ]
   absl_deps = [ "//third_party/abseil-cpp/absl/memory:memory" ]
diff --git a/test/pc/e2e/BUILD.gn b/test/pc/e2e/BUILD.gn
index 3920db075c..0d5d13d03d 100644
--- a/test/pc/e2e/BUILD.gn
+++ b/test/pc/e2e/BUILD.gn
@@ -137,10 +137,10 @@ if (!build_with_chromium) {
       sources = [
         "media/media_helper.cc",
         "media/media_helper.h",
-        "media/test_video_capturer_video_track_source.h",
       ]
       deps = [
         ":test_peer",
+        ":test_video_capturer_video_track_source",
         "../..:fileutils",
         "../..:platform_video_capturer",
         "../..:video_test_common",
diff --git a/test/pc/e2e/analyzer/video/BUILD.gn b/test/pc/e2e/analyzer/video/BUILD.gn
index 91af64e5a4..6ce0c4968b 100644
--- a/test/pc/e2e/analyzer/video/BUILD.gn
+++ b/test/pc/e2e/analyzer/video/BUILD.gn
@@ -382,6 +382,7 @@ rtc_library("video_quality_analyzer_injection_helper") {
     ":video_dumping",
     "../../../..:fixed_fps_video_frame_writer_adapter",
     "../../../..:test_renderer",
+    "../../../..:test_video_capturer",
     "../../../..:video_test_common",
     "../../../..:video_test_support",
     "../../../../../api:array_view",
diff --git a/test/scenario/BUILD.gn b/test/scenario/BUILD.gn
index 077d1ae11f..5f3b0877b2 100644
--- a/test/scenario/BUILD.gn
+++ b/test/scenario/BUILD.gn
@@ -69,6 +69,7 @@ if (rtc_include_tests && !build_with_chromium) {
     ]
     deps = [
       ":column_printer",
+      "..:test_video_capturer",
       "../:fake_video_codecs",
       "../:fileutils",
       "../:test_common",