diff --git a/docs/source/setup.rst b/docs/source/setup.rst
index e2c9e77c58..06303039d0 100644
--- a/docs/source/setup.rst
+++ b/docs/source/setup.rst
@@ -65,7 +65,7 @@ Installing dependencies
 Keystone maintains two lists of dependencies::
 
     tools/pip-requires
-    tools/pip-requires-test
+    tools/test-requires
 
 The first is the list of dependencies needed for running keystone, the second list includes dependencies used for active development and testing of keystone itself.
 
diff --git a/setup.py b/setup.py
index 66c181e1ed..343f165d89 100644
--- a/setup.py
+++ b/setup.py
@@ -12,5 +12,5 @@ setup(name='keystone',
       include_package_data=True,
       scripts=['bin/keystone-all', 'bin/keystone-manage'],
       zip_safe=False,
-      install_requires=['setuptools', 'python-keystoneclient'],
+      install_requires=['setuptools'],
       )
diff --git a/tools/install_venv.py b/tools/install_venv.py
index fe1c645242..84b79631a5 100644
--- a/tools/install_venv.py
+++ b/tools/install_venv.py
@@ -30,6 +30,7 @@ import sys
 ROOT = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
 VENV = os.path.join(ROOT, '.venv')
 PIP_REQUIRES = os.path.join(ROOT, 'tools', 'pip-requires')
+TEST_REQUIRES = os.path.join(ROOT, 'tools', 'test-requires')
 PY_VERSION = "python%s.%s" % (sys.version_info[0], sys.version_info[1])
 
 
@@ -100,7 +101,7 @@ def create_virtualenv(venv=VENV):
 def install_dependencies(venv=VENV):
     print 'Installing dependencies with pip (this can take a while)...'
     run_command(['tools/with_venv.sh', 'pip', 'install', '-r',
-              PIP_REQUIRES], redirect_output=False)
+                PIP_REQUIRES, '-r', TEST_REQUIRES], redirect_output=False)
 
 
 def print_help():
diff --git a/tools/pip-requires b/tools/pip-requires
index 733b2e3eb1..0e13534ff2 100644
--- a/tools/pip-requires
+++ b/tools/pip-requires
@@ -2,6 +2,7 @@
 pam==0.1.4
 WebOb==1.0.8
 eventlet
+greenlet
 PasteDeploy
 paste
 routes
@@ -9,26 +10,3 @@ sqlalchemy
 sqlalchemy-migrate
 passlib
 lxml
-
-# for python-novaclient
-prettytable
-
-# Optional backend: Memcache
-python-memcached # increases performance of token validation calls
-
-# Development
-Sphinx>=1.1.2 # required to build documentation
-coverage # computes code coverage percentages
-
-# Testing
-nose # for test discovery and console feedback
-nosexcover
-unittest2 # backport of unittest lib in python 2.7
-webtest # test wsgi apps without starting an http server
-pylint # static code analysis
-pep8==0.6.1 # checks for PEP8 code style compliance
-mox # mock object framework
-
--e git+https://review.openstack.org/p/openstack/python-keystoneclient.git#egg=python-keystoneclient
--e git+https://review.openstack.org/p/openstack-dev/openstack-nose.git#egg=openstack.nose_plugin
-python-ldap==2.3.13# authenticate against an existing LDAP server
diff --git a/tools/pip-requires-test b/tools/pip-requires-test
deleted file mode 100644
index ada350cf3b..0000000000
--- a/tools/pip-requires-test
+++ /dev/null
@@ -1,28 +0,0 @@
-# keystonelight dependencies
-pam==0.1.4
-WebOb==1.0.8
-eventlet
-greenlet
-PasteDeploy
-paste
-routes
-sqlalchemy
-sqlalchemy-migrate
-passlib
-python-memcached
-lxml
-
-# keystonelight testing dependencies
-nose
-nosexcover
-
-# for python-keystoneclient
-httplib2
-pep8
--e git+https://github.com/openstack/python-keystoneclient.git#egg=python-keystoneclient
-
-# for python-novaclient
-prettytable
-
-# Optional backend: LDAP
-python-ldap==2.3.13 # authenticate against an existing LDAP server
diff --git a/tools/test-requires b/tools/test-requires
new file mode 100644
index 0000000000..2db42b1a9b
--- /dev/null
+++ b/tools/test-requires
@@ -0,0 +1,24 @@
+# Optional backend: Memcache
+python-memcached
+
+# Optional backend: LDAP
+python-ldap==2.3.13 # authenticate against an existing LDAP server
+
+# Testing
+coverage # computes code coverage percentages
+mox # mock object framework
+nose # for test discovery and console feedback
+nosexcover
+openstack.nose_plugin
+pylint # static code analysis
+pep8==0.6.1 # checks for PEP8 code style compliance
+Sphinx>=1.1.2 # required to build documentation
+unittest2 # backport of unittest lib in python 2.7
+webtest # test wsgi apps without starting an http server
+
+# for python-keystoneclient
+httplib2
+-e git+https://github.com/openstack/python-keystoneclient.git#egg=python-keystoneclient
+
+# for python-novaclient
+prettytable
diff --git a/tox.ini b/tox.ini
index 8779ba73f1..a1e471360d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,8 +2,9 @@
 envlist = py26,py27,pep8
 
 [testenv]
-deps = -r{toxinidir}/tools/pip-requires-test
-commands = nosetests
+deps = -r{toxinidir}/tools/pip-requires
+       -r{toxinidir}/tools/test-requires
+commands = bash run_tests.sh -N --no-pep8
 
 [testenv:pep8]
 deps = pep8