1 files changed, 6 insertions, 3 deletions
diff --git a/tox.ini b/tox.ini
index 11016bd..efe81f8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,12 +1,14 @@
 [tox]
-minversion = 1.6
+minversion = 2.0
 skipsdist = True
 envlist = py34,py27,pep8,releasenotes
 
 [testenv]
 usedevelop = True
-install_command = pip install -U {opts} {packages}
+install_command = {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
 setenv = VIRTUAL_ENV={envdir}
+         BRANCH_NAME=master
+         CLIENT_NAME=python-keystoneclient
          OS_STDOUT_NOCAPTURE=False
          OS_STDERR_NOCAPTURE=False
 
@@ -37,7 +39,8 @@ commands = python setup.py testr --coverage --testr-args='{posargs}'
 commands = oslo_debug_helper -t keystoneclient/tests {posargs}
 
 [testenv:functional]
-setenv = OS_TEST_PATH=./keystoneclient/tests/functional
+setenv = {[testenv]setenv}
+         OS_TEST_PATH=./keystoneclient/tests/functional
 passenv = OS_*
 
 [flake8]