diff --git a/tests/conftest.py b/tests/conftest.py
index aa850be1a6..7b58b0314d 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -43,3 +43,15 @@ def app_variant(request):
 @pytest.fixture(scope="module")
 def timeout(request):
     return request.config.getoption("--timeout")
+
+
+@pytest.hookimpl(tryfirst=True, hookwrapper=True)
+def pytest_runtest_makereport(item, call):
+    # execute all other hooks to obtain the report object
+    outcome = yield
+    rep = outcome.get_result()
+
+    # set a report attribute for each phase of a call, which can
+    # be "setup", "call", "teardown"
+
+    setattr(item, "rep_" + rep.when, rep)
diff --git a/tests/lib/testing_classes.py b/tests/lib/testing_classes.py
index b6b4b0dd21..d804c43219 100644
--- a/tests/lib/testing_classes.py
+++ b/tests/lib/testing_classes.py
@@ -82,7 +82,7 @@ class ModuleUnitTest(BaseTest):
                 yield tmpdir
 
                 persist = (persist or self.PERSIST or
-                          request.node.rep_call.failed)
+                           self.is_test_failed(request))
                 if not persist:
                     print("Removing {}".format(tmpdir))
                     shutil.rmtree(tmpdir)
@@ -146,7 +146,7 @@ class ModuleUnitTest(BaseTest):
 
         yield db_handler
 
-        persist = self.PERSIST or request.node.rep_call.failed
+        persist = self.PERSIST or self.is_test_failed(request)
         if not persist:
             db_handler.teardown(self.TEST_DB_NAME)
             db_handler.teardown(self.TEST_OPENPYPE_NAME)
@@ -172,6 +172,13 @@ class ModuleUnitTest(BaseTest):
         mongo_client = OpenPypeMongoConnection.get_mongo_client()
         yield mongo_client[self.TEST_OPENPYPE_NAME]["settings"]
 
+    def is_test_failed(self, request):
+        # if request.node doesn't have rep_call, something failed
+        try:
+            return request.node.rep_call.failed
+        except AttributeError:
+            return True
+
 
 class PublishTest(ModuleUnitTest):
     """Test class for publishing in hosts.