diff --git a/webrtc/base/base_tests.gyp b/webrtc/base/base_tests.gyp
index 2d99e810c..77bed2c6d 100644
--- a/webrtc/base/base_tests.gyp
+++ b/webrtc/base/base_tests.gyp
@@ -47,67 +47,67 @@
       'direct_dependent_settings': {
         'sources': [
           'asynchttprequest_unittest.cc',
-          #'atomicops_unittest.cc',
-          #'autodetectproxy_unittest.cc',
-          #'bandwidthsmoother_unittest.cc',
-          #'base64_unittest.cc',
-          #'basictypes_unittest.cc',
-          #'bind_unittest.cc',
-          #'buffer_unittest.cc',
-          #'bytebuffer_unittest.cc',
-          #'byteorder_unittest.cc',
-          #'callback_unittest.cc',
-          #'cpumonitor_unittest.cc',
-          #'crc32_unittest.cc',
-          #'criticalsection_unittest.cc',
-          #'event_unittest.cc',
-          #'exp_filter_unittest.cc',
-          #'filelock_unittest.cc',
-          #'fileutils_unittest.cc',
-          #'helpers_unittest.cc',
-          #'httpbase_unittest.cc',
-          #'httpcommon_unittest.cc',
-          #'httpserver_unittest.cc',
-          #'ipaddress_unittest.cc',
-          #'logging_unittest.cc',
-          #'md5digest_unittest.cc',
-          #'messagedigest_unittest.cc',
+          'atomicops_unittest.cc',
+          'autodetectproxy_unittest.cc',
+          'bandwidthsmoother_unittest.cc',
+          'base64_unittest.cc',
+          'basictypes_unittest.cc',
+          'bind_unittest.cc',
+          'buffer_unittest.cc',
+          'bytebuffer_unittest.cc',
+          'byteorder_unittest.cc',
+          'callback_unittest.cc',
+          'cpumonitor_unittest.cc',
+          'crc32_unittest.cc',
+          'criticalsection_unittest.cc',
+          'event_unittest.cc',
+          'exp_filter_unittest.cc',
+          'filelock_unittest.cc',
+          'fileutils_unittest.cc',
+          'helpers_unittest.cc',
+          'httpbase_unittest.cc',
+          'httpcommon_unittest.cc',
+          'httpserver_unittest.cc',
+          'ipaddress_unittest.cc',
+          'logging_unittest.cc',
+          'md5digest_unittest.cc',
+          'messagedigest_unittest.cc',
           #'messagequeue_unittest.cc',
-          #'multipart_unittest.cc',
-          #'nat_unittest.cc',
-          #'network_unittest.cc',
-          #'nullsocketserver_unittest.cc',
-          #'optionsfile_unittest.cc',
-          #'pathutils_unittest.cc',
-          #'physicalsocketserver_unittest.cc',
-          #'profiler_unittest.cc',
-          #'proxy_unittest.cc',
-          #'proxydetect_unittest.cc',
-          #'ratelimiter_unittest.cc',
-          #'ratetracker_unittest.cc',
-          #'referencecountedsingletonfactory_unittest.cc',
-          #'rollingaccumulator_unittest.cc',
-          #'scopedptrcollection_unittest.cc',
-          #'sha1digest_unittest.cc',
-          #'sharedexclusivelock_unittest.cc',
-          #'signalthread_unittest.cc',
-          #'sigslot_unittest.cc',
-          #'sigslottester.h',
-          #'sigslottester.h.pump',
-          #'socket_unittest.cc',
-          #'socket_unittest.h',
-          #'socketaddress_unittest.cc',
-          #'stream_unittest.cc',
-          #'stringencode_unittest.cc',
-          #'stringutils_unittest.cc',
+          'multipart_unittest.cc',
+          'nat_unittest.cc',
+          'network_unittest.cc',
+          'nullsocketserver_unittest.cc',
+          'optionsfile_unittest.cc',
+          'pathutils_unittest.cc',
+          'physicalsocketserver_unittest.cc',
+          'profiler_unittest.cc',
+          'proxy_unittest.cc',
+          'proxydetect_unittest.cc',
+          'ratelimiter_unittest.cc',
+          'ratetracker_unittest.cc',
+          'referencecountedsingletonfactory_unittest.cc',
+          'rollingaccumulator_unittest.cc',
+          'scopedptrcollection_unittest.cc',
+          'sha1digest_unittest.cc',
+          'sharedexclusivelock_unittest.cc',
+          'signalthread_unittest.cc',
+          'sigslot_unittest.cc',
+          'sigslottester.h',
+          'sigslottester.h.pump',
+          'socket_unittest.cc',
+          'socket_unittest.h',
+          'socketaddress_unittest.cc',
+          'stream_unittest.cc',
+          'stringencode_unittest.cc',
+          'stringutils_unittest.cc',
           # TODO(ronghuawu): Reenable this test.
           # 'systeminfo_unittest.cc',
-          #'task_unittest.cc',
-          #'testclient_unittest.cc',
+          'task_unittest.cc',
+          'testclient_unittest.cc',
           'thread_checker_unittest.cc',
           #'thread_unittest.cc',
           #'timeutils_unittest.cc',
-          #'urlencode_unittest.cc',
+          'urlencode_unittest.cc',
           #'versionparsing_unittest.cc',
           #'virtualsocket_unittest.cc',
           # TODO(ronghuawu): Reenable this test.
@@ -127,7 +127,7 @@
               #'win32_unittest.cc',
               #'win32regkey_unittest.cc',
               #'win32socketserver_unittest.cc',
-              #'win32toolhelp_unittest.cc',
+              'win32toolhelp_unittest.cc',
               #'win32window_unittest.cc',
               #'win32windowpicker_unittest.cc',
               #'winfirewall_unittest.cc',
@@ -151,7 +151,7 @@
             'sources': [
               #'ssladapter_unittest.cc',
               #'sslidentity_unittest.cc',
-              #'sslstreamadapter_unittest.cc',
+              'sslstreamadapter_unittest.cc',
             ],
           }],
           ['OS=="ios" or (OS=="mac" and target_arch!="ia32")', {
diff --git a/webrtc/base/physicalsocketserver_unittest.cc b/webrtc/base/physicalsocketserver_unittest.cc
index 4d57e730c..395dc8d33 100644
--- a/webrtc/base/physicalsocketserver_unittest.cc
+++ b/webrtc/base/physicalsocketserver_unittest.cc
@@ -141,7 +141,7 @@ TEST_F(PhysicalSocketTest, TestUdpReadyToSendIPv4) {
 
 #endif // if !defined(THREAD_SANITIZER)
 
-TEST_F(PhysicalSocketTest, TestUdpReadyToSendIPv6) {
+TEST_F(PhysicalSocketTest, DISABLED_ON_WIN(TestUdpReadyToSendIPv6)) {
   SocketTest::TestUdpReadyToSendIPv6();
 }