diff --git a/tox.ini b/tox.ini
index f65566b226..46687d1399 100644
--- a/tox.ini
+++ b/tox.ini
@@ -61,6 +61,7 @@ setenv =
   DJANGO_SETTINGS_MODULE=openstack_dashboard.test.settings
 commands =
   {[testenv:extractmessages_check]commands}
+  {[testenv:docs]commands}
   flake8
 
 [testenv:extractmessages]
@@ -136,7 +137,7 @@ commands =
 
 [testenv:docs]
 setenv = DJANGO_SETTINGS_MODULE=openstack_dashboard.test.settings
-commands = {envpython} {toxinidir}/setup.py build_sphinx
+commands = sphinx-build -W -b html doc/source doc/build/html
 
 [testenv:releasenotes]
 commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html