diff --git a/test/test_ssl.py b/test/test_ssl.py
index 44fee21..a7c744e 100644
--- a/test/test_ssl.py
+++ b/test/test_ssl.py
@@ -43,8 +43,8 @@
     client = socket()
     client.setblocking(False)
     client.connect_ex(port.getsockname())
+    client.setblocking(True)
     server = port.accept()[0]
-    server.setblocking(False)
 
     # Let's pass some unencrypted data to make sure our socket connection is
     # fine.  Just one byte, so we don't have to worry about buffers getting
@@ -54,9 +54,14 @@
     client.send("y")
     assert server.recv(1024) == "y"
 
+    # All our callers want non-blocking sockets, make it easy for them.
+    server.setblocking(False)
+    client.setblocking(False)
+
     return (server, client)
 
 
+
 class ContextTests(TestCase):
     """
     Unit tests for L{OpenSSL.SSL.Context}.