diff --git a/.gn b/.gn
index a1fca6d036..0491e43867 100644
--- a/.gn
+++ b/.gn
@@ -34,7 +34,6 @@ check_targets = [
   "//webrtc/ortc/*",
   "//webrtc/stats/*",
   "//webrtc/tools/*",
-  "//webrtc/test/*",
   "//webrtc/voice_engine/*",
 ]
 
diff --git a/webrtc/test/BUILD.gn b/webrtc/test/BUILD.gn
index 64b6e03919..9554ccf2f9 100644
--- a/webrtc/test/BUILD.gn
+++ b/webrtc/test/BUILD.gn
@@ -53,13 +53,9 @@ rtc_source_set("video_test_common") {
   }
 
   deps = [
-    "..:webrtc_common",
-    "../base:rtc_base_approved",
-    "../base:rtc_task_queue",
     "../common_video",
     "../media:rtc_media_base",
     "../modules/video_capture:video_capture_module",
-    "../system_wrappers",
   ]
 }
 
@@ -81,7 +77,6 @@ rtc_source_set("rtp_test_utils") {
 
   deps = [
     "..:webrtc_common",
-    "../base:rtc_base_approved",
     "../modules/rtp_rtcp",
     "//testing/gtest",
   ]
@@ -112,7 +107,6 @@ rtc_source_set("test_main") {
   ]
   deps = [
     ":field_trial",
-    "../base:rtc_base_approved",
     "../system_wrappers:metrics_default",
     "//testing/gmock",
     "//testing/gtest",
@@ -131,16 +125,6 @@ rtc_source_set("fileutils") {
     configs += [ "//build/config/compiler:enable_arc" ]
   }
   visibility = [ ":*" ]
-  deps = [
-    "..:webrtc_common",
-    "../base:rtc_base_approved",
-  ]
-  if (is_ios) {
-    deps += [ "../sdk:rtc_sdk_common_objc" ]
-  }
-  if (is_win) {
-    deps += [ "../base:rtc_base" ]
-  }
 }
 
 rtc_source_set("video_test_support") {
@@ -159,9 +143,6 @@ rtc_source_set("video_test_support") {
   ]
 
   deps = [
-    ":test_support",
-    ":video_test_common",
-    "..:webrtc_common",
     "../base:rtc_base_approved",
     "../common_video",
     "../system_wrappers",
@@ -210,7 +191,6 @@ rtc_source_set("test_support") {
   ]
 
   deps = [
-    "..:webrtc_common",
     "../base:gtest_prod",
     "../base:rtc_base_approved",
     "../common_video",
@@ -316,20 +296,12 @@ rtc_test("test_support_unittests") {
 
   deps += [
     ":direct_transport",
-    ":fake_audio_device",
     ":fileutils_unittests",
-    ":rtp_test_utils",
     ":test_common",
     ":test_main",
     ":video_test_common",
     ":video_test_support",
-    "../api:video_frame_api",
-    "../base:rtc_base_approved",
-    "../call:call_interfaces",
-    "../common_audio",
-    "../modules/rtp_rtcp",
     "../modules/video_capture",
-    "../system_wrappers",
     "//testing/gmock",
     "//testing/gtest",
     "//third_party/gflags",
@@ -342,7 +314,6 @@ rtc_source_set("fileutils_unittests") {
   ]
   deps = [
     ":fileutils",
-    ":test_support",
     "//testing/gmock",
     "//testing/gtest",
   ]
@@ -361,12 +332,9 @@ rtc_source_set("direct_transport") {
     suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
   }
   deps = [
-    "..:webrtc_common",
     "../api:transport_api",
     "../base:rtc_base_approved",
     "../call",
-    "../modules/rtp_rtcp",
-    "../system_wrappers",
   ]
 }
 
@@ -381,11 +349,8 @@ rtc_source_set("fake_audio_device") {
     suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
   }
   deps = [
-    "..:webrtc_common",
     "../base:rtc_base_approved",
-    "../common_audio",
-    "../modules/audio_device",
-    "../system_wrappers",
+    "../modules/audio_device:audio_device",
   ]
 }
 
@@ -438,25 +403,13 @@ rtc_source_set("test_common") {
     ":test_support",
     ":video_test_common",
     "..:webrtc_common",
-    "../api:transport_api",
-    "../api:video_frame_api",
-    "../api/audio_codecs:builtin_audio_decoder_factory",
     "../api/video_codecs:video_codecs_api",
     "../audio",
     "../base:rtc_base_approved",
-    "../base:rtc_task_queue",
     "../call",
-    "../logging:rtc_event_log_api",
-    "../modules/audio_device:mock_audio_device",
     "../modules/audio_mixer:audio_mixer_impl",
     "../modules/audio_processing",
-    "../modules/rtp_rtcp:rtp_rtcp",
-    "../modules/video_coding:webrtc_h264",
-    "../modules/video_coding:webrtc_vp8",
-    "../modules/video_coding:webrtc_vp9",
-    "../system_wrappers",
     "../video",
-    "../voice_engine",
     "//testing/gmock",
     "//testing/gtest",
   ]
@@ -532,9 +485,6 @@ rtc_source_set("test_renderer") {
 
   deps = [
     ":test_support",
-    "..:webrtc_common",
-    "../base:rtc_base_approved",
-    "../common_video",
     "../modules/media_file",
     "//testing/gtest",
   ]
@@ -546,10 +496,4 @@ rtc_source_set("audio_codec_mocks") {
     "mock_audio_decoder.h",
     "mock_audio_decoder_factory.h",
   ]
-  deps = [
-    ":test_support",
-    "../api/audio_codecs:audio_codecs_api",
-    "../api/audio_codecs:builtin_audio_decoder_factory",
-    "../base:rtc_base_approved",
-  ]
 }