diff --git a/tools/tox_install.sh b/tools/tox_install.sh
deleted file mode 100755
index 43468e450..000000000
--- a/tools/tox_install.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/bin/env bash
-
-# Client constraint file contains this client version pin that is in conflict
-# with installing the client from source. We should remove the version pin in
-# the constraints file before applying it for from-source installation.
-
-CONSTRAINTS_FILE=$1
-shift 1
-
-set -e
-
-# NOTE(tonyb): Place this in the tox enviroment's log dir so it will get
-# published to logs.openstack.org for easy debugging.
-localfile="$VIRTUAL_ENV/log/upper-constraints.txt"
-
-if [[ $CONSTRAINTS_FILE != http* ]]; then
-    CONSTRAINTS_FILE=file://$CONSTRAINTS_FILE
-fi
-# NOTE(tonyb): need to add curl to bindep.txt if the project supports bindep
-curl $CONSTRAINTS_FILE --insecure --progress-bar --output $localfile
-
-pip install -c$localfile openstack-requirements
-
-# This is the main purpose of the script: Allow local installation of
-# the current repo. It is listed in constraints file and thus any
-# install will be constrained and we need to unconstrain it.
-edit-constraints $localfile -- $CLIENT_NAME
-
-pip install -c$localfile -U $*
-exit $?
diff --git a/tox.ini b/tox.ini
index ff30ac7de..9afc6f585 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,27 +5,27 @@ skipsdist = True
 
 [testenv]
 usedevelop = True
-passenv = UPPER_CONSTRAINTS_FILE
-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 = pip install -U {opts} {packages}
 setenv =
     VIRTUAL_ENV={envdir}
     LANG=en_US.UTF-8
     LANGUAGE=en_US:en
     LC_ALL=C
-    BRANCH_NAME=master
-    CLIENT_NAME=openstacksdk
-deps = -r{toxinidir}/test-requirements.txt
+deps =
+  -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
+  -r{toxinidir}/test-requirements.txt
+  -r{toxinidir}/requirements.txt
 commands = stestr run {posargs}
            stestr slowest
 
 [testenv:examples]
-passenv = OS_* OPENSTACKSDK_* UPPER_CONSTRAINTS_FILE
+passenv = OS_* OPENSTACKSDK_*
 commands = stestr --test-path ./openstack/tests/examples run {posargs}
            stestr slowest
 
 [testenv:functional]
 basepython = {env:OPENSTACKSDK_TOX_PYTHON:python2}
-passenv = OS_* OPENSTACKSDK_* UPPER_CONSTRAINTS_FILE
+passenv = OS_* OPENSTACKSDK_*
 commands = stestr --test-path ./openstack/tests/functional run --serial {posargs}
            stestr slowest
 
@@ -61,7 +61,9 @@ commands = {toxinidir}/extras/run-ansible-tests.sh -e {envdir} {posargs}
 
 [testenv:docs]
 skip_install = True
-deps = -r{toxinidir}/test-requirements.txt
+deps =
+  -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
+ -r{toxinidir}/test-requirements.txt
 commands = sphinx-build -b html doc/source/ doc/build
 
 [testenv:releasenotes]