Index: Lib/test/test_socket.py
===================================================================
--- Lib/test/test_socket.py	(revision 67821)
+++ Lib/test/test_socket.py	(working copy)
@@ -96,6 +96,7 @@
         self.server_ready = threading.Event()
         self.client_ready = threading.Event()
         self.done = threading.Event()
+        self.client_done = threading.Event()
         self.queue = Queue.Queue(1)
 
         # Do some munging to start the client test.
@@ -584,10 +585,13 @@
         # Testing shutdown()
         msg = self.cli_conn.recv(1024)
         self.assertEqual(msg, MSG)
+        self.client_done.wait()
+        self.client_done.clear()
 
     def _testShutdown(self):
         self.serv_conn.send(MSG)
         self.serv_conn.shutdown(2)
+        self.client_done.set()
 
 class BasicUDPTest(ThreadedUDPSocketTest):