diff --git a/integrationtests/test_base_table_exporter_integration.py b/integrationtests/test_base_table_exporter_integration.py
index 1c9158bd1d9600884571957d4916939f82c1a9ca..9d79e857fe706d78103ade3b92ee38498a2a1607 100644
--- a/integrationtests/test_base_table_exporter_integration.py
+++ b/integrationtests/test_base_table_exporter_integration.py
@@ -23,6 +23,7 @@
 # ** end header
 #
 import caosdb as db
+import pytest
 from caosadvancedtools import table_export as te
 
 
@@ -85,8 +86,11 @@ def setup_module():
         pass
 
 
+@pytest.fixture(autouse=True)
 def setup():
-    """No further setup"""
+    """Same as module setup."""
+    setup_module()
+    yield None
     setup_module()
 
 
diff --git a/integrationtests/test_crawl_with_datamodel_problems.py b/integrationtests/test_crawl_with_datamodel_problems.py
index 61fec39026a1a3480ecc5b52551c712d7a459b08..0c6a145afdab682f82af09a17fb9aa0770769959 100644
--- a/integrationtests/test_crawl_with_datamodel_problems.py
+++ b/integrationtests/test_crawl_with_datamodel_problems.py
@@ -20,10 +20,11 @@
 # along with this program. If not, see <https://www.gnu.org/licenses/>.
 #
 # ** end header
-"""Test whether the crawler correctly identifies the data model
-problems caused by a faulty model.
+
+"""Test whether the crawler correctly identifies the data model problems caused by a faulty model.
 
 """
+
 import caosdb as db
 from caosadvancedtools import loadFiles
 from caosadvancedtools.cfood import fileguide
diff --git a/integrationtests/test_datamodel_problems.py b/integrationtests/test_datamodel_problems.py
index 7d56f4da8eea34604ed1c820e14555f087c353bd..3bca302dd2a337cee7fd023ee6a64c5185bc99f5 100644
--- a/integrationtests/test_datamodel_problems.py
+++ b/integrationtests/test_datamodel_problems.py
@@ -44,12 +44,15 @@ def setup_module():
         print(delete_exc)
 
 
+@pytest.fixture(autouse=True)
 def setup():
-    """No further setup"""
+    """Same as module setup."""
+    setup_module()
+    yield None
     setup_module()
 
 
-def teardown():
+def teardown_module():
     """Clear and delete again."""
     setup_module()