diff --git a/tests/test_file.py b/tests/test_file.py
index b6db06e7bf0889560304062a83806cf2780a0ce9..67d9c1ed05c52dd8a77c6b746a7c1c9fe2c71cb4 100644
--- a/tests/test_file.py
+++ b/tests/test_file.py
@@ -43,7 +43,7 @@ from caosdb.utils.checkFileSystemConsistency import runCheck
 
 
 def setup_module():
-    teardown_function(function)
+    teardown_function(None)
 
 
 def setup_function(function):
diff --git a/tests/test_name_properties.py b/tests/test_name_properties.py
index d02d61df117dc7f34c4670aa82c24d81df4c1c37..c389945d5a46bfa8f22511554a751051ebf625fc 100644
--- a/tests/test_name_properties.py
+++ b/tests/test_name_properties.py
@@ -36,7 +36,7 @@ def setup_module():
 
 
 def teardown_module():
-    teardown_function(function)
+    teardown_function(None)
 
 
 def setup_function(function):
@@ -171,11 +171,11 @@ def test_recordtpye_insertion_with_indirect_child_with_new_parent():
 
 
 def assert_same_unique_results(call, queries):
-    setup(None)
+    setup_function(None)
     rtid = call().id
     for q in queries:
         assert_equal(db.execute_query(q, unique=True).id, rtid)
-    teardown_function(function)
+    teardown_function(None)
 
 
 def test_recordtype_query():
@@ -214,7 +214,7 @@ def test_query_name_property():
     with raises(db.BadQueryError):
         db.execute_query("FIND John", unique=True)
 
-    teardown_function(function)
+    teardown_function(None)
 
     # test behavior WITH the name parent
     db.RecordType("TestPerson").insert()