diff --git a/Makefile b/Makefile
index ea341678..65d3cdff 100644
--- a/Makefile
+++ b/Makefile
@@ -21,6 +21,7 @@ ifndef GITHUB_ACTIONS
 		coverage \
 		pylint \
 		pytest-cov \
+		pytest-xdist \
 		rstcheck \
 		ruff \
 		teyit \
@@ -125,6 +126,10 @@ test:  ## Run all tests. To run a specific test: do "make test ARGS=pyftpdlib.te
 	${MAKE} install
 	$(TEST_PREFIX) $(PYTHON) -m pytest $(PYTEST_ARGS) $(ARGS)
 
+test-parallel:  ## Run all tests in parallel.
+	${MAKE} install
+	$(TEST_PREFIX) $(PYTHON) -m pytest $(PYTEST_ARGS) -n auto --dist loadgroup $(ARGS)
+
 test-functional:  ## Run functional FTP tests.
 	${MAKE} install
 	$(TEST_PREFIX) $(PYTHON) -m pytest $(PYTEST_ARGS) $(ARGS) pyftpdlib/test/test_functional.py