diff --git a/webrtc/BUILD.gn b/webrtc/BUILD.gn
index 6e8db22206..41928075ea 100644
--- a/webrtc/BUILD.gn
+++ b/webrtc/BUILD.gn
@@ -612,26 +612,6 @@ if (rtc_include_tests) {
     }
   }
 
-  rtc_source_set("video_quality_test") {
-    testonly = true
-    sources = [
-      "video/video_quality_test.cc",
-      "video/video_quality_test.h",
-    ]
-    deps = [
-      ":webrtc",
-      "system_wrappers",
-      "//testing/gtest",
-    ]
-    if (!is_android) {
-      deps += [ "modules/video_capture:video_capture_internal_impl" ]
-    }
-    if (!build_with_chromium && is_clang) {
-      # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
-      suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
-    }
-  }
-
   webrtc_perf_tests_resources = [
     "//resources/audio_coding/speech_mono_16kHz.pcm",
     "//resources/audio_coding/testfile32kHz.pcm",
@@ -666,63 +646,6 @@ if (rtc_include_tests) {
     ]
   }
 
-  rtc_executable("video_loopback") {
-    testonly = true
-    sources = [
-      "test/run_test.h",
-      "video/video_loopback.cc",
-    ]
-
-    if (is_mac) {
-      sources += [ "test/mac/run_test.mm" ]
-    } else {
-      sources += [ "test/run_test.cc" ]
-    }
-    deps = [
-      ":video_quality_test",
-      "system_wrappers:metrics_default",
-      "test:field_trial",
-      "test:test_common",
-      "test:test_renderer",
-      "//testing/gmock",
-      "//testing/gtest",
-      "//third_party/gflags",
-    ]
-    if (!build_with_chromium && is_clang) {
-      # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
-      suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
-    }
-  }
-
-  rtc_executable("screenshare_loopback") {
-    testonly = true
-    sources = [
-      "test/run_test.h",
-      "video/screenshare_loopback.cc",
-    ]
-
-    if (is_mac) {
-      sources += [ "test/mac/run_test.mm" ]
-    } else {
-      sources += [ "test/run_test.cc" ]
-    }
-    deps = [
-      ":video_quality_test",
-      "system_wrappers:metrics_default",
-      "test:field_trial",
-      "test:test_common",
-      "test:test_renderer",
-      "//testing/gmock",
-      "//testing/gtest",
-      "//third_party/gflags",
-    ]
-    if (is_clang && !is_nacl) {
-      # Suppress warnings from Chrome's Clang plugins.
-      # See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
-      suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
-    }
-  }
-
   rtc_test("webrtc_perf_tests") {
     testonly = true
     configs += [ ":rtc_unittests_config" ]
@@ -738,8 +661,6 @@ if (rtc_include_tests) {
       "video/full_stack.cc",
     ]
     deps = [
-      ":video_quality_test",
-      ":webrtc",
       "modules/audio_coding:neteq_test_support",
       "modules/audio_processing",
       "modules/audio_processing:audioproc_test_utils",
@@ -748,6 +669,7 @@ if (rtc_include_tests) {
       "test:test_common",
       "test:test_main",
       "test:test_renderer",
+      "video:video_quality_test",
       "voice_engine",
       "//testing/gmock",
       "//testing/gtest",
diff --git a/webrtc/test/BUILD.gn b/webrtc/test/BUILD.gn
index 5a1e71aa9a..326a3b1e95 100644
--- a/webrtc/test/BUILD.gn
+++ b/webrtc/test/BUILD.gn
@@ -193,6 +193,18 @@ rtc_source_set("test_support_main_threaded_mac") {
   ]
 }
 
+rtc_source_set("run_test") {
+  testonly = true
+  sources = [
+    "run_test.h",
+  ]
+  if (is_mac) {
+    sources += [ "mac/run_test.mm" ]
+  } else {
+    sources += [ "run_test.cc" ]
+  }
+}
+
 test_support_unittests_resources = [
   "//resources/foreman_cif_short.yuv",
   "//resources/video_coding/frame-ethernet-ii.pcap",
@@ -322,6 +334,7 @@ rtc_source_set("test_common") {
     "../base:rtc_base_approved",
     "../call",
     "../modules/media_file",
+    "../modules/video_capture:video_capture_module",
     "../video",
     "//testing/gmock",
     "//testing/gtest",
diff --git a/webrtc/video/BUILD.gn b/webrtc/video/BUILD.gn
index 863f2f5740..c8d32b0dda 100644
--- a/webrtc/video/BUILD.gn
+++ b/webrtc/video/BUILD.gn
@@ -73,6 +73,71 @@ rtc_static_library("video") {
 }
 
 if (rtc_include_tests) {
+  rtc_source_set("video_quality_test") {
+    testonly = true
+    sources = [
+      "video_quality_test.cc",
+      "video_quality_test.h",
+    ]
+    deps = [
+      "../system_wrappers",
+      "//testing/gtest",
+    ]
+    if (!is_android) {
+      deps += [ "../modules/video_capture:video_capture_internal_impl" ]
+    }
+    if (!build_with_chromium && is_clang) {
+      # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
+      suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
+    }
+  }
+
+  rtc_executable("video_loopback") {
+    testonly = true
+    sources = [
+      "video_loopback.cc",
+    ]
+    deps = [
+      ":video_quality_test",
+      "../system_wrappers:metrics_default",
+      "../test:field_trial",
+      "../test:run_test",
+      "../test:test_common",
+      "../test:test_renderer",
+      "//testing/gmock",
+      "//testing/gtest",
+      "//third_party/gflags",
+    ]
+    if (!build_with_chromium && is_clang) {
+      # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
+      suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
+    }
+  }
+
+  rtc_executable("screenshare_loopback") {
+    testonly = true
+    sources = [
+      "screenshare_loopback.cc",
+    ]
+
+    deps = [
+      ":video_quality_test",
+      "../system_wrappers:metrics_default",
+      "../test:field_trial",
+      "../test:run_test",
+      "../test:test_common",
+      "../test:test_renderer",
+      "//testing/gmock",
+      "//testing/gtest",
+      "//third_party/gflags",
+    ]
+    if (!build_with_chromium && is_clang) {
+      # Suppress warnings from Chrome's Clang plugins.
+      # See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
+      suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
+    }
+  }
+
   # TODO(pbos): Rename test suite.
   rtc_source_set("video_tests") {
     testonly = true