diff --git a/keystoneclient/tests/test_auth_token_middleware.py b/keystoneclient/tests/test_auth_token_middleware.py
index 6c680c59b..db7bae271 100644
--- a/keystoneclient/tests/test_auth_token_middleware.py
+++ b/keystoneclient/tests/test_auth_token_middleware.py
@@ -380,6 +380,7 @@ class DiabloAuthTokenMiddlewareTest(BaseAuthTokenMiddlewareTest,
 
         httpretty.httpretty.reset()
         httpretty.enable()
+        self.addCleanup(httpretty.disable)
 
         httpretty.register_uri(httpretty.GET,
                                "%s/" % BASE_URI,
@@ -399,10 +400,6 @@ class DiabloAuthTokenMiddlewareTest(BaseAuthTokenMiddlewareTest,
 
         self.set_middleware()
 
-    def tearDown(self):
-        httpretty.disable()
-        super(DiabloAuthTokenMiddlewareTest, self).tearDown()
-
     def test_valid_diablo_response(self):
         req = webob.Request.blank('/')
         req.headers['X-Auth-Token'] = self.token_id
@@ -1085,6 +1082,7 @@ class CertDownloadMiddlewareTest(BaseAuthTokenMiddlewareTest,
     def setUp(self):
         super(CertDownloadMiddlewareTest, self).setUp()
         self.base_dir = tempfile.mkdtemp()
+        self.addCleanup(shutil.rmtree, self.base_dir)
         self.cert_dir = os.path.join(self.base_dir, 'certs')
         os.mkdir(self.cert_dir)
         conf = {
@@ -1093,11 +1091,7 @@ class CertDownloadMiddlewareTest(BaseAuthTokenMiddlewareTest,
         self.set_middleware(conf=conf)
 
         httpretty.enable()
-
-    def tearDown(self):
-        httpretty.disable()
-        shutil.rmtree(self.base_dir)
-        super(CertDownloadMiddlewareTest, self).tearDown()
+        self.addCleanup(httpretty.disable)
 
     # Usually we supply a signed_dir with pre-installed certificates,
     # so invocation of /usr/bin/openssl succeeds. This time we give it
@@ -1228,6 +1222,7 @@ class v2AuthTokenMiddlewareTest(BaseAuthTokenMiddlewareTest,
 
         httpretty.httpretty.reset()
         httpretty.enable()
+        self.addCleanup(httpretty.disable)
 
         httpretty.register_uri(httpretty.GET,
                                "%s/" % BASE_URI,
@@ -1259,10 +1254,6 @@ class v2AuthTokenMiddlewareTest(BaseAuthTokenMiddlewareTest,
 
         self.set_middleware()
 
-    def tearDown(self):
-        httpretty.disable()
-        super(v2AuthTokenMiddlewareTest, self).tearDown()
-
     def assert_unscoped_default_tenant_auto_scopes(self, token):
         """Unscoped v2 requests with a default tenant should "auto-scope."
 
@@ -1413,6 +1404,7 @@ class v3AuthTokenMiddlewareTest(BaseAuthTokenMiddlewareTest,
 
         httpretty.httpretty.reset()
         httpretty.enable()
+        self.addCleanup(httpretty.disable)
 
         httpretty.register_uri(httpretty.GET,
                                "%s" % BASE_URI,
@@ -1437,10 +1429,6 @@ class v3AuthTokenMiddlewareTest(BaseAuthTokenMiddlewareTest,
 
         self.set_middleware()
 
-    def tearDown(self):
-        httpretty.disable()
-        super(v3AuthTokenMiddlewareTest, self).tearDown()
-
     def token_response(self, request, uri, headers):
         auth_id = request.headers.get('X-Auth-Token')
         token_id = request.headers.get('X-Subject-Token')
@@ -1518,9 +1506,6 @@ class TokenExpirationTest(BaseAuthTokenMiddlewareTest):
         self.one_hour_earlier = timeutils.isotime(self.now + self.delta,
                                                   subsecond=True)
 
-    def tearDown(self):
-        super(TokenExpirationTest, self).tearDown()
-
     def create_v2_token_fixture(self, expires=None):
         v2_fixture = {
             'access': {
diff --git a/keystoneclient/tests/test_ec2utils.py b/keystoneclient/tests/test_ec2utils.py
index d4346a499..6fbc71961 100644
--- a/keystoneclient/tests/test_ec2utils.py
+++ b/keystoneclient/tests/test_ec2utils.py
@@ -29,9 +29,6 @@ class Ec2SignerTest(testtools.TestCase):
         self.secret = '89cdf9e94e2643cab35b8b8ac5a51f83'
         self.signer = utils.Ec2Signer(self.secret)
 
-    def tearDown(self):
-        super(Ec2SignerTest, self).tearDown()
-
     def test_v4_creds_header(self):
         auth_str = 'AWS4-HMAC-SHA256 blah'
         credentials = {'host': '127.0.0.1',
diff --git a/keystoneclient/tests/test_https.py b/keystoneclient/tests/test_https.py
index ee47e85c8..0a655abdb 100644
--- a/keystoneclient/tests/test_https.py
+++ b/keystoneclient/tests/test_https.py
@@ -50,10 +50,7 @@ class ClientTest(utils.TestCase):
         self.request_patcher = mock.patch.object(requests, 'request',
                                                  self.mox.CreateMockAnything())
         self.request_patcher.start()
-
-    def tearDown(self):
-        self.request_patcher.stop()
-        super(ClientTest, self).tearDown()
+        self.addCleanup(self.request_patcher.stop)
 
     @mock.patch.object(session.requests.Session, 'request')
     def test_get(self, MOCK_REQUEST):
diff --git a/keystoneclient/tests/test_utils.py b/keystoneclient/tests/test_utils.py
index fe0f90796..6fe59e8fc 100644
--- a/keystoneclient/tests/test_utils.py
+++ b/keystoneclient/tests/test_utils.py
@@ -107,12 +107,9 @@ class PrintTestCase(test_utils.TestCase):
         super(PrintTestCase, self).setUp()
         self.old_stdout = sys.stdout
         self.stdout = six.moves.cStringIO()
+        self.addCleanup(setattr, self, 'stdout', None)
         sys.stdout = self.stdout
-
-    def tearDown(self):
-        super(PrintTestCase, self).tearDown()
-        sys.stdout = self.old_stdout
-        self.stdout = None
+        self.addCleanup(setattr, sys, 'stdout', self.old_stdout)
 
     def test_print_list_unicode(self):
         name = u'\u540d\u5b57'