diff --git a/doc/requirements.txt b/doc/requirements.txt
new file mode 100644
index 000000000..86fc0cb55
--- /dev/null
+++ b/doc/requirements.txt
@@ -0,0 +1,6 @@
+sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
+sphinxcontrib-httpdomain>=1.3.0 # BSD
+sphinxcontrib-blockdiag>=1.5.4 # BSD
+reno>=2.5.0 # Apache-2.0
+os-api-ref>=1.4.0 # Apache-2.0
+openstackdocstheme>=1.18.1 # Apache-2.0
diff --git a/setup.cfg b/setup.cfg
index e2f92ccd4..d0b817b59 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -26,15 +26,6 @@ console_scripts =
     bifrost_inventory.py = bifrost.inventory:main
     bifrost_inventory = bifrost.inventory:main
 
-[build_sphinx]
-source-dir = doc/source
-build-dir = doc/build
-all_files = 1
-warning-is-error = 1
-
-[upload_sphinx]
-upload-dir = doc/build/html
-
 [compile_catalog]
 directory = bifrost/locale
 domain = bifrost
diff --git a/test-requirements.txt b/test-requirements.txt
index 93c1cef20..c41056ca9 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -6,9 +6,6 @@ hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
 
 coverage!=4.4,>=4.0 # Apache-2.0
 doc8>=0.6.0 # Apache-2.0
-reno>=2.5.0 # Apache-2.0
-sphinx!=1.6.6,!=1.6.7,>=1.6.5 # BSD
-openstackdocstheme>=1.18.1 # Apache-2.0
 oslotest>=3.2.0 # Apache-2.0
 testrepository>=0.0.18 # Apache-2.0/BSD
 testscenarios>=0.4 # Apache-2.0/BSD
diff --git a/tox.ini b/tox.ini
index 23d85628b..2c4978e7f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -20,6 +20,9 @@ commands = flake8
 
 [testenv:venv]
 basepython = python3
+deps =
+  -r{toxinidir}/test-requirements.txt
+  -r{toxinidir}/doc/requirements.txt
 commands = {posargs}
 
 [testenv:cover]
@@ -28,7 +31,11 @@ commands = python setup.py test --coverage --testr-args='{posargs}'
 
 [testenv:docs]
 basepython = python3
-commands = python setup.py build_sphinx
+deps =
+  -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
+  -r{toxinidir}/requirements.txt
+  -r{toxinidir}/doc/requirements.txt
+commands = sphinx-build -W -b html doc/source doc/build/html
 
 [testenv:debug]
 basepython = python3