diff --git a/Makefile b/Makefile
index 4af5fb230..e4f4feb27 100644
--- a/Makefile
+++ b/Makefile
@@ -48,4 +48,7 @@ upload:
 		twine upload $$filename $$filename.asc ; \
 	done
 
+test:
+	DISPLAY= tox
+
 .PHONY: docs docker image release upload
diff --git a/pyproject.toml b/pyproject.toml
index dbf07002f..441079dde 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -105,6 +105,7 @@ test = [
     "pytest-mpl",
     "pytest-mypy",
     "pytest-remotedata",
+    "pytest-xdist[psutil]",
     "tox",
 ]
 
diff --git a/tox.ini b/tox.ini
index c50d7affe..a62b0fc6a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -25,10 +25,10 @@ setenv =
     PIP_PREFER_BINARY = 1
     NPY_DISABLE_CPU_FEATURES = AVX512_SKX
     coverage: NUMBA_DISABLE_JIT = 1
-    fast: PYTEST_MARKERS = -m "not slow and not mpl_image_compare"
-    online: PYTEST_MARKERS = -m "remote_data"
-    slow: PYTEST_MARKERS = -m "slow"
-    images: PYTEST_MARKERS = -m "mpl_image_compare"
+    fast: PYTEST_MARKERS = -m "not slow and not mpl_image_compare" -n auto
+    online: PYTEST_MARKERS = -m "remote_data" -n auto
+    slow: PYTEST_MARKERS = -m "slow" -n auto
+    images: PYTEST_MARKERS = -m "mpl_image_compare" -n auto
     PYTEST_EXTRA_ARGS = --mypy
     online: PYTEST_EXTRA_ARGS = --remote-data=any
     slow: PYTEST_EXTRA_ARGS =