diff --git a/setup.cfg b/setup.cfg
index 69c02d10d0bcfa6639ab22ef2f35c06501a64650..84abef1f6431bccd329ca76e0045c227653b41ff 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -26,11 +26,6 @@ packages =
 oslo.config.opts =
     oslo.versionedobjects = oslo_versionedobjects._options:list_opts
 
-[extras]
-fixtures =
-  mock>=2.0 # BSD
-  fixtures>=3.0.0 # Apache-2.0/BSD
-
 [build_sphinx]
 source-dir = doc/source
 build-dir = doc/build
diff --git a/test-requirements.txt b/test-requirements.txt
index 8d638004043d31863bbb7b5f469c2289ff773976..fd048a0372b5defe2eae756e2a931a29a5e683c6 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -11,3 +11,6 @@ sphinx>=1.6.2 # BSD
 coverage!=4.4,>=4.0 # Apache-2.0
 jsonschema!=2.5.0,<3.0.0,>=2.0.0 # MIT
 reno!=2.3.1,>=1.8.0 # Apache-2.0
+
+mock>=2.0 # BSD
+fixtures>=3.0.0 # Apache-2.0/BSD
diff --git a/tools/tox_install.sh b/tools/tox_install.sh
deleted file mode 100755
index 43468e450a70d3cab9984bf7c29ba834c85ad5ab..0000000000000000000000000000000000000000
--- 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 df0a169b5d771fafe6826b924ebfdcad8c84bef0..54c420427d5cfaf79651ccd245e877c4f0f8db00 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,10 +6,10 @@ envlist = py35,py27,pypy,pep8
 setenv =
     VIRTUAL_ENV={envdir}
     BRANCH_NAME=master
-    CLIENT_NAME=oslo.versionedobjects
-install_command = {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/pike} {opts} {packages}
-deps = .[fixtures]
-       -r{toxinidir}/test-requirements.txt
+install_command = pip install {opts} {packages}
+deps =
+  -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
+  -r{toxinidir}/test-requirements.txt
 commands = python setup.py testr --slowest --testr-args='{posargs}'
 
 [testenv:pep8]