diff --git a/test-requirements.txt b/test-requirements.txt
index cf8f0ccb2..45428031a 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -15,3 +15,7 @@ testtools>=0.9.34
 
 # Functional Tests
 requests>=1.1
+
+# Documentation
+sphinx>=1.1.2,<1.2
+oslo.sphinx
diff --git a/tox.ini b/tox.ini
index 2ebf09e8a..9281761f7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -19,6 +19,11 @@ commands = python setup.py testr --slowest --testr-args='--concurrency 1 {posarg
 [tox:jenkins]
 downloadcache = ~/cache/pip
 
+[testenv:pypy]
+deps = setuptools<3.2
+       -r{toxinidir}/requirements.txt
+       -r{toxinidir}/test-requirements.txt
+
 [testenv:pep8]
 commands = flake8