diff --git a/requirements.txt b/requirements.txt
index 472085b..43abf78 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -19,4 +19,3 @@
 tempest>=17.1.0 # Apache-2.0
 gabbi>=1.42.1 # Apache-2.0
 kombu!=4.0.2,>=4.0.0 # BSD
-setuptools===58.0.0
diff --git a/tox.ini b/tox.ini
index 07e3180..e8062aa 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,6 +10,7 @@
 setenv = VIRTUAL_ENV={envdir}
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
+       -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/yoga}
 commands = stestr run --slowest {posargs}
 
 [testenv:pep8]