diff --git a/doc/requirements.txt b/doc/requirements.txt
index cfbb52a3..dfd9982a 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -11,3 +11,5 @@ sphinxcontrib-apidoc>=0.2.0  # BSD
 # For autodoc builds
 mock>=2.0.0 # BSD
 oslotest>=3.2.0 # Apache-2.0
+python-memcached>=1.56 # PSF
+etcd3gw>=0.2.0 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index 5379f0e0..349a43a5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,7 +8,7 @@ basepython = python3
 whitelist_externals =
   find
 deps =
-  -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+  -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
   -r{toxinidir}/test-requirements.txt
 commands =
   find . -type f -name "*.pyc" -delete
@@ -33,11 +33,11 @@ commands = {posargs}
 [testenv:docs]
 whitelist_externals = rm
 deps =
-  -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt}
+  -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
   -r{toxinidir}/doc/requirements.txt
 commands =
   rm -fr doc/build
-  sphinx-build --keep-going -b html doc/source doc/build/html
+  sphinx-build -W --keep-going -b html doc/source doc/build/html
 
 [testenv:cover]
 setenv =