diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 75a77bb3e7eaf523aaf7f7bcf57b3b6a3e555058..7951b95cd86dd483facb17dcba7f79f4ff091fa2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -30,10 +30,10 @@ tests (from scratch):
     - base
     - zam347
   stage: test
-  only:
-    - master
-    - /^release.*$/
-    - develop
+  #  only:
+  #    - master
+  #    - /^release.*$/
+  #    - develop
   variables:
     FAILURE_THRESHOLD: 100
     TEST_TYPE: "scratch"
@@ -61,10 +61,10 @@ tests (on GPU):
     - gpu
     - zam347
   stage: test
-  only:
-    - master
-    - /^release.*$/
-    - develop
+  #  only:
+  #    - master
+  #    - /^release.*$/
+  #    - develop
   variables:
     FAILURE_THRESHOLD: 100
     TEST_TYPE: "gpu"
diff --git a/conftest.py b/conftest.py
index 08641ff36543dbfba7109f84616ead8d2b472891..85f31b71fba3a0f7fa9af23ffcce09ff10037015 100644
--- a/conftest.py
+++ b/conftest.py
@@ -62,6 +62,9 @@ def default_session_fixture(request):
     patched.__enter__()
 
     def unpatch():
-        patched.__exit__()
+        try:
+            patched.__exit__()
+        except IndexError:
+            pass
 
     request.addfinalizer(unpatch)