diff --git a/benchmarks/bibw-asyncio.py b/benchmarks/bibw-asyncio.py
index a4c61250bf4..e2437a17737 100644
--- a/benchmarks/bibw-asyncio.py
+++ b/benchmarks/bibw-asyncio.py
@@ -73,6 +73,7 @@ async def talk_to_client(client_ep):
         recv_buffer_region.free_host()
 
     ucp.destroy_ep(client_ep)
+    ucp.stop_server()
 
 async def talk_to_server(ip, port):
 
diff --git a/benchmarks/bibw-future.py b/benchmarks/bibw-future.py
index a7486891fd3..818ae3bc94d 100644
--- a/benchmarks/bibw-future.py
+++ b/benchmarks/bibw-future.py
@@ -80,6 +80,7 @@ def talk_to_client(client_ep):
 
     ucp.destroy_ep(client_ep)
     cb_not_done = False
+    ucp.stop_server()
 
 def talk_to_server(ip, port):
 
diff --git a/benchmarks/lat-asyncio-blind-recv.py b/benchmarks/lat-asyncio-blind-recv.py
index a509653e2ff..fa57e67b099 100644
--- a/benchmarks/lat-asyncio-blind-recv.py
+++ b/benchmarks/lat-asyncio-blind-recv.py
@@ -55,6 +55,7 @@ async def talk_to_client(client_ep):
         send_buffer_region.free_host()
 
     ucp.destroy_ep(client_ep)
+    ucp.stop_server()
 
 async def talk_to_server(ip, port):
 
diff --git a/benchmarks/lat-asyncio-fast.py b/benchmarks/lat-asyncio-fast.py
index b890ad443cd..93aa9145179 100644
--- a/benchmarks/lat-asyncio-fast.py
+++ b/benchmarks/lat-asyncio-fast.py
@@ -59,6 +59,7 @@ async def talk_to_client(client_ep):
         recv_buffer_region.free_host()
 
     ucp.destroy_ep(client_ep)
+    ucp.stop_server()
 
 async def talk_to_server(ip, port):
 
diff --git a/benchmarks/lat-asyncio.py b/benchmarks/lat-asyncio.py
index 24e11a54ee2..9abcfa40c85 100644
--- a/benchmarks/lat-asyncio.py
+++ b/benchmarks/lat-asyncio.py
@@ -59,6 +59,7 @@ async def talk_to_client(client_ep):
         recv_buffer_region.free_host()
 
     ucp.destroy_ep(client_ep)
+    ucp.stop_server()
 
 async def talk_to_server(ip, port):
 
diff --git a/benchmarks/lat-fast.py b/benchmarks/lat-fast.py
index 769116e395b..b851f89fc35 100644
--- a/benchmarks/lat-fast.py
+++ b/benchmarks/lat-fast.py
@@ -94,6 +94,7 @@ def talk_to_client(client_ep):
 
     ucp.destroy_ep(client_ep)
     cb_not_done = False
+    ucp.stop_server()
 
 def talk_to_server(ip, port):
 
diff --git a/benchmarks/unibw-asyncio.py b/benchmarks/unibw-asyncio.py
index aecc1856f63..dfc6cac01a0 100644
--- a/benchmarks/unibw-asyncio.py
+++ b/benchmarks/unibw-asyncio.py
@@ -62,6 +62,7 @@ async def talk_to_client(client_ep):
         send_buffer_region.free_host()
 
     ucp.destroy_ep(client_ep)
+    ucp.stop_server()
 
 async def talk_to_server(ip, port):
 
diff --git a/benchmarks/unibw-future.py b/benchmarks/unibw-future.py
index f44c3d80927..42a4e734059 100644
--- a/benchmarks/unibw-future.py
+++ b/benchmarks/unibw-future.py
@@ -70,6 +70,7 @@ def talk_to_client(client_ep):
 
     ucp.destroy_ep(client_ep)
     cb_not_done = False
+    ucp.stop_server()
 
 def talk_to_server(ip, port):
 
diff --git a/tests/test-duality-data-validity-msg-preallocated.py b/tests/test-duality-data-validity-msg-preallocated.py
index 03009d397c3..990f48dfc58 100644
--- a/tests/test-duality-data-validity-msg-preallocated.py
+++ b/tests/test-duality-data-validity-msg-preallocated.py
@@ -39,6 +39,7 @@ async def talk_to_client(client_ep):
     send_buffer_region.free_cuda()
     recv_buffer_region.free_cuda()
     ucp.destroy_ep(client_ep)
+    ucp.stop_server()
 
 async def talk_to_server(ip, port):
 
diff --git a/tests/test-duality-data-validity.py b/tests/test-duality-data-validity.py
index a65ed78e4c8..2d5b83e6b22 100644
--- a/tests/test-duality-data-validity.py
+++ b/tests/test-duality-data-validity.py
@@ -33,6 +33,7 @@ async def talk_to_client(client_ep):
 
     buffer_region.free_cuda()
     ucp.destroy_ep(client_ep)
+    ucp.stop_server()
 
 async def talk_to_server(ip, port):
 
diff --git a/tests/test-duality.py b/tests/test-duality.py
index d5b3301e0e3..fcc1871cf78 100644
--- a/tests/test-duality.py
+++ b/tests/test-duality.py
@@ -27,9 +27,12 @@ async def talk_to_client(client_ep):
 
     buffer_region.free_cuda()
     ucp.destroy_ep(client_ep)
+    print("done with talk_to_client")
+    ucp.stop_server()
 
 async def talk_to_server(ip, port):
 
+    print("in talk_to_server")
     msg_log = max_msg_log
 
     server_ep = ucp.get_endpoint(ip, port)
@@ -45,6 +48,7 @@ async def talk_to_server(ip, port):
 
     buffer_region.free_cuda()
     ucp.destroy_ep(server_ep)
+    print("done with talk_to_server")
 
 parser = argparse.ArgumentParser()
 parser.add_argument('-s','--server', help='enter server ip', required=False)
@@ -74,9 +78,10 @@ async def talk_to_server(ip, port):
     asyncio.gather(coro_server, coro_client)
 )
 
-try:
-    loop.run_forever()
-except KeyboardInterrupt:
-    pass
+#try:
+#    loop.run_forever()
+#except KeyboardInterrupt:
+#    pass
 
 loop.close()
+ucp.fin()
diff --git a/tests/test-server-listen-accept-future-await.py b/tests/test-server-listen-accept-future-await.py
index 242b0c91e2a..dabe9621672 100644
--- a/tests/test-server-listen-accept-future-await.py
+++ b/tests/test-server-listen-accept-future-await.py
@@ -34,6 +34,7 @@ async def talk_to_client(client_ep):
     recv_buffer_region.free_cuda()
     ucp.destroy_ep(client_ep)
     print('talk_to_client done')
+    ucp.stop_server()
 
 async def talk_to_server(ip, port):
 
diff --git a/tests/test-server-listen-accept-future-recv.py b/tests/test-server-listen-accept-future-recv.py
index 7361153b9fd..ec343cb8fc8 100644
--- a/tests/test-server-listen-accept-future-recv.py
+++ b/tests/test-server-listen-accept-future-recv.py
@@ -29,6 +29,7 @@ async def talk_to_client(client_ep):
     ucp.destroy_ep(client_ep)
 
     print("passed talk_to_client")
+    ucp.stop_server()
 
 async def talk_to_server(ip, port):