diff --git a/hbmqtt/broker.py b/hbmqtt/broker.py
index ccd512e..2efd06c 100644
--- a/hbmqtt/broker.py
+++ b/hbmqtt/broker.py
@@ -112,7 +112,7 @@ class Server:
     def close_instance(self):
         if self.instance:
             self.instance.close()
-            yield self.instance.wait_closed()
+            yield from self.instance.wait_closed()
 
 
 class BrokerContext(BaseContext):
diff --git a/tests/broker/__init__.py b/tests/test_broker.py
similarity index 100%
rename from tests/broker/__init__.py
rename to tests/test_broker.py