diff --git a/call/BUILD.gn b/call/BUILD.gn
index b647472f91..692427ce80 100644
--- a/call/BUILD.gn
+++ b/call/BUILD.gn
@@ -395,6 +395,7 @@ if (rtc_include_tests) {
       "../system_wrappers",
       "../test:audio_codec_mocks",
       "../test:direct_transport",
+      "../test:encoder_settings",
       "../test:fake_video_codecs",
       "../test:field_trial",
       "../test:test_common",
@@ -441,9 +442,11 @@ if (rtc_include_tests) {
       "../system_wrappers",
       "../system_wrappers:metrics",
       "../test:direct_transport",
+      "../test:encoder_settings",
       "../test:fake_video_codecs",
       "../test:field_trial",
       "../test:fileutils",
+      "../test:null_transport",
       "../test:perf_test",
       "../test:test_common",
       "../test:test_support",
diff --git a/test/BUILD.gn b/test/BUILD.gn
index a44dd1d6a2..33de2c3ebf 100644
--- a/test/BUILD.gn
+++ b/test/BUILD.gn
@@ -656,6 +656,33 @@ rtc_source_set("fake_video_codecs") {
   ]
 }
 
+rtc_source_set("null_transport") {
+  testonly = true
+  sources = [
+    "null_transport.cc",
+    "null_transport.h",
+  ]
+  deps = [
+    "../api:transport_api",
+  ]
+}
+
+rtc_source_set("encoder_settings") {
+  testonly = true
+  sources = [
+    "encoder_settings.cc",
+    "encoder_settings.h",
+  ]
+  deps = [
+    "../api:scoped_refptr",
+    "../api/video_codecs:video_codecs_api",
+    "../call:rtp_interfaces",
+    "../call:video_stream_api",
+    "../rtc_base:checks",
+    "../rtc_base:refcount",
+  ]
+}
+
 rtc_source_set("test_common") {
   testonly = true
   sources = [
@@ -663,15 +690,11 @@ rtc_source_set("test_common") {
     "call_test.h",
     "drifting_clock.cc",
     "drifting_clock.h",
-    "encoder_settings.cc",
-    "encoder_settings.h",
     "fake_videorenderer.h",
     "layer_filtering_transport.cc",
     "layer_filtering_transport.h",
     "mock_transport.cc",
     "mock_transport.h",
-    "null_transport.cc",
-    "null_transport.h",
     "rtp_rtcp_observer.h",
     "video_decoder_proxy_factory.h",
     "video_encoder_proxy_factory.h",
@@ -692,6 +715,7 @@ rtc_source_set("test_common") {
 
   deps = [
     ":direct_transport",
+    ":encoder_settings",
     ":fake_video_codecs",
     ":fileutils",
     ":rtp_test_utils",
@@ -715,7 +739,6 @@ rtc_source_set("test_common") {
     "../call",
     "../call:call_interfaces",
     "../call:fake_network",
-    "../call:rtp_interfaces",
     "../call:rtp_sender",
     "../call:simulated_network",
     "../call:simulated_packet_receiver",
diff --git a/test/fuzzers/utils/BUILD.gn b/test/fuzzers/utils/BUILD.gn
index 5216573cad..009a3ff9cb 100644
--- a/test/fuzzers/utils/BUILD.gn
+++ b/test/fuzzers/utils/BUILD.gn
@@ -17,6 +17,7 @@ rtc_source_set("rtp_replayer") {
   deps = [
     "../../../api/test/video:function_video_factory",
     "../../../api/video_codecs:video_codecs_api",
+    "../../../call",
     "../../../call:call_interfaces",
     "../../../common_video",
     "../../../logging:rtc_event_log_api",
@@ -28,11 +29,12 @@ rtc_source_set("rtp_replayer") {
     "../../../rtc_base:rtc_task_queue_stdlib",
     "../../../system_wrappers",
     "../../../test:call_config_utils",
+    "../../../test:encoder_settings",
     "../../../test:fake_video_codecs",
+    "../../../test:null_transport",
     "../../../test:rtp_test_utils",
     "../../../test:run_test",
     "../../../test:run_test_interface",
-    "../../../test:test_common",
     "../../../test:test_renderer",
     "../../../test:test_support",
     "../../../test:video_test_common",
diff --git a/video/BUILD.gn b/video/BUILD.gn
index aca186656e..a95488120f 100644
--- a/video/BUILD.gn
+++ b/video/BUILD.gn
@@ -444,7 +444,9 @@ if (rtc_include_tests) {
       "../rtc_base:rtc_json",
       "../system_wrappers",
       "../test:call_config_utils",
+      "../test:encoder_settings",
       "../test:fake_video_codecs",
+      "../test:null_transport",
       "../test:rtp_test_utils",
       "../test:run_test",
       "../test:run_test_interface",
@@ -575,9 +577,11 @@ if (rtc_include_tests) {
       "../system_wrappers:field_trial",
       "../system_wrappers:metrics",
       "../test:direct_transport",
+      "../test:encoder_settings",
       "../test:fake_video_codecs",
       "../test:field_trial",
       "../test:fileutils",
+      "../test:null_transport",
       "../test:perf_test",
       "../test:rtp_test_utils",
       "../test:test_common",