diff --git a/moduleroot/tox.ini.erb b/moduleroot/tox.ini.erb
index e3eeb86..5bf76d2 100644
--- a/moduleroot/tox.ini.erb
+++ b/moduleroot/tox.ini.erb
@@ -1,12 +1,13 @@
 [tox]
-minversion = 2.0
+minversion = 3.1
 skipsdist = True
 envlist = releasenotes
+ignore_basepython_conflict = True
 
 [testenv]
-install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
+basepython = python3
 
 [testenv:releasenotes]
-basepython = python3
-deps = -r{toxinidir}/doc/requirements.txt
+deps = -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+       -r{toxinidir}/doc/requirements.txt
 commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html