diff --git a/magnum/tests/base.py b/magnum/tests/base.py
index 3f7bc57f34..6f215ec3bc 100644
--- a/magnum/tests/base.py
+++ b/magnum/tests/base.py
@@ -89,14 +89,15 @@ class TestCase(base.BaseTestCase):
             objects_base.MagnumObjectRegistry._registry._obj_classes)
         self.addCleanup(self._restore_obj_registry)
 
+        def reset_pecan():
+            pecan.set_config({}, overwrite=True)
+
+        self.addCleanup(reset_pecan)
+
     def _restore_obj_registry(self):
         objects_base.MagnumObjectRegistry._registry._obj_classes \
             = self._base_test_obj_backup
 
-    def tearDown(self):
-        super(TestCase, self).tearDown()
-        pecan.set_config({}, overwrite=True)
-
     def config(self, **kw):
         """Override config options for a test."""
         group = kw.pop('group', None)
diff --git a/magnum/tests/functional/test_magnum_python_client.py b/magnum/tests/functional/test_magnum_python_client.py
index 3e1ccd51d8..b96136fcae 100644
--- a/magnum/tests/functional/test_magnum_python_client.py
+++ b/magnum/tests/functional/test_magnum_python_client.py
@@ -172,12 +172,13 @@ class TestBayResource(BaseMagnumClient):
 
         self.baymodel = self._create_baymodel('testbay')
 
-    def tearDown(self):
-        super(TestBayResource, self).tearDown()
-        try:
-            self.cs.baymodels.delete(self.baymodel.uuid)
-        except exceptions.BadRequest:
-            pass
+        def delete_baymodel():
+            try:
+                self.cs.baymodels.delete(self.baymodel.uuid)
+            except exceptions.BadRequest:
+                pass
+
+        self.addCleanup(delete_baymodel)
 
     def test_bay_create_and_delete(self):
         bay = self._create_bay('testbay', self.baymodel.uuid)