diff --git a/ssb/packet_stream.py b/ssb/packet_stream.py
index 2fcaf96..fd415dd 100644
--- a/ssb/packet_stream.py
+++ b/ssb/packet_stream.py
@@ -207,8 +207,8 @@ class PSClient(PSConnection):
         self.connection.on_connect(self._on_connect)
         self.loop = loop
 
-    def connect(self):
-        self.connection.connect()
+    async def connect(self):
+        await self.connection.connect()
 
 
 class PSServer(PSConnection):
diff --git a/test_client.py b/test_client.py
index 151a44c..3b62b4b 100644
--- a/test_client.py
+++ b/test_client.py
@@ -80,7 +80,7 @@ sign = SigningKey(server_prv_key[:32])
 
 loop = get_event_loop()
 packet_stream = PSClient('127.0.0.1', 8008, sign, server_pub_key, loop=loop)
-packet_stream.connect()
+loop.run_until_complete(packet_stream.connect())
 api.add_connection(packet_stream)
 
 loop.run_until_complete(gather(ensure_future(api), main()))
diff --git a/test_server.py b/test_server.py
index e002fd8..59a2a28 100644
--- a/test_server.py
+++ b/test_server.py
@@ -15,7 +15,7 @@ with open(os.path.expanduser('~/.ssb/secret')) as f:
 
 
 async def on_connect():
-    loop.create_task(ensure_future(packet_stream))
+    ensure_future(packet_stream, loop=loop)
 
 # create console handler and set level to debug
 ch = logging.StreamHandler()