diff --git a/tests/mockserver.py b/tests/mockserver.py
index 77908284b..b766bb653 100644
--- a/tests/mockserver.py
+++ b/tests/mockserver.py
@@ -206,8 +206,7 @@ class MockServer():
 
     def __exit__(self, exc_type, exc_value, traceback):
         self.proc.kill()
-        self.proc.wait()
-        time.sleep(0.2)
+        self.proc.communicate()
 
     def url(self, path, is_secure=False):
         host = self.http_address.replace('0.0.0.0', '127.0.0.1')