diff --git a/setup.cfg b/setup.cfg
index 697520e..9e47a81 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -20,10 +20,6 @@ classifier =
     Programming Language :: Python :: 3.4
     Programming Language :: Python :: 3.5
 
-[extras]
-bandit =
-  bandit>=1.1.0 # Apache-2.0
-
 [global]
 setup-hooks =
     pbr.hooks.setup_hook
diff --git a/test-requirements.txt b/test-requirements.txt
index 7b76005..dc8110a 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -8,5 +8,7 @@ testtools>=2.2.0 # MIT
 ddt>=1.0.1 # MIT
 mock>=2.0.0 # BSD
 
+bandit>=1.1.0 # Apache-2.0
+
 sphinx>=1.6.2 # BSD
 oslosphinx>=4.7.0 # Apache-2.0
diff --git a/tools/tox_install.sh b/tools/tox_install.sh
deleted file mode 100755
index 43468e4..0000000
--- 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 97965e8..134c893 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,22 +5,18 @@ 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 = pip install {opts} {packages}
 setenv = VIRTUAL_ENV={envdir}
          OS_STDOUT_NOCAPTURE=False
          OS_STDERR_NOCAPTURE=False
          PYTHONHASHSEED=0
-         BRANCH_NAME=master
-         CLIENT_NAME=renderspec
-deps = -r{toxinidir}/requirements.txt
+deps =
+        -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
+       -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
 commands = python setup.py testr --testr-args='{posargs}'
 
 [testenv:pep8]
-deps =
-     .[bandit]
-     {[testenv]deps}
 commands =
     flake8
     bandit -r -s B701 renderspec -x tests
@@ -29,7 +25,6 @@ commands =
 commands = {posargs}
 
 [testenv:bandit]
-deps = .[bandit]
 commands = bandit -s B701 -r renderspec -x tests
 
 [flake8]