diff --git a/doc/requirements.txt b/doc/requirements.txt
new file mode 100644
index 0000000..6026078
--- /dev/null
+++ b/doc/requirements.txt
@@ -0,0 +1,4 @@
+sphinx>=2.0.0,!=2.1.0 # BSD
+sphinxcontrib.autoprogram
+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 eccb39c..540b720 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -5,12 +5,6 @@
 hacking>=3.0.1,<3.1.0 # Apache-2.0
 
 coverage>=4.0,!=4.4 # Apache-2.0
-sphinx>=2.0.0,!=2.1.0 # BSD
 oslotest>=1.10.0 # Apache-2.0
 testrepository>=0.0.18  # Apache-2.0/BSD
 testtools>=1.4.0 # MIT
-# releasenotes
-reno>=3.1.0 # Apache-2.0
-
-sphinxcontrib.autoprogram
-openstackdocstheme>=2.2.1 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index ddae82c..f0f7f84 100644
--- a/tox.ini
+++ b/tox.ini
@@ -35,10 +35,13 @@ commands = bindep test
 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 =
    sphinx-build --keep-going -b html -W doc/source doc/build/html
 
 [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