diff --git a/ntunnel.py b/ntunnel.py
index 6ef35e4..28a5e67 100644
--- a/ntunnel.py
+++ b/ntunnel.py
@@ -779,6 +779,13 @@ class TestMain(unittest.TestCase):
 		lsock.close()
 		await lsock.wait_closed()
 
+		# Kill off the client
+		client.terminate()
+
+		stdout, stderr = await client.communicate()
+		#print('s:', repr((stdout, stderr)))
+		# XXX - figure out how to clean up client properly
+
 	@async_test
 	async def test_end2end(self):
 		# Generate necessar keys
@@ -862,6 +869,10 @@ class TestMain(unittest.TestCase):
 		lsock.close()
 		await lsock.wait_closed()
 
+		server.terminate()
+		client.terminate()
+		# XXX - more clean up testing
+
 	@async_test
 	async def test_genkey(self):
 		# that it can generate a key