diff --git a/doc/requirements.txt b/doc/requirements.txt
new file mode 100644
index 0000000000..02aed5690c
--- /dev/null
+++ b/doc/requirements.txt
@@ -0,0 +1,3 @@
+sphinx!=1.6.6,!=1.6.7 # BSD
+openstackdocstheme>=1.11.0 # Apache-2.0
+
diff --git a/test-requirements.txt b/test-requirements.txt
index aae13d62d6..79338a08a5 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,8 +2,6 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
-sphinx!=1.6.6,!=1.6.7 # BSD
-openstackdocstheme>=1.11.0 # Apache-2.0
 bashate>=0.2 # Apache-2.0
 PyYAML>=3.10.0 # MIT
 ansible-lint
diff --git a/tox.ini b/tox.ini
index afe01340b9..9ee8aa14ad 100644
--- a/tox.ini
+++ b/tox.ini
@@ -26,7 +26,8 @@ commands =
 commands = {posargs}
 
 [testenv:docs]
-commands = python setup.py build_sphinx
+deps = -r{toxinidir}/doc/requirements.txt
+commands = sphinx-build -W -E -b html doc/source doc/build/html
 
 [flake8]
 show-source = True