Index: Lib/test/test_socket.py
===================================================================
--- Lib/test/test_socket.py	(revision 79546)
+++ Lib/test/test_socket.py	(working copy)
@@ -1367,6 +1367,7 @@
 
 
 def test_main():
+    test_support.requires('network')
     tests = [GeneralModuleTests, BasicTCPTest, TCPCloserTest, TCPTimeoutTest,
              TestExceptions, BufferIOTest, BasicTCPTest2]
     if sys.platform != 'mac':
Index: Lib/test/test_ssl.py
===================================================================
--- Lib/test/test_ssl.py	(revision 79546)
+++ Lib/test/test_ssl.py	(working copy)
@@ -49,27 +49,6 @@
 
 class BasicTests(unittest.TestCase):
 
-    def testSSLconnect(self):
-        if not test_support.is_resource_enabled('network'):
-            return
-        s = ssl.wrap_socket(socket.socket(socket.AF_INET),
-                            cert_reqs=ssl.CERT_NONE)
-        s.connect(("svn.python.org", 443))
-        c = s.getpeercert()
-        if c:
-            raise test_support.TestFailed("Peer cert %s shouldn't be here!")
-        s.close()
-
-        # this should fail because we have no verification certs
-        s = ssl.wrap_socket(socket.socket(socket.AF_INET),
-                            cert_reqs=ssl.CERT_REQUIRED)
-        try:
-            s.connect(("svn.python.org", 443))
-        except ssl.SSLError:
-            pass
-        finally:
-            s.close()
-
     def testCrucialConstants(self):
         ssl.PROTOCOL_SSLv2
         ssl.PROTOCOL_SSLv23
@@ -113,6 +92,7 @@
 class NetworkedTests(unittest.TestCase):
 
     def testConnect(self):
+        test_support.requires('network')
         s = ssl.wrap_socket(socket.socket(socket.AF_INET),
                             cert_reqs=ssl.CERT_NONE)
         s.connect(("svn.python.org", 443))
@@ -144,6 +124,7 @@
 
 
     def testNonBlockingHandshake(self):
+        test_support.requires('network')
         s = socket.socket(socket.AF_INET)
         s.connect(("svn.python.org", 443))
         s.setblocking(False)
@@ -168,6 +149,7 @@
             sys.stdout.write("\nNeeded %d calls to do_handshake() to establish session.\n" % count)
 
     def testFetchServerCert(self):
+        test_support.requires('network')
 
         pem = ssl.get_server_certificate(("svn.python.org", 443))
         if not pem:
@@ -600,6 +582,7 @@
 
 
     def badCertTest (certfile):
+        test_support.requires('network')
         server = ThreadedEchoServer(CERTFILE,
                                     certreqs=ssl.CERT_REQUIRED,
                                     cacerts=CERTFILE, chatty=False)
@@ -720,6 +703,7 @@
     class ThreadedTests(unittest.TestCase):
 
         def testRudeShutdown(self):
+            test_support.requires('network')
 
             listener_ready = threading.Event()
             listener_gone = threading.Event()
@@ -757,6 +741,7 @@
             t.join()
 
         def testEcho (self):
+            test_support.requires('network')
 
             if test_support.verbose:
                 sys.stdout.write("\n")
@@ -765,6 +750,7 @@
                              chatty=True, connectionchatty=True)
 
         def testReadCert(self):
+            test_support.requires('network')
 
             if test_support.verbose:
                 sys.stdout.write("\n")
@@ -833,6 +819,7 @@
                                      "badkey.pem"))
 
         def testProtocolSSL2(self):
+            test_support.requires('network')
             if test_support.verbose:
                 sys.stdout.write("\n")
             tryProtocolCombo(ssl.PROTOCOL_SSLv2, ssl.PROTOCOL_SSLv2, True)
@@ -843,6 +830,7 @@
             tryProtocolCombo(ssl.PROTOCOL_SSLv2, ssl.PROTOCOL_TLSv1, False)
 
         def testProtocolSSL23(self):
+            test_support.requires('network')
             if test_support.verbose:
                 sys.stdout.write("\n")
             try:
@@ -866,6 +854,7 @@
             tryProtocolCombo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_TLSv1, True, ssl.CERT_REQUIRED)
 
         def testProtocolSSL3(self):
+            test_support.requires('network')
             if test_support.verbose:
                 sys.stdout.write("\n")
             tryProtocolCombo(ssl.PROTOCOL_SSLv3, ssl.PROTOCOL_SSLv3, True)
@@ -876,6 +865,7 @@
             tryProtocolCombo(ssl.PROTOCOL_SSLv3, ssl.PROTOCOL_TLSv1, False)
 
         def testProtocolTLS1(self):
+            test_support.requires('network')
             if test_support.verbose:
                 sys.stdout.write("\n")
             tryProtocolCombo(ssl.PROTOCOL_TLSv1, ssl.PROTOCOL_TLSv1, True)
@@ -886,6 +876,7 @@
             tryProtocolCombo(ssl.PROTOCOL_TLSv1, ssl.PROTOCOL_SSLv23, False)
 
         def testSTARTTLS (self):
+            test_support.requires('network')
 
             msgs = ("msg 1", "MSG 2", "STARTTLS", "MSG 3", "msg 4", "ENDTLS", "msg 5", "msg 6")
 
@@ -952,6 +943,7 @@
                 server.join()
 
         def testSocketServer(self):
+            test_support.requires('network')
 
             server = SocketServerHTTPSServer(CERTFILE)
             flag = threading.Event()
@@ -991,6 +983,7 @@
                 server.join()
 
         def testWrappedAccept (self):
+            test_support.requires('network')
 
             if test_support.verbose:
                 sys.stdout.write("\n")
@@ -1001,6 +994,7 @@
 
 
         def testAsyncoreServer (self):
+            test_support.requires('network')
 
             indata = "TEST MESSAGE of mixed case\n"
 
@@ -1044,6 +1038,7 @@
 
 
         def testAllRecvAndSendMethods(self):
+            test_support.requires('network')
 
             if test_support.verbose:
                 sys.stdout.write("\n")
@@ -1183,14 +1178,11 @@
     if not TESTPORT:
         raise test_support.TestFailed("Can't find open port to test servers on!")
 
-    tests = [BasicTests]
+    tests = [BasicTests, NetworkedTests]
 
-    if test_support.is_resource_enabled('network'):
-        tests.append(NetworkedTests)
-
     if _have_threads:
         thread_info = test_support.threading_setup()
-        if thread_info and test_support.is_resource_enabled('network'):
+        if thread_info:
             tests.append(ThreadedTests)
 
     test_support.run_unittest(*tests)