diff --git a/tests/test_interface.py b/tests/test_interface.py
index aa54f9bdd..da4f607cd 100644
--- a/tests/test_interface.py
+++ b/tests/test_interface.py
@@ -71,6 +71,7 @@ class MockNetwork:
         self.proxy = None
         self.debug = True
         self.bhi_lock = asyncio.Lock()
+        self.interface = None  # type: Interface | None
 
     async def connection_down(self, interface: Interface):
         pass
@@ -199,7 +200,10 @@ class TestInterface(ElectrumTestCase):
         self.network = MockNetwork(config=self.config)
 
     async def asyncTearDown(self):
+        if self.network.interface:
+            await self.network.interface.close()
         self._server.close()
+        await self._server.wait_closed()
         await super().asyncTearDown()
 
     async def _start_iface_and_wait_for_sync(self):
diff --git a/tests/test_lntransport.py b/tests/test_lntransport.py
index 07bd1fc27..bcad665db 100644
--- a/tests/test_lntransport.py
+++ b/tests/test_lntransport.py
@@ -102,6 +102,7 @@ class TestLNTransport(ElectrumTestCase):
                 for t in transports:
                     t.close()
                 server.close()
+                await server.wait_closed()
 
         await f()