diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 8427097..7bf79f9 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -33,6 +33,8 @@ jobs:
           python setup.py install
           pip install .[testing]
 
-      - name: Test with pytest
+      - name: Run tests
         run: |
-          pytest -n "$(grep -c ^processor /proc/cpuinfo)" android_env
+          # Find all test files, print their names and execute them in parallel
+          # with a maximum of 20 proccesses.
+          find . -type f -name "*_test.py" -print0 | xargs -t -0 -n1 -P 20 python3
diff --git a/pyproject.toml b/pyproject.toml
index e82d558..bc10581 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -30,7 +30,6 @@ testing = [
     "gym",
     "pillow",
     "pytype",
-    "pytest-xdist",
 ]
 acme = ["dm-acme"]
 gym = ["gym"]
diff --git a/setup.py b/setup.py
index 010018b..c564b3d 100644
--- a/setup.py
+++ b/setup.py
@@ -48,7 +48,6 @@
     'attrs==20.3.0',  # temporary pin to fix pytype issue.
     'pillow',
     'pytype',
-    'pytest-xdist',
     'gym',
 ]