diff --git a/tox.ini b/tox.ini
index f3e88641d..9f17a0e33 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 # noted to use py34 you need virtualenv >= 1.11.4
 [tox]
-envlist = py26,py27,py33,py34,pypy,pep8
+envlist = py26,py27,py33,py34,pypy,pep8,docs
 minversion = 1.6
 skipsdist = True
 
@@ -26,6 +26,12 @@ commands = flake8 {posargs}
 [testenv:venv]
 commands = {posargs}
 
+[testenv:docs]
+commands =
+  python setup.py build_sphinx
+
+
+
 [testenv:functional]
 setenv =
   OS_TEST_PATH = ./novaclient/tests/functional