diff --git a/tests/__init__.py b/tests/__init__.py
index 70b11ae..fa181e8 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -256,10 +256,12 @@ class Modeltests(unittest.TestCase):
 
         # Terminate worker and broker
         self.worker.terminate()
+        self.worker.wait()
         self.broker.terminate()
+        self.broker.wait()
 
         # Remove testdir
-        #shutil.rmtree(self.path)
+        shutil.rmtree(self.path)
         self.path = None
 
     def get_csrf(self, url='/new'):