diff --git a/doc/requirements.txt b/doc/requirements.txt
new file mode 100644
index 0000000..1489bce
--- /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 199b040..5c9044f 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -6,8 +6,3 @@ oslotest>=3.8.0 # Apache-2.0
 testscenarios>=0.4 # Apache-2.0/BSD
 requests-mock>=1.2.0 # Apache-2.0
 keystoneauth1>=3.4.0 # Apache-2.0
-
-# docs, releasenotes
-sphinx>=2.0.0,!=2.1.0 # BSD
-reno>=3.1.0 # Apache-2.0
-openstackdocstheme>=2.2.1 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index 8de03b8..a27b022 100644
--- a/tox.ini
+++ b/tox.ini
@@ -33,10 +33,15 @@ 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 -W -b html -d doc/build/doctrees doc/source doc/build/html
 
 [testenv:releasenotes]
+envdir = {toxworkdir}/docs
+deps = {[testenv:docs]deps}
 commands =
   sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html