diff --git a/doc/requirements.txt b/doc/requirements.txt
new file mode 100644
index 00000000..1489bcee
--- /dev/null
+++ b/doc/requirements.txt
@@ -0,0 +1,3 @@
+sphinx>=2.0.0,!=2.1.0 # BSD
+openstackdocstheme>=2.2.1 # Apache-2.0
+reno>=3.1.0 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index f78c3b06..a44617d7 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -9,10 +9,7 @@ ddt>=1.0.1 # MIT
 docker>=2.4.2 # Apache-2.0
 stestr>=1.0.0 # Apache-2.0
 oslo.serialization!=2.19.1,>=2.18.0 # Apache-2.0
-openstackdocstheme>=2.2.1 # Apache-2.0
 oslotest>=3.2.0 # Apache-2.0
 python-subunit>=1.0.0 # Apache-2.0/BSD
-reno>=3.1.0 # Apache-2.0
-sphinx>=2.0.0,!=2.1.0 # BSD
 testscenarios>=0.4 # Apache-2.0/BSD
 testtools>=2.2.0 # MIT
diff --git a/tox.ini b/tox.ini
index 1bf9f59b..6aba08dc 100644
--- a/tox.ini
+++ b/tox.ini
@@ -46,6 +46,8 @@ commands =
     coverage report
 
 [testenv:docs]
+deps = -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+       -r{toxinidir}/doc/requirements.txt
 commands =
   sphinx-build -a -W -E -b html doc/source doc/build/html
 
@@ -72,6 +74,7 @@ local-check-factory = neutron_lib.hacking.checks.factory
 commands = {toxinidir}/tools/generate_config_file_samples.sh
 
 [testenv:releasenotes]
+deps = {[testenv:docs]deps}
 commands = sphinx-build -a -W -E -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
 
 [testenv:lower-constraints]