diff --git a/Makefile b/Makefile
index 6f47e4d..9400dad 100644
--- a/Makefile
+++ b/Makefile
@@ -175,7 +175,7 @@ activate:
 # Run the test suite.
 test: install-source-dev-and-test
 	@echo "Running tests..."
-	$(VENV_DIR)/bin/py.test
+	$(VENV_DIR)/bin/py.test -n auto
 
 # Run tests with coverage for the full repository.
 test-coverage: install-source-dev-and-test
diff --git a/requirements-test.txt b/requirements-test.txt
index 142b5b1..76b59ed 100644
--- a/requirements-test.txt
+++ b/requirements-test.txt
@@ -1,6 +1,7 @@
 # testing.
 pytest
 pytest-cov
+pytest-xdist  # Parallel test execution
 nose
 mock
 WebTest