diff --git a/doc/requirements.txt b/doc/requirements.txt
new file mode 100644
index 0000000..f527ff6
--- /dev/null
+++ b/doc/requirements.txt
@@ -0,0 +1,5 @@
+sphinx>=2.0.0,!=2.1.0 # BSD
+openstackdocstheme>=2.2.1 # Apache-2.0
+# releasenotes
+reno>=3.1.0 # Apache-2.0
+doc8>=0.6.0 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 35a0645..bc343e1 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -3,9 +3,3 @@
 # process, which may cause wedges in the gate later.
 
 hacking>=3.0.1,<3.1.0;python_version>='3.5' # Apache-2.0
-
-sphinx>=2.0.0,!=2.1.0 # BSD
-openstackdocstheme>=2.2.1 # Apache-2.0
-# releasenotes
-reno>=3.1.0 # Apache-2.0
-doc8>=0.6.0 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index 32bd978..99c4e22 100644
--- a/tox.ini
+++ b/tox.ini
@@ -25,12 +25,15 @@ commands = {posargs}
 commands = python setup.py test --coverage --testr-args='{posargs}'
 
 [testenv:docs]
+deps = -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+       -r{toxinidir}/doc/requirements.txt
 commands =
   rm -rf doc/build
   sphinx-build -W --keep-going -b html doc/source doc/build/html
   doc8 --ignore D000 -e .rst doc/source/ CONTRIBUTING.rst HACKING.rst README.rst
 
 [testenv:releasenotes]
+deps = {[testenv:docs]deps}
 commands =
   sphinx-build -a -E -W -d releasenotes/build/doctrees --keep-going -b html releasenotes/source releasenotes/build/html