diff --git a/tests/storage/dav/__init__.py b/tests/storage/dav/__init__.py
index 28bca69..84d4157 100644
--- a/tests/storage/dav/__init__.py
+++ b/tests/storage/dav/__init__.py
@@ -92,7 +92,7 @@ class DavStorageTests(StorageTests):
             return r
         return self.storage_class(url=full_url, _request_func=x, **kwargs)
 
-    def tearDown(self):
+    def teardown_method(self, method):
         self.app = None
         if self.tmpdir is not None:
             shutil.rmtree(self.tmpdir)
diff --git a/tests/storage/test_filesystem.py b/tests/storage/test_filesystem.py
index 7658a27..56e70a4 100644
--- a/tests/storage/test_filesystem.py
+++ b/tests/storage/test_filesystem.py
@@ -22,7 +22,7 @@ class FilesystemStorageTests(TestCase, StorageTests):
         path = self.tmpdir = tempfile.mkdtemp()
         return FilesystemStorage(path=path, fileext='.txt', **kwargs)
 
-    def tearDown(self):
+    def teardown_method(self, method):
         if self.tmpdir is not None:
             shutil.rmtree(self.tmpdir)
             self.tmpdir = None