diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bbc642ccc8aff5a39536b3e47cf0628bda681e6e..4555ae31b52e28b8e3edd707c19d17f45f178002 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -265,7 +265,7 @@ build-documentation:
 pages:
   image: i10git.cs.fau.de:5005/pycodegen/pycodegen/full
   stage: deploy
-  needs: ["build-documentation"]
+  needs: ["tests-and-coverage", "build-documentation"]
   script:
     - ls -l
     - mv coverage_report html_doc
diff --git a/conftest.py b/conftest.py
index bcd5b70d9b39b537518a6539d0dbd5441eb86a7a..e1211e53569e9cff9295965d1540dae8f8359885 100644
--- a/conftest.py
+++ b/conftest.py
@@ -10,15 +10,15 @@ import pathlib
 import nbformat
 from nbconvert import PythonExporter
 import sympy
+
+from lbmpy._compat import IS_PYSTENCILS_2
+
 # Trigger config file reading / creation once - to avoid race conditions when multiple instances are creating it
 # at the same time
-try:
-    #   only for pystencils 1.x
+if IS_PYSTENCILS_2:
     from pystencils.backend.jit import legacy_cpu
-except ImportError:
-    pass
-
-from lbmpy._compat import IS_PYSTENCILS_2
+else:
+    from pystencils.cpu import cpujit
 
 # trigger cython imports - there seems to be a problem when multiple processes try to compile the same cython file
 # at the same time