diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 3c066c02f..9a1ad1d6f 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -115,7 +115,9 @@ jobs:
           # This needs to happen in the same
           # shell, because otherwise the JAVA_HOME
           # will be wrong on windows
-          pytest --junitxml=junit/test-results.xml --cov-report=xml tests
+          # The --dist loadfile makes sure, that tests are distributed according to their file
+          # this is especially important to not run the docker-fixtures more than once
+          pytest --junitxml=junit/test-results.xml --cov-report=xml -n auto tests --dist loadfile
       - name: Upload pytest test results
         uses: actions/upload-artifact@v1
         with:
diff --git a/conda.txt b/conda.txt
index 7e4574f19..6bcc5bcc5 100644
--- a/conda.txt
+++ b/conda.txt
@@ -7,6 +7,7 @@ openjdk>=8
 maven>=3.6.0
 pytest>=6.0.1
 pytest-cov>=2.10.1
+pytest-xdist
 mock>=4.0.3
 sphinx>=3.2.1
 tzlocal>=2.1