diff --git a/run_tests.sh b/run_tests.sh
index ffab99e9bb..aef7f6028b 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -158,8 +158,7 @@ function run_pep8 {
 
 function run_sphinx {
     echo "Building sphinx..."
-    export DJANGO_SETTINGS_MODULE=openstack_dashboard.settings
-    ${command_wrapper} sphinx-build -b html doc/source doc/build/html
+    ${command_wrapper} python setup.py build_sphinx
     echo "Build complete."
 }
 
diff --git a/tox.ini b/tox.ini
index 8876c2eae7..572193e3d1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -44,6 +44,10 @@ commands = /bin/bash run_tests.sh -N --integration
 basepython = python2.6
 commands = /bin/bash run_tests.sh -N --integration
 
+[testenv:docs]
+setenv = DJANGO_SETTINGS_MODULE=openstack_auth.tests.settings
+commands = python setup.py build_sphinx
+
 [tox:jenkins]
 downloadcache = ~/cache/pip