diff --git a/webrtc/BUILD.gn b/webrtc/BUILD.gn
index cef4c4e7f3..61fc48cc8f 100644
--- a/webrtc/BUILD.gn
+++ b/webrtc/BUILD.gn
@@ -695,9 +695,6 @@ if (rtc_include_tests) {
     public_configs = [ ":common_inherited_config" ]
     sources = [
       "base/nullsocketserver_unittest.cc",
-      "base/physicalsocketserver_unittest.cc",
-      "base/socket_unittest.cc",
-      "base/socket_unittest.h",
       "base/socketaddress_unittest.cc",
       "base/virtualsocket_unittest.cc",
     ]
@@ -707,16 +704,16 @@ if (rtc_include_tests) {
       "//testing/gtest",
     ]
     if (is_win) {
-      sources += [ "base/win32socketserver_unittest.cc" ]
-
       # TODO(ronghuawu): Fix TestUdpReadyToSendIPv6 on windows bot then reenable
       # these tests.
+      # sources += [ "base/win32socketserver_unittest.cc" ]
+    } else {
       # TODO(pbos): Move test disabling to ifdefs within the test files instead
       # of here.
-      sources -= [
+      sources += [
         "base/physicalsocketserver_unittest.cc",
         "base/socket_unittest.cc",
-        "base/win32socketserver_unittest.cc",
+        "base/socket_unittest.h",
       ]
     }
     if (is_android) {
diff --git a/webrtc/webrtc_tests.gypi b/webrtc/webrtc_tests.gypi
index b5da843d81..811c447474 100644
--- a/webrtc/webrtc_tests.gypi
+++ b/webrtc/webrtc_tests.gypi
@@ -471,9 +471,6 @@
       'type': '<(gtest_target_type)',
       'sources': [
         'base/nullsocketserver_unittest.cc',
-        'base/physicalsocketserver_unittest.cc',
-        'base/socket_unittest.cc',
-        'base/socket_unittest.h',
         'base/socketaddress_unittest.cc',
         'base/virtualsocket_unittest.cc',
       ],
@@ -493,16 +490,17 @@
         }],
         ['OS=="win"', {
           'sources': [
-            'base/win32socketserver_unittest.cc',
+              # TODO(ronghuawu): Fix TestUdpReadyToSendIPv6 on windows bot
+              # then reenable these tests.
+              # 'base/win32socketserver_unittest.cc',
           ],
-          'sources!': [
-            # TODO(ronghuawu): Fix TestUdpReadyToSendIPv6 on windows bot
-            # then reenable these tests.
-            # TODO(pbos): Move test disabling to ifdefs within the test files
-            # instead of here.
+        }, {
+          # TODO(pbos): Move test disabling to ifdefs within the test files
+          # instead of here.
+          'sources': [
             'base/physicalsocketserver_unittest.cc',
             'base/socket_unittest.cc',
-            'base/win32socketserver_unittest.cc',
+            'base/socket_unittest.h',
           ],
         }],
         ['OS=="mac"', {