1 files changed, 3 insertions, 7 deletions
diff --git a/tox.ini b/tox.ini
index e737241..541df65 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,13 +5,11 @@ skipsdist = True
 
 [testenv]
 usedevelop = True
-install_command = "{toxinidir}/tools/tox_install.sh" "{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}" {opts} {packages}
+install_command = python -m pip install -U {opts} {packages}
 list_dependencies_command = python -m pip freeze
 setenv =
   LANG=en_US.utf8
   VIRTUAL_ENV={envdir}
-  BRANCH_NAME=master
-  CLIENT_NAME=python-swiftclient
 
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
@@ -31,13 +29,11 @@ commands =
 commands = {posargs}
 
 [testenv:cover]
-commands = python setup.py testr --coverage
+commands = python setup.py testr --coverage 
            coverage report
 
 [testenv:func]
-setenv =
-    {[testenv]setenv}
-    OS_TEST_PATH=tests.functional
+setenv = OS_TEST_PATH=tests.functional
 whitelist_externals =
     coverage
     rm