diff --git a/test-requirements.txt b/test-requirements.txt
index 2fabed4ebc..7d7bfce8f5 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -6,6 +6,7 @@ hacking>=0.9.2,<0.10                                   # Apache Software License
 pytest>=2.7,<=2.9.2                                    # MIT
 pytest-cov>=2.2.1,<=2.3.0                              # MIT
 pytest-html                                            # Mozilla Public License 2.0 (MPL 2.0)
+pytest-xdist                                           # MIT
 
 coverage>=3.6                                          # Apache License, Version 2.0
 ddt>=1.0.1
diff --git a/tox.ini b/tox.ini
index b757254234..838583f082 100644
--- a/tox.ini
+++ b/tox.ini
@@ -18,7 +18,7 @@ install_command = pip install -U {opts} {packages}
 usedevelop = True
 commands =
   find . -type f -name "*.pyc" -delete
-  py.test --html=pytest_results.html --durations=10 "tests/unit" {posargs}
+  py.test --html=pytest_results.html --durations=10 -n auto "tests/unit" {posargs}
 distribute = false
 basepython = python2.7
 passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
@@ -46,7 +46,7 @@ commands = oslo_debug_helper -t tests {posargs}
 sitepackages = True
 commands =
   find . -type f -name "*.pyc" -delete
-  py.test --html=pytest_results.html --durations=10 "tests/functional" {posargs}
+  py.test --html=pytest_results.html --durations=10 -n auto "tests/functional" {posargs}
 
 
 [testenv:cover]