diff --git a/.github/workflows/ci_tests_and_publish.yml b/.github/workflows/ci_tests_and_publish.yml
index 3f526c4..8e19e6d 100644
--- a/.github/workflows/ci_tests_and_publish.yml
+++ b/.github/workflows/ci_tests_and_publish.yml
@@ -73,16 +73,21 @@ jobs:
 
     steps:
         - uses: actions/checkout@v4
-        - uses: conda-incubator/setup-miniconda@v3
+        - name: Setup conda environment with notebook dependencies
+          uses: conda-incubator/setup-miniconda@v3
           with:
             environment-file: environment.yml
             activate-environment: navo-env
             auto-activate-base: false
-        - run: pip install -r doc-requirements.txt
-        - run: |
+            conda-remove-defaults: true
+        - name: Install testing dependencies
+          run: pip install -r doc-requirements.txt pytest-custom_exit_code
+        - name: Execute notebooks as testing
+          run: |
             python check_env.py
             bash -c 'find content -name "*.md" | xargs jupytext --to notebook '
-            pytest --nbval content/
+            pytest --nbval --suppress-tests-failed-exit-code content/
+            pytest --nbval --last-failed --last-failed-no-failures none --suppress-no-test-exit-code content/
 
   publish:
     if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
diff --git a/tox.ini b/tox.ini
index 5c02f90..542bad3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -28,6 +28,7 @@ deps =
     oldestdeps: scipy==1.6
     # Temporary fix for lexer errors
     ipython!=8.7.0
+    !buildhtml: pytest-custom_exit_code
 
 allowlist_externals = bash
 
@@ -35,7 +36,9 @@ commands =
     pip freeze
     !buildhtml: bash -c 'find content -name "*.md" | xargs jupytext --to notebook '
 
-    !buildhtml: pytest --nbval content/
+    # We rerun the failed tests hoping that it filters out some flaky server behaviour
+    !buildhtml: pytest --nbval --suppress-tests-failed-exit-code content/
+    !buildhtml: pytest --nbval --last-failed --last-failed-no-failures none --suppress-no-test-exit-code content/
     buildhtml: sphinx-build -b html . _build/html -D nb_execution_mode=auto -nWT --keep-going
 
 pip_pre =