diff --git a/conftest.py b/conftest.py
index 4d85ef0c5457e3207da25e26bf147f65d61a1e1a..4da087be50a7ae29695276e93811de79aff77b5f 100644
--- a/conftest.py
+++ b/conftest.py
@@ -33,6 +33,8 @@ add_path_to_ignore('pystencils_tests/benchmark')
 add_path_to_ignore('_local_tmp')
 
 
+collect_ignore += [os.path.join(SCRIPT_FOLDER, "pystencils/autodiff.py")]
+
 try:
     import pycuda
 except ImportError:
@@ -57,6 +59,8 @@ try:
 except ImportError:
     collect_ignore += [os.path.join(SCRIPT_FOLDER, "pystencils_tests/test_aligned_array.py"),
                        os.path.join(SCRIPT_FOLDER, "pystencils_tests/test_datahandling_parallel.py"),
+                       os.path.join(SCRIPT_FOLDER, "doc/notebooks/03_tutorial_datahandling.ipynb"),
+                       os.path.join(SCRIPT_FOLDER, "pystencils/datahandling/parallel_datahandling.py"),
                        os.path.join(SCRIPT_FOLDER, "pystencils_tests/test_small_block_benchmark.ipynb")]
 
 try:
diff --git a/pystencils/autodiff.py b/pystencils/autodiff.py
index 5e185835ae03fb8883f6c932f7fb2e7a17a73463..96ac836c82542fb66dad74401233a86afd9a1bf7 100644
--- a/pystencils/autodiff.py
+++ b/pystencils/autodiff.py
@@ -8,7 +8,5 @@ Installation:
 .. code-block:: bash
     pip install pystencils-autodiff
 """
-import os
 
-if 'CI' not in os.environ:
-    raise NotImplementedError('pystencils-autodiff is not installed. Run `pip install pystencils-autodiff`')
+raise NotImplementedError('pystencils-autodiff is not installed. Run `pip install pystencils-autodiff`')