1 files changed, 7 insertions, 0 deletions

diff --git a/src/mailman/testing/layers.py b/src/mailman/testing/layers.py
index eb51e309f..006feef9c 100644
--- a/src/mailman/testing/layers.py
+++ b/src/mailman/testing/layers.py
@@ -190,6 +190,13 @@ class ConfigLayer(MockAndMonkeyLayer):
     @classmethod
     def tearDown(cls):
         assert cls.var_dir is not None, 'Layer not set up'
+        reset_the_world()
+        # Destroy the test database after the tests are done so that there is
+        # no data in case the tests are rerun with a database layer like mysql
+        # or postgresql which are not deleted in teardown.
+        #
+        # XXX 2014-11-01 BAW: Shouldn't reset_the_world() take care of this?
+        config.db.destroy()
         config.pop('test config')
         shutil.rmtree(cls.var_dir)
         cls.var_dir = None