Move 'tests' directory into 'keystone' package

Similar to a range of other components (e.g. glance,nova,...) and recent
reviews by Monty.

Running individual tests can be done like this:

./run_tests.sh keystone.tests.test_drivers

Change-Id: I2482a48322150e5eb09b703326a94d8283f1c75b

82 files changed, 54 insertions, 59 deletions

diff --git a/.gitignore b/.gitignore
index d4915b0b..1297ba42 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,6 +24,6 @@ build/
 dist/
 etc/keystone.conf
 etc/logging.conf
-tests/tmp/
+keystone/tests/tmp/
 .project
 .pydevproject
diff --git a/MANIFEST.in b/MANIFEST.in
index 2373ea28..9c59a76b 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -16,7 +16,7 @@ include etc/*
 include httpd/*
 graft bin
 graft doc
-graft tests
+graft keystone/tests
 graft tools
 graft examples
 recursive-include keystone *.json *.xml *.cfg *.pem README *.po *.pot *.sql
diff --git a/doc/source/developing.rst b/doc/source/developing.rst
index 2cf4b98e..7029e1c8 100644
--- a/doc/source/developing.rst
+++ b/doc/source/developing.rst
@@ -133,8 +133,8 @@ Test Structure
 --------------
 
 ``./run_test.sh`` uses its python cohort (``run_tests.py``) to iterate
-through the ``tests`` directory, using Nosetest to collect the tests and
-invoke them using an OpenStack custom test running that displays the tests
+through the ``keystone/tests`` directory, using Nosetest to collect the tests
+and invoke them using an OpenStack custom test running that displays the tests
 as well as the time taken to run those tests.
 
 Not all of the tests in the tests directory are strictly unit tests. Keystone
@@ -223,9 +223,9 @@ and set environment variables ``KEYSTONE_IDENTITY_BACKEND=ldap`` and
 ``KEYSTONE_CLEAR_LDAP=yes`` in your ``localrc`` file.
 
 The unit tests can be run against a live server with
-``tests/_ldap_livetest.py``.  The default password is ``test`` but if you have
+``keystone/tests/_ldap_livetest.py``.  The default password is ``test`` but if you have
 installed devstack with a different LDAP password, modify the file
-``tests/backend_liveldap.conf`` to reflect your password.
+``keystone/tests/backend_liveldap.conf`` to reflect your password.
 
 
 Building the Documentation
diff --git a/tests/tmp/.gitkeep b/keystone/tests/__init__.py
index e69de29b..e69de29b 100644
--- a/tests/tmp/.gitkeep
+++ b/keystone/tests/__init__.py
diff --git a/tests/_ldap_livetest.py b/keystone/tests/_ldap_livetest.py
index ead54ea7..59da4e66 100644
--- a/tests/_ldap_livetest.py
+++ b/keystone/tests/_ldap_livetest.py
@@ -22,7 +22,7 @@ from keystone.common import ldap as ldap_common
 from keystone import config
 from keystone import exception
 from keystone.identity.backends import ldap as identity_ldap
-from keystone import test
+from keystone.tests import core as test
 
 import test_backend_ldap
 
diff --git a/tests/_ldap_tls_livetest.py b/keystone/tests/_ldap_tls_livetest.py
index f52b6360..f1c43453 100644
--- a/tests/_ldap_tls_livetest.py
+++ b/keystone/tests/_ldap_tls_livetest.py
@@ -21,7 +21,7 @@ import ldap.modlist
 from keystone import config
 from keystone import exception
 from keystone import identity
-from keystone import test
+from keystone.tests import core as test
 
 import _ldap_livetest
 
diff --git a/tests/_sql_livetest.py b/keystone/tests/_sql_livetest.py
index a271ce7c..a271ce7c 100644
--- a/tests/_sql_livetest.py
+++ b/keystone/tests/_sql_livetest.py
diff --git a/tests/_test_import_auth_token.py b/keystone/tests/_test_import_auth_token.py
index 4e16f9a4..4e16f9a4 100644
--- a/tests/_test_import_auth_token.py
+++ b/keystone/tests/_test_import_auth_token.py
diff --git a/tests/auth_plugin_external_disabled.conf b/keystone/tests/auth_plugin_external_disabled.conf
index fed281d4..fed281d4 100644
--- a/tests/auth_plugin_external_disabled.conf
+++ b/keystone/tests/auth_plugin_external_disabled.conf
diff --git a/tests/auth_plugin_external_domain.conf b/keystone/tests/auth_plugin_external_domain.conf
index b7be122f..b7be122f 100644
--- a/tests/auth_plugin_external_domain.conf
+++ b/keystone/tests/auth_plugin_external_domain.conf
diff --git a/tests/backend_db2.conf b/keystone/tests/backend_db2.conf
index 44032255..44032255 100644
--- a/tests/backend_db2.conf
+++ b/keystone/tests/backend_db2.conf
diff --git a/tests/backend_ldap.conf b/keystone/tests/backend_ldap.conf
index 6b3f8a75..6b3f8a75 100644
--- a/tests/backend_ldap.conf
+++ b/keystone/tests/backend_ldap.conf
diff --git a/tests/backend_ldap_sql.conf b/keystone/tests/backend_ldap_sql.conf
index 8dcfa40d..5579e75d 100644
--- a/tests/backend_ldap_sql.conf
+++ b/keystone/tests/backend_ldap_sql.conf
@@ -34,3 +34,4 @@ driver = keystone.policy.backends.sql.Policy
 
 [trust]
 driver = keystone.trust.backends.sql.Trust
+
diff --git a/tests/backend_liveldap.conf b/keystone/tests/backend_liveldap.conf
index 297d96d6..297d96d6 100644
--- a/tests/backend_liveldap.conf
+++ b/keystone/tests/backend_liveldap.conf
diff --git a/tests/backend_mysql.conf b/keystone/tests/backend_mysql.conf
index ee3b276e..ee3b276e 100644
--- a/tests/backend_mysql.conf
+++ b/keystone/tests/backend_mysql.conf
diff --git a/tests/backend_pam.conf b/keystone/tests/backend_pam.conf
index 41f868c7..41f868c7 100644
--- a/tests/backend_pam.conf
+++ b/keystone/tests/backend_pam.conf
diff --git a/tests/backend_postgresql.conf b/keystone/tests/backend_postgresql.conf
index 8468ad33..8468ad33 100644
--- a/tests/backend_postgresql.conf
+++ b/keystone/tests/backend_postgresql.conf
diff --git a/tests/backend_sql.conf b/keystone/tests/backend_sql.conf
index 0baf610c..0baf610c 100644
--- a/tests/backend_sql.conf
+++ b/keystone/tests/backend_sql.conf
diff --git a/tests/backend_sql_disk.conf b/keystone/tests/backend_sql_disk.conf
index 0f8dfea7..0f8dfea7 100644
--- a/tests/backend_sql_disk.conf
+++ b/keystone/tests/backend_sql_disk.conf
diff --git a/tests/backend_tls_liveldap.conf b/keystone/tests/backend_tls_liveldap.conf
index 409af674..409af674 100644
--- a/tests/backend_tls_liveldap.conf
+++ b/keystone/tests/backend_tls_liveldap.conf
diff --git a/keystone/test.py b/keystone/tests/core.py
index 9118b2ea..21dc61dc 100644
--- a/keystone/test.py
+++ b/keystone/tests/core.py
@@ -57,9 +57,9 @@ from keystone import trust
 
 
 LOG = logging.getLogger(__name__)
-ROOTDIR = os.path.dirname(os.path.abspath(os.curdir))
+ROOTDIR = os.path.dirname(os.path.abspath('..'))
 VENDOR = os.path.join(ROOTDIR, 'vendor')
-TESTSDIR = os.path.join(ROOTDIR, 'tests')
+TESTSDIR = os.path.join(ROOTDIR, 'keystone', 'tests')
 ETCDIR = os.path.join(ROOTDIR, 'etc')
 TMPDIR = os.path.join(TESTSDIR, 'tmp')
 
diff --git a/tests/default_catalog.templates b/keystone/tests/default_catalog.templates
index f26c949a..f26c949a 100644
--- a/tests/default_catalog.templates
+++ b/keystone/tests/default_catalog.templates
diff --git a/tests/default_fixtures.py b/keystone/tests/default_fixtures.py
index 2695da88..2695da88 100644
--- a/tests/default_fixtures.py
+++ b/keystone/tests/default_fixtures.py
diff --git a/tests/legacy_d5.mysql b/keystone/tests/legacy_d5.mysql
index 57b31feb..57b31feb 100644
--- a/tests/legacy_d5.mysql
+++ b/keystone/tests/legacy_d5.mysql
diff --git a/tests/legacy_d5.sqlite b/keystone/tests/legacy_d5.sqlite
index d96dbf40..d96dbf40 100644
--- a/tests/legacy_d5.sqlite
+++ b/keystone/tests/legacy_d5.sqlite
diff --git a/tests/legacy_diablo.mysql b/keystone/tests/legacy_diablo.mysql
index 543f439f..543f439f 100644
--- a/tests/legacy_diablo.mysql
+++ b/keystone/tests/legacy_diablo.mysql
diff --git a/tests/legacy_diablo.sqlite b/keystone/tests/legacy_diablo.sqlite
index edf15be4..edf15be4 100644
--- a/tests/legacy_diablo.sqlite
+++ b/keystone/tests/legacy_diablo.sqlite
diff --git a/tests/legacy_essex.mysql b/keystone/tests/legacy_essex.mysql
index eade2cbf..eade2cbf 100644
--- a/tests/legacy_essex.mysql
+++ b/keystone/tests/legacy_essex.mysql
diff --git a/tests/legacy_essex.sqlite b/keystone/tests/legacy_essex.sqlite
index 72326d76..72326d76 100644
--- a/tests/legacy_essex.sqlite
+++ b/keystone/tests/legacy_essex.sqlite
diff --git a/tests/test_auth.py b/keystone/tests/test_auth.py
index e8e6c7a9..598b11d3 100644
--- a/tests/test_auth.py
+++ b/keystone/tests/test_auth.py
@@ -16,7 +16,7 @@ import copy
 import datetime
 import uuid
 
-from keystone import test
+from keystone.tests import core as test
 
 from keystone import auth
 from keystone import config
diff --git a/tests/test_auth_plugin.conf b/keystone/tests/test_auth_plugin.conf
index edec8f79..edec8f79 100644
--- a/tests/test_auth_plugin.conf
+++ b/keystone/tests/test_auth_plugin.conf
diff --git a/tests/test_auth_plugin.py b/keystone/tests/test_auth_plugin.py
index d158ec46..e3346cf1 100644
--- a/tests/test_auth_plugin.py
+++ b/keystone/tests/test_auth_plugin.py
@@ -16,7 +16,7 @@
 
 import uuid
 
-from keystone import test
+from keystone.tests import core as test
 
 from keystone import auth
 from keystone import exception
diff --git a/tests/test_backend.py b/keystone/tests/test_backend.py
index 75a94773..8622b10d 100644
--- a/tests/test_backend.py
+++ b/keystone/tests/test_backend.py
@@ -17,7 +17,7 @@
 import datetime
 import uuid
 
-from keystone import test
+from keystone.tests import core as test
 
 from keystone.catalog import core
 from keystone import config
diff --git a/tests/test_backend_kvs.py b/keystone/tests/test_backend_kvs.py
index d92a7510..34b87c60 100644
--- a/tests/test_backend_kvs.py
+++ b/keystone/tests/test_backend_kvs.py
@@ -15,10 +15,9 @@
 # under the License.
 import uuid
 
-from keystone import test
-
 from keystone import exception
 from keystone import identity
+from keystone.tests import core as test
 
 import default_fixtures
 import test_backend
diff --git a/tests/test_backend_ldap.py b/keystone/tests/test_backend_ldap.py
index ec2b2737..9c1c98d5 100644
--- a/tests/test_backend_ldap.py
+++ b/keystone/tests/test_backend_ldap.py
@@ -23,7 +23,7 @@ from keystone.common import sql
 from keystone import config
 from keystone import exception
 from keystone import identity
-from keystone import test
+from keystone.tests import core as test
 
 import default_fixtures
 import test_backend
diff --git a/tests/test_backend_memcache.py b/keystone/tests/test_backend_memcache.py
index 7516e0dd..0377c0e6 100644
--- a/tests/test_backend_memcache.py
+++ b/keystone/tests/test_backend_memcache.py
@@ -20,7 +20,7 @@ import uuid
 
 import memcache
 
-from keystone import test
+from keystone.tests import core as test
 
 from keystone.common import utils
 from keystone import exception
diff --git a/tests/test_backend_pam.py b/keystone/tests/test_backend_pam.py
index b66faa9c..65817837 100644
--- a/tests/test_backend_pam.py
+++ b/keystone/tests/test_backend_pam.py
@@ -16,7 +16,7 @@
 
 import uuid
 
-from keystone import test
+from keystone.tests import core as test
 
 from keystone import config
 from keystone.identity.backends import pam as identity_pam
diff --git a/tests/test_backend_sql.py b/keystone/tests/test_backend_sql.py
index 89276e86..773ae862 100644
--- a/tests/test_backend_sql.py
+++ b/keystone/tests/test_backend_sql.py
@@ -18,11 +18,10 @@ import uuid
 
 import sqlalchemy
 
-from keystone import test
-
 from keystone.common import sql
 from keystone import config
 from keystone import exception
+from keystone.tests import core as test
 
 import default_fixtures
 import test_backend
diff --git a/tests/test_backend_templated.py b/keystone/tests/test_backend_templated.py
index bfa19192..603ad82a 100644
--- a/tests/test_backend_templated.py
+++ b/keystone/tests/test_backend_templated.py
@@ -16,7 +16,7 @@
 
 import os
 
-from keystone import test
+from keystone.tests import core as test
 
 from keystone import exception
 
diff --git a/tests/test_catalog.py b/keystone/tests/test_catalog.py
index 3c00b1e8..3c00b1e8 100644
--- a/tests/test_catalog.py
+++ b/keystone/tests/test_catalog.py
diff --git a/tests/test_cert_setup.py b/keystone/tests/test_cert_setup.py
index e6c395e9..88fa6d75 100644
--- a/tests/test_cert_setup.py
+++ b/keystone/tests/test_cert_setup.py
@@ -18,7 +18,7 @@
 import os
 import shutil
 
-from keystone import test
+from keystone.tests import core as test
 
 from keystone.common import openssl
 from keystone import exception
diff --git a/tests/test_config.py b/keystone/tests/test_config.py
index 3165a4f4..28b372a6 100644
--- a/tests/test_config.py
+++ b/keystone/tests/test_config.py
@@ -1,4 +1,4 @@
-from keystone import test
+from keystone.tests import core as test
 
 from keystone import config
 from keystone import exception
diff --git a/tests/test_content_types.py b/keystone/tests/test_content_types.py
index ebb5dcef..7c874732 100644
--- a/tests/test_content_types.py
+++ b/keystone/tests/test_content_types.py
@@ -20,7 +20,7 @@ import uuid
 from lxml import etree
 import webtest
 
-from keystone import test
+from keystone.tests import core as test
 
 from keystone.common import extension
 from keystone.common import serializer
diff --git a/tests/test_contrib_s3_core.py b/keystone/tests/test_contrib_s3_core.py
index e2c328b5..3cf799bc 100644
--- a/tests/test_contrib_s3_core.py
+++ b/keystone/tests/test_contrib_s3_core.py
@@ -16,7 +16,7 @@
 
 import uuid
 
-from keystone import test
+from keystone.tests import core as test
 
 from keystone.contrib import ec2
 from keystone.contrib import s3
diff --git a/tests/test_contrib_stats_core.py b/keystone/tests/test_contrib_stats_core.py
index 907c7d25..567c485e 100644
--- a/tests/test_contrib_stats_core.py
+++ b/keystone/tests/test_contrib_stats_core.py
@@ -17,7 +17,7 @@
 from keystone.contrib import stats
 
 from keystone import config
-from keystone import test
+from keystone.tests import core as test
 
 
 CONF = config.CONF
diff --git a/tests/test_drivers.py b/keystone/tests/test_drivers.py
index c83c1a89..c83c1a89 100644
--- a/tests/test_drivers.py
+++ b/keystone/tests/test_drivers.py
diff --git a/tests/test_exception.py b/keystone/tests/test_exception.py
index d442d572..9658ed19 100644
--- a/tests/test_exception.py
+++ b/keystone/tests/test_exception.py
@@ -16,7 +16,7 @@
 
 import uuid
 
-from keystone import test
+from keystone.tests import core as test
 
 from keystone.common import wsgi
 from keystone import config
diff --git a/tests/test_import_legacy.py b/keystone/tests/test_import_legacy.py
index 9e164099..b3b83c0f 100644
--- a/tests/test_import_legacy.py
+++ b/keystone/tests/test_import_legacy.py
@@ -21,7 +21,7 @@ try:
 except ImportError:
     from pysqlite2 import dbapi2 as dbapi
 
-from keystone import test
+from keystone.tests import core as test
 
 from keystone.catalog.backends import templated as catalog_templated
 from keystone.common.sql import legacy
diff --git a/tests/test_injection.py b/keystone/tests/test_injection.py
index 36cd0126..36cd0126 100644
--- a/tests/test_injection.py
+++ b/keystone/tests/test_injection.py
diff --git a/tests/test_ipv6.py b/keystone/tests/test_ipv6.py
index 9825a5fa..fa64bc43 100644
--- a/tests/test_ipv6.py
+++ b/keystone/tests/test_ipv6.py
@@ -15,7 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from keystone import test
+from keystone.tests import core as test
 
 from keystone.common import environment
 from keystone import config
diff --git a/tests/test_keystoneclient.py b/keystone/tests/test_keystoneclient.py
index 38062d4b..7e59885d 100644
--- a/tests/test_keystoneclient.py
+++ b/keystone/tests/test_keystoneclient.py
@@ -17,11 +17,10 @@
 import uuid
 import webob
 
-from keystone import test
-
 from keystone import config
 from keystone.openstack.common import jsonutils
 from keystone.openstack.common import timeutils
+from keystone.tests import core as test
 
 import default_fixtures
 
diff --git a/tests/test_keystoneclient_sql.py b/keystone/tests/test_keystoneclient_sql.py
index 166d808c..105d8353 100644
--- a/tests/test_keystoneclient_sql.py
+++ b/keystone/tests/test_keystoneclient_sql.py
@@ -16,10 +16,9 @@
 
 import uuid
 
-from keystone import test
-
 from keystone.common import sql
 from keystone import config
+from keystone.tests import core as test
 
 import test_keystoneclient
 
diff --git a/tests/test_middleware.py b/keystone/tests/test_middleware.py
index 9f9d3fd2..df33d172 100644
--- a/tests/test_middleware.py
+++ b/keystone/tests/test_middleware.py
@@ -16,7 +16,7 @@
 
 import webob
 
-from keystone import test
+from keystone.tests import core as test
 
 from keystone import config
 from keystone import middleware
diff --git a/tests/test_no_admin_token_auth.py b/keystone/tests/test_no_admin_token_auth.py
index ffdaa7a8..3a7113d8 100644
--- a/tests/test_no_admin_token_auth.py
+++ b/keystone/tests/test_no_admin_token_auth.py
@@ -2,7 +2,7 @@
 import os
 import webtest
 
-from keystone import test
+from keystone.tests import core as test
 
 
 def _generate_paste_config():
diff --git a/tests/test_overrides.conf b/keystone/tests/test_overrides.conf
index ef7524b7..aac29f26 100644
--- a/tests/test_overrides.conf
+++ b/keystone/tests/test_overrides.conf
@@ -15,6 +15,6 @@ driver = keystone.trust.backends.kvs.Trust
 driver = keystone.token.backends.kvs.Token
 
 [signing]
-certfile = ../examples/pki/certs/signing_cert.pem
-keyfile = ../examples/pki/private/signing_key.pem
-ca_certs = ../examples/pki/certs/cacert.pem
+certfile = ../../examples/pki/certs/signing_cert.pem
+keyfile = ../../examples/pki/private/signing_key.pem
+ca_certs = ../../examples/pki/certs/cacert.pem
diff --git a/tests/test_pki_token_provider.conf b/keystone/tests/test_pki_token_provider.conf
index 255972c3..255972c3 100644
--- a/tests/test_pki_token_provider.conf
+++ b/keystone/tests/test_pki_token_provider.conf
diff --git a/tests/test_policy.py b/keystone/tests/test_policy.py
index 010a5abf..bdf91c94 100644
--- a/tests/test_policy.py
+++ b/keystone/tests/test_policy.py
@@ -19,7 +19,7 @@ import StringIO
 import tempfile
 import urllib2
 
-from keystone import test
+from keystone.tests import core as test
 
 from keystone import config
 from keystone import exception
diff --git a/tests/test_s3_token_middleware.py b/keystone/tests/test_s3_token_middleware.py
index ec31f2ac..ec31f2ac 100644
--- a/tests/test_s3_token_middleware.py
+++ b/keystone/tests/test_s3_token_middleware.py
diff --git a/tests/test_serializer.py b/keystone/tests/test_serializer.py
index 2024949b..260a533c 100644
--- a/tests/test_serializer.py
+++ b/keystone/tests/test_serializer.py
@@ -17,7 +17,7 @@
 import copy
 
 from keystone.common import serializer
-from keystone import test
+from keystone.tests import core as test
 
 
 class XmlSerializerTestCase(test.TestCase):
diff --git a/tests/test_singular_plural.py b/keystone/tests/test_singular_plural.py
index ea3ad27c..ea3ad27c 100644
--- a/tests/test_singular_plural.py
+++ b/keystone/tests/test_singular_plural.py
diff --git a/tests/test_sizelimit.py b/keystone/tests/test_sizelimit.py
index abd2b639..a37b0e31 100644
--- a/tests/test_sizelimit.py
+++ b/keystone/tests/test_sizelimit.py
@@ -14,7 +14,7 @@
 
 import webob
 
-from keystone import test
+from keystone.tests import core as test
 
 from keystone import config
 from keystone import exception
diff --git a/tests/test_sql_core.py b/keystone/tests/test_sql_core.py
index e60005f5..e3379152 100644
--- a/tests/test_sql_core.py
+++ b/keystone/tests/test_sql_core.py
@@ -14,7 +14,7 @@
 
 
 from keystone.common import sql
-from keystone import test
+from keystone.tests import core as test
 
 
 class CallbackMonitor:
diff --git a/tests/test_sql_migrate_extensions.py b/keystone/tests/test_sql_migrate_extensions.py
index 4a529559..4a529559 100644
--- a/tests/test_sql_migrate_extensions.py
+++ b/keystone/tests/test_sql_migrate_extensions.py
diff --git a/tests/test_sql_upgrade.py b/keystone/tests/test_sql_upgrade.py
index 9540c4cd..e904d6a7 100644
--- a/tests/test_sql_upgrade.py
+++ b/keystone/tests/test_sql_upgrade.py
@@ -15,8 +15,8 @@
 # under the License.
 """
 To run these tests against a live database:
-1. Modify the file `tests/backend_sql.conf` to use the connection for your
-   live database
+1. Modify the file `keystone/tests/backend_sql.conf` to use the connection for
+   your live database
 2. Set up a blank, live database.
 3. run the tests using
     ./run_tests.sh -N  test_sql_upgrade
@@ -32,7 +32,7 @@ import uuid
 from migrate.versioning import api as versioning_api
 import sqlalchemy
 
-from keystone import test
+from keystone.tests import core as test
 
 from keystone.common import sql
 from keystone.common.sql import migration
diff --git a/tests/test_ssl.py b/keystone/tests/test_ssl.py
index 8de5cc19..cb6b5fdc 100644
--- a/tests/test_ssl.py
+++ b/keystone/tests/test_ssl.py
@@ -18,7 +18,7 @@
 import os
 import ssl
 
-from keystone import test
+from keystone.tests import core as test
 
 from keystone.common import environment
 from keystone import config
diff --git a/tests/test_token_bind.py b/keystone/tests/test_token_bind.py
index 20488a91..ae398ea1 100644
--- a/tests/test_token_bind.py
+++ b/keystone/tests/test_token_bind.py
@@ -15,7 +15,7 @@
 from keystone.common import wsgi
 from keystone import config
 from keystone import exception
-from keystone import test
+from keystone.tests import core as test
 
 CONF = config.CONF
 
diff --git a/tests/test_token_provider.py b/keystone/tests/test_token_provider.py
index a7e92717..08fab35d 100644
--- a/tests/test_token_provider.py
+++ b/keystone/tests/test_token_provider.py
@@ -17,7 +17,7 @@
 import uuid
 
 from keystone import exception
-from keystone import test
+from keystone.tests import core as test
 from keystone import token
 
 
diff --git a/tests/test_url_middleware.py b/keystone/tests/test_url_middleware.py
index 2a36e8c2..436eb8d4 100644
--- a/tests/test_url_middleware.py
+++ b/keystone/tests/test_url_middleware.py
@@ -16,7 +16,7 @@
 
 import webob
 
-from keystone import test
+from keystone.tests import core as test
 
 from keystone import middleware
 
diff --git a/tests/test_utils.py b/keystone/tests/test_utils.py
index 4a65bea1..19535a7b 100644
--- a/tests/test_utils.py
+++ b/keystone/tests/test_utils.py
@@ -29,7 +29,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from keystone import test
+from keystone.tests import core as test
 
 from keystone.common import utils
 
diff --git a/tests/test_uuid_token_provider.conf b/keystone/tests/test_uuid_token_provider.conf
index d127ea3b..d127ea3b 100644
--- a/tests/test_uuid_token_provider.conf
+++ b/keystone/tests/test_uuid_token_provider.conf
diff --git a/tests/test_v3.py b/keystone/tests/test_v3.py
index 4f00de7d..7db14c84 100644
--- a/tests/test_v3.py
+++ b/keystone/tests/test_v3.py
@@ -4,13 +4,12 @@ import uuid
 from lxml import etree
 import webtest
 
-from keystone import test
-
 from keystone import auth
 from keystone.common import serializer
 from keystone import config
 from keystone.openstack.common import timeutils
 from keystone.policy.backends import rules
+from keystone.tests import core as test
 
 import test_content_types
 
diff --git a/tests/test_v3_auth.py b/keystone/tests/test_v3_auth.py
index 11d66700..43f87d98 100644
--- a/tests/test_v3_auth.py
+++ b/keystone/tests/test_v3_auth.py
@@ -19,7 +19,7 @@ from keystone import auth
 from keystone.common import cms
 from keystone import config
 from keystone import exception
-from keystone import test
+from keystone.tests import core as test
 
 import test_v3
 
diff --git a/tests/test_v3_catalog.py b/keystone/tests/test_v3_catalog.py
index 408670ec..408670ec 100644
--- a/tests/test_v3_catalog.py
+++ b/keystone/tests/test_v3_catalog.py
diff --git a/tests/test_v3_credential.py b/keystone/tests/test_v3_credential.py
index 6040cca3..6040cca3 100644
--- a/tests/test_v3_credential.py
+++ b/keystone/tests/test_v3_credential.py
diff --git a/tests/test_v3_identity.py b/keystone/tests/test_v3_identity.py
index f1e19c42..f1e19c42 100644
--- a/tests/test_v3_identity.py
+++ b/keystone/tests/test_v3_identity.py
diff --git a/tests/test_v3_policy.py b/keystone/tests/test_v3_policy.py
index d988efd2..d988efd2 100644
--- a/tests/test_v3_policy.py
+++ b/keystone/tests/test_v3_policy.py
diff --git a/tests/test_v3_protection.py b/keystone/tests/test_v3_protection.py
index 38e32813..38e32813 100644
--- a/tests/test_v3_protection.py
+++ b/keystone/tests/test_v3_protection.py
diff --git a/tests/test_versions.py b/keystone/tests/test_versions.py
index c5864c37..933fb246 100644
--- a/tests/test_versions.py
+++ b/keystone/tests/test_versions.py
@@ -15,7 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from keystone import test
+from keystone.tests import core as test
 
 from keystone import config
 from keystone import controllers
diff --git a/tests/test_wsgi.py b/keystone/tests/test_wsgi.py
index 362df922..781159e2 100644
--- a/tests/test_wsgi.py
+++ b/keystone/tests/test_wsgi.py
@@ -14,11 +14,10 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from keystone import test
-
 from keystone.common import wsgi
 from keystone import exception
 from keystone.openstack.common import jsonutils
+from keystone.tests import core as test
 
 
 class FakeApp(wsgi.Application):
diff --git a/keystone/tests/tmp/.gitkeep b/keystone/tests/tmp/.gitkeep
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/keystone/tests/tmp/.gitkeep
diff --git a/run_tests.sh b/run_tests.sh
index f9b8b7c4..19f3f0f4 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -95,10 +95,10 @@ fi
 
 function cleanup_test_db {
   # Default test settings will leave around some test*.db files
-  # TODO(termie): this could probably be moved into tests/__init__.py
+  # TODO(termie): this could probably be moved into keystone/tests/__init__.py
   #               but there have been some issues with creating that
   #               file for some users
-  rm -f tests/test*.db
+  rm -f keystone/tests/*.db
 }
 
 function run_tests {
diff --git a/setup.cfg b/setup.cfg
index 83d43963..8bce3b3d 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -64,4 +64,4 @@ detailed-errors=1
 cover-package = keystone
 cover-html = true
 cover-erase = true
-where=tests
+where=keystone/tests