diff --git a/tox.ini b/tox.ini
index 7c018d7152..5441a37f3f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -15,7 +15,7 @@ setenv =
    PYTHONWARNINGS=default::DeprecationWarning
    OS_STDOUT_CAPTURE=1
    OS_STDERR_CAPTURE=1
-deps = -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+deps = -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/yoga}
        -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
 passenv = TEMPEST_* OS_TEST_*
@@ -108,7 +108,7 @@ commands = {toxinidir}/tools/cover.sh {posargs}
 
 [testenv:docs]
 deps =
-  -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+  -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/yoga}
   -r{toxinidir}/doc/requirements.txt
 commands =
   rm -rf doc/build/html doc/build/doctrees