diff --git a/webrtc/test/BUILD.gn b/webrtc/test/BUILD.gn
index 0e885c84b4..a4c018524f 100644
--- a/webrtc/test/BUILD.gn
+++ b/webrtc/test/BUILD.gn
@@ -312,6 +312,25 @@ rtc_source_set("fileutils_unittests") {
   ]
 }
 
+rtc_source_set("direct_transport") {
+  testonly = true
+  sources = [
+    "direct_transport.cc",
+    "direct_transport.h",
+    "fake_network_pipe.cc",
+    "fake_network_pipe.h",
+  ]
+  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" ]
+  }
+  deps = [
+    "../api:transport_api",
+    "../base:rtc_base_approved",
+    "../call",
+  ]
+}
+
 rtc_source_set("test_common") {
   testonly = true
   sources = [
@@ -321,8 +340,6 @@ rtc_source_set("test_common") {
     "configurable_frame_size_encoder.h",
     "constants.cc",
     "constants.h",
-    "direct_transport.cc",
-    "direct_transport.h",
     "drifting_clock.cc",
     "drifting_clock.h",
     "encoder_settings.cc",
@@ -333,8 +350,6 @@ rtc_source_set("test_common") {
     "fake_decoder.h",
     "fake_encoder.cc",
     "fake_encoder.h",
-    "fake_network_pipe.cc",
-    "fake_network_pipe.h",
     "fake_videorenderer.h",
     "layer_filtering_transport.cc",
     "layer_filtering_transport.h",
@@ -361,10 +376,10 @@ rtc_source_set("test_common") {
   }
 
   deps = [
+    ":direct_transport",
     ":rtp_test_utils",
     ":test_support",
     "..:webrtc_common",
-    "../api:transport_api",
     "../audio",
     "../base:rtc_base_approved",
     "../call",
diff --git a/webrtc/test/direct_transport.cc b/webrtc/test/direct_transport.cc
index a5bd05a3c2..922874d111 100644
--- a/webrtc/test/direct_transport.cc
+++ b/webrtc/test/direct_transport.cc
@@ -11,7 +11,6 @@
 
 #include "webrtc/call/call.h"
 #include "webrtc/system_wrappers/include/clock.h"
-#include "webrtc/test/gtest.h"
 
 namespace webrtc {
 namespace test {