diff --git a/tests/test_assembly.py b/tests/test_assembly.py
index 84dc10adf5..6da41c2385 100755
--- a/tests/test_assembly.py
+++ b/tests/test_assembly.py
@@ -54,7 +54,7 @@
 from .graph_features import K
 
 
-def teardown():
+def teardown_module():
     utils.cleanup()
 
 
diff --git a/tests/test_countgraph.py b/tests/test_countgraph.py
index 23134def1a..0faff603a8 100755
--- a/tests/test_countgraph.py
+++ b/tests/test_countgraph.py
@@ -62,7 +62,7 @@
 DNA = "AGCTTTTCATTCTGACTGCAACGGGCAATATGTCTCTGTGTGGATTAAAAAAAGAGTGTCTGATAGCAGC"
 
 
-def teardown():
+def teardown_module():
     utils.cleanup()
 
 
@@ -116,7 +116,7 @@ def test_revhash_1():
 
 class Test_Countgraph(object):
 
-    def setup(self):
+    def setup_method(self):
         self.hi = khmer.Countgraph(12, 1, 1, primes=PRIMES_1m)
 
     def test_failed_get(self):
diff --git a/tests/test_counting_single.py b/tests/test_counting_single.py
index 585bc0834d..1c1151ef88 100755
--- a/tests/test_counting_single.py
+++ b/tests/test_counting_single.py
@@ -329,7 +329,7 @@ def test_very_short_read():
 
 class Test_ConsumeString(object):
 
-    def setup(self):
+    def setup_method(self):
         self.kh = khmer.Countgraph(4, 1, 1, primes=[4 ** 4])
 
     def test_n_occupied(self):
@@ -374,7 +374,7 @@ def test_max_count(self):
 
 class Test_AbundanceDistribution(object):
 
-    def setup(self):
+    def setup_method(self):
         self.kh = khmer.Countgraph(4, 100, 1)
         A_filename = utils.get_test_data('all-A.fa')
         self.kh.consume_seqfile(A_filename)
diff --git a/tests/test_cython_parsing.py b/tests/test_cython_parsing.py
index 710ae711e2..60cd312d81 100755
--- a/tests/test_cython_parsing.py
+++ b/tests/test_cython_parsing.py
@@ -16,7 +16,7 @@
 import screed
 
 
-def teardown():
+def teardown_module():
     utils.cleanup()
 
 
diff --git a/tests/test_graph.py b/tests/test_graph.py
index 4eb8e32728..13517eafa4 100755
--- a/tests/test_graph.py
+++ b/tests/test_graph.py
@@ -41,13 +41,13 @@
 from . import khmer_tst_utils as utils
 
 
-def teardown():
+def teardown_module():
     utils.cleanup()
 
 
 class Test_ExactGraphFu(object):
 
-    def setup(self):
+    def setup_method(self):
         self.ht = khmer.Nodegraph(12, 1e4, 2)
 
     def test_counts(self):
@@ -141,7 +141,7 @@ def test_graph_links_prev_t(self):
 
 class Test_InexactGraphFu(object):
 
-    def setup(self):
+    def setup_method(self):
         self.ht = khmer.Nodegraph(12, 4 ** 3 + 1, 2)
 
     def test_graph_links_next_a(self):
diff --git a/tests/test_hll.py b/tests/test_hll.py
index c22a9ae77a..d9c09c35c5 100755
--- a/tests/test_hll.py
+++ b/tests/test_hll.py
@@ -50,7 +50,7 @@
 TRANSLATE = {'A': 'T', 'C': 'G', 'T': 'A', 'G': 'C'}
 
 
-def teardown():
+def teardown_module():
     utils.cleanup()
 
 
diff --git a/tests/test_labelhash.py b/tests/test_labelhash.py
index f632d33a66..da4d4a97cc 100755
--- a/tests/test_labelhash.py
+++ b/tests/test_labelhash.py
@@ -44,7 +44,7 @@
 from . import khmer_tst_utils as utils
 
 
-def teardown():
+def teardown_module():
     utils.cleanup()
 
 #
diff --git a/tests/test_nodegraph.py b/tests/test_nodegraph.py
index 607d521bfe..008420f542 100755
--- a/tests/test_nodegraph.py
+++ b/tests/test_nodegraph.py
@@ -48,7 +48,7 @@
 from . import khmer_tst_utils as utils
 
 
-def teardown():
+def teardown_module():
     utils.cleanup()
 
 
diff --git a/tests/test_sandbox_scripts.py b/tests/test_sandbox_scripts.py
index d5ef7e3d3b..1fa684ef0c 100755
--- a/tests/test_sandbox_scripts.py
+++ b/tests/test_sandbox_scripts.py
@@ -55,7 +55,7 @@ def scriptpath(script):
     return script
 
 
-def teardown():
+def teardown_module():
     utils.cleanup()
 
 
diff --git a/tests/test_scripts.py b/tests/test_scripts.py
index 348a521bf3..e4b44f0316 100755
--- a/tests/test_scripts.py
+++ b/tests/test_scripts.py
@@ -51,7 +51,7 @@
 import screed
 
 
-def teardown():
+def teardown_module():
     utils.cleanup()
 
 
diff --git a/tests/test_subset_graph.py b/tests/test_subset_graph.py
index eea0284dca..7125aa8f05 100755
--- a/tests/test_subset_graph.py
+++ b/tests/test_subset_graph.py
@@ -43,7 +43,7 @@
 from . import khmer_tst_utils as utils
 
 
-def teardown():
+def teardown_module():
     utils.cleanup()