diff --git a/test-requirements.txt b/test-requirements.txt
index 6957d91b..00d1227d 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -5,8 +5,11 @@ discover
 fixtures>=0.3.14
 mock>=1.0
 python-subunit
-sphinx>=1.1.2
 oslo.sphinx
 testrepository>=0.0.17
 testscenarios>=0.4,<0.5
 testtools>=0.9.32
+
+# Doc requirements
+sphinx>=1.1.2,<1.2
+sphinxcontrib-pecanwsme>=0.5
diff --git a/tox.ini b/tox.ini
index 885ae4a5..1adbae0b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -23,6 +23,12 @@ commands = flake8
 [testenv:venv]
 commands = {posargs}
 
+[testenv:docs]
+commands =
+    rm -rf doc/html doc/build
+    rm -rf doc/source/apidoc doc/source/api
+    python setup.py build_sphinx
+
 [testenv:cover]
 commands = python setup.py testr --coverage --testr-args='{posargs}'