diff --git a/tests/test_rpc_server.py b/tests/test_rpc_server.py
index 3094616f5..5e5bb86ed 100644
--- a/tests/test_rpc_server.py
+++ b/tests/test_rpc_server.py
@@ -37,6 +37,7 @@ class ServerSetupMixin(object):
 
         def stop(self, ctxt):
             self._server.stop()
+            self._server.wait()
 
         def start(self):
             self._server.start()