diff --git a/Makefile b/Makefile
index 368085f1..664b1d1b 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ init:
 test:
 	# This runs all of the tests. To run an individual test, run py.test with
 	# the -k flag, like "py.test -k test_path_is_not_double_encoded"
-	python setup.py test
+	py.test --boxed -n 9 tests/
 
 test-readme:
 	python setup.py check -r -s
diff --git a/requirements.txt b/requirements.txt
index 01b03e18..f07cdf86 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,5 @@
 -e .[socks]
+pytest-xdist
 alabaster==0.7.10
 Babel==2.4.0
 bleach==2.0.0
diff --git a/setup.py b/setup.py
index 888872cc..bfa7e152 100755
--- a/setup.py
+++ b/setup.py
@@ -44,7 +44,7 @@ requires = [
     'certifi>=2017.4.17'
 
 ]
-test_requirements = ['pytest>=2.8.0', 'pytest-httpbin==0.0.7', 'pytest-cov', 'pytest-mock', 'PySocks>=1.5.6, !=1.5.7']
+test_requirements = ['pytest>=2.8.0', 'pytest-httpbin==0.0.7', 'pytest-cov', 'pytest-mock', 'pytest-xdist', 'PySocks>=1.5.6, !=1.5.7']
 
 about = {}
 with open(os.path.join(here, 'requests', '__version__.py'), 'r', 'utf-8') as f: