diff --git a/doc/requirements.txt b/doc/requirements.txt
new file mode 100644
index 0000000..9f58df6
--- /dev/null
+++ b/doc/requirements.txt
@@ -0,0 +1,5 @@
+sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7' # BSD
+sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2;python_version>='3.4' # BSD
+oslosphinx>=4.7.0 # Apache-2.0
+reno>=2.5.0 # Apache-2.0
+docutils>=0.11 # OSI-Approved Open Source, Public Domain
diff --git a/setup.cfg b/setup.cfg
index 8826c8d..5f445bb 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -27,10 +27,5 @@ setup-hooks =
 packages =
     mistraldashboard
 
-[build_sphinx]
-source-dir = doc/source
-build-dir = doc/build
-all_files = 1
-
 [upload_sphinx]
 upload-dir = doc/build/html
diff --git a/test-requirements.txt b/test-requirements.txt
index 02b5866..c737881 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -13,12 +13,5 @@ selenium>=2.50.1 # Apache-2.0
 xvfbwrapper>=0.1.3 #license: MIT
 stestr>=2.0.0 # Apache-2.0
 
-# Docs Requirements
-sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7' # BSD
-sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2;python_version>='3.4' # BSD
-oslosphinx>=4.7.0 # Apache-2.0
-reno>=2.5.0 # Apache-2.0
-docutils>=0.11 # OSI-Approved Open Source, Public Domain
-
 # Horizon requirements
 django-compressor>=2.0 # MIT
diff --git a/tox.ini b/tox.ini
index 1db8ed9..b9d24df 100644
--- a/tox.ini
+++ b/tox.ini
@@ -40,7 +40,12 @@ commands =
 
 [testenv:docs]
 basepython = python3
-commands = python setup.py build_sphinx
+deps =
+  -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+  -r{toxinidir}/requirements.txt
+  -r{toxinidir}/doc/requirements.txt
+commands =
+  sphinx-build -W -b html doc/source doc/build/html
 
 [testenv:debug]
 basepython = python3
@@ -53,6 +58,10 @@ exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build,.ropeproject,tools,hori
 
 [testenv:releasenotes]
 basepython = python3
+deps =
+  -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+  -r{toxinidir}/requirements.txt
+  -r{toxinidir}/doc/requirements.txt
 commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
 
 [testenv:py36dj20]