diff --git a/pc/BUILD.gn b/pc/BUILD.gn
index 89c4df8855..0fb619ce2d 100644
--- a/pc/BUILD.gn
+++ b/pc/BUILD.gn
@@ -316,11 +316,10 @@ if (rtc_include_tests) {
     testonly = true
     sources = [
       "peerconnection_rampup_tests.cc",
-      "peerconnectionwrapper.cc",
-      "peerconnectionwrapper.h",
     ]
     deps = [
       ":pc_test_utils",
+      ":peerconnection_wrapper",
       "../api:audio_options_api",
       "../api:create_peerconnection_factory",
       "../api:libjingle_peerconnection_api",
@@ -341,7 +340,6 @@ if (rtc_include_tests) {
       "../rtc_base:checks",
       "../rtc_base:gunit_helpers",
       "../rtc_base:rtc_base",
-      "../rtc_base:rtc_base_approved",
       "../rtc_base:rtc_base_tests_utils",
       "../system_wrappers:system_wrappers",
       "../test:perf_test",
@@ -355,6 +353,28 @@ if (rtc_include_tests) {
     }
   }
 
+  rtc_source_set("peerconnection_wrapper") {
+    testonly = true
+    sources = [
+      "peerconnectionwrapper.cc",
+      "peerconnectionwrapper.h",
+    ]
+    deps = [
+      ":pc_test_utils",
+      "../api:libjingle_peerconnection_api",
+      "../api:rtc_stats_api",
+      "../pc:peerconnection",
+      "../rtc_base:checks",
+      "../rtc_base:gunit_helpers",
+      "../rtc_base:rtc_base_approved",
+      "../test:test_support",
+    ]
+    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_source_set("pc_test_utils") {
     testonly = true
     sources = [