From 0a18d8bbdfdfcec920697a7c90137922f156f6c9 Mon Sep 17 00:00:00 2001
From: Jamie Lennox <jamielennox@redhat.com>
Date: Mon, 23 Sep 2013 12:07:40 +1000
Subject: [PATCH] Move tests in keystoneclient

This is the suggested location for tests and is adopted by most
projects. As part of this change relative imports to package imports.

Fix all the test running and coverage code to point to the new location.

Change-Id: I01264aed14f396ab9a7242e3e72b71e1bc332675
---
 .coveragerc                                                | 2 +-
 .testr.conf                                                | 2 +-
 {tests => keystoneclient/tests}/__init__.py                | 0
 .../tests}/apiclient/test_exceptions.py                    | 3 +--
 {tests => keystoneclient/tests}/client_fixtures.py         | 7 ++++---
 {tests => keystoneclient/tests}/fakes.py                   | 0
 .../tests}/test_auth_token_middleware.py                   | 2 +-
 {tests => keystoneclient/tests}/test_base.py               | 2 +-
 {tests => keystoneclient/tests}/test_ec2utils.py           | 0
 {tests => keystoneclient/tests}/test_http.py               | 2 +-
 {tests => keystoneclient/tests}/test_https.py              | 2 +-
 {tests => keystoneclient/tests}/test_keyring.py            | 5 ++---
 {tests => keystoneclient/tests}/test_memcache_crypt.py     | 0
 {tests => keystoneclient/tests}/test_shell.py              | 3 ++-
 {tests => keystoneclient/tests}/test_utils.py              | 2 +-
 {tests => keystoneclient/tests}/utils.py                   | 0
 {tests => keystoneclient/tests}/v2_0/__init__.py           | 0
 {tests => keystoneclient/tests}/v2_0/client_fixtures.py    | 0
 {tests => keystoneclient/tests}/v2_0/fakes.py              | 4 ++--
 {tests => keystoneclient/tests}/v2_0/test_access.py        | 6 +++---
 {tests => keystoneclient/tests}/v2_0/test_auth.py          | 2 +-
 {tests => keystoneclient/tests}/v2_0/test_client.py        | 4 ++--
 {tests => keystoneclient/tests}/v2_0/test_discovery.py     | 2 +-
 {tests => keystoneclient/tests}/v2_0/test_ec2.py           | 2 +-
 {tests => keystoneclient/tests}/v2_0/test_endpoints.py     | 2 +-
 {tests => keystoneclient/tests}/v2_0/test_roles.py         | 2 +-
 .../tests}/v2_0/test_service_catalog.py                    | 5 ++---
 {tests => keystoneclient/tests}/v2_0/test_services.py      | 2 +-
 {tests => keystoneclient/tests}/v2_0/test_shell.py         | 5 ++---
 {tests => keystoneclient/tests}/v2_0/test_tenants.py       | 2 +-
 {tests => keystoneclient/tests}/v2_0/test_tokens.py        | 2 +-
 {tests => keystoneclient/tests}/v2_0/test_users.py         | 2 +-
 {tests => keystoneclient/tests}/v2_0/utils.py              | 2 +-
 {tests => keystoneclient/tests}/v3/__init__.py             | 0
 {tests => keystoneclient/tests}/v3/client_fixtures.py      | 0
 {tests => keystoneclient/tests}/v3/test_access.py          | 4 ++--
 {tests => keystoneclient/tests}/v3/test_auth.py            | 3 +--
 {tests => keystoneclient/tests}/v3/test_client.py          | 5 ++---
 {tests => keystoneclient/tests}/v3/test_credentials.py     | 2 +-
 {tests => keystoneclient/tests}/v3/test_discover.py        | 2 +-
 {tests => keystoneclient/tests}/v3/test_domains.py         | 2 +-
 {tests => keystoneclient/tests}/v3/test_endpoints.py       | 2 +-
 {tests => keystoneclient/tests}/v3/test_groups.py          | 2 +-
 {tests => keystoneclient/tests}/v3/test_policies.py        | 2 +-
 {tests => keystoneclient/tests}/v3/test_projects.py        | 2 +-
 {tests => keystoneclient/tests}/v3/test_roles.py           | 2 +-
 {tests => keystoneclient/tests}/v3/test_service_catalog.py | 5 ++---
 {tests => keystoneclient/tests}/v3/test_services.py        | 2 +-
 {tests => keystoneclient/tests}/v3/test_trusts.py          | 2 +-
 {tests => keystoneclient/tests}/v3/test_users.py           | 2 +-
 {tests => keystoneclient/tests}/v3/utils.py                | 3 +--
 run_tests.sh                                               | 6 +++---
 52 files changed, 59 insertions(+), 65 deletions(-)
 rename {tests => keystoneclient/tests}/__init__.py (100%)
 rename {tests => keystoneclient/tests}/apiclient/test_exceptions.py (98%)
 rename {tests => keystoneclient/tests}/client_fixtures.py (97%)
 rename {tests => keystoneclient/tests}/fakes.py (100%)
 rename {tests => keystoneclient/tests}/test_auth_token_middleware.py (99%)
 rename {tests => keystoneclient/tests}/test_base.py (99%)
 rename {tests => keystoneclient/tests}/test_ec2utils.py (100%)
 rename {tests => keystoneclient/tests}/test_http.py (99%)
 rename {tests => keystoneclient/tests}/test_https.py (99%)
 rename {tests => keystoneclient/tests}/test_keyring.py (98%)
 rename {tests => keystoneclient/tests}/test_memcache_crypt.py (100%)
 rename {tests => keystoneclient/tests}/test_shell.py (99%)
 rename {tests => keystoneclient/tests}/test_utils.py (98%)
 rename {tests => keystoneclient/tests}/utils.py (100%)
 rename {tests => keystoneclient/tests}/v2_0/__init__.py (100%)
 rename {tests => keystoneclient/tests}/v2_0/client_fixtures.py (100%)
 rename {tests => keystoneclient/tests}/v2_0/fakes.py (99%)
 rename {tests => keystoneclient/tests}/v2_0/test_access.py (97%)
 rename {tests => keystoneclient/tests}/v2_0/test_auth.py (99%)
 rename {tests => keystoneclient/tests}/v2_0/test_client.py (97%)
 rename {tests => keystoneclient/tests}/v2_0/test_discovery.py (98%)
 rename {tests => keystoneclient/tests}/v2_0/test_ec2.py (98%)
 rename {tests => keystoneclient/tests}/v2_0/test_endpoints.py (98%)
 rename {tests => keystoneclient/tests}/v2_0/test_roles.py (98%)
 rename {tests => keystoneclient/tests}/v2_0/test_service_catalog.py (97%)
 rename {tests => keystoneclient/tests}/v2_0/test_services.py (98%)
 rename {tests => keystoneclient/tests}/v2_0/test_shell.py (99%)
 rename {tests => keystoneclient/tests}/v2_0/test_tenants.py (99%)
 rename {tests => keystoneclient/tests}/v2_0/test_tokens.py (94%)
 rename {tests => keystoneclient/tests}/v2_0/test_users.py (99%)
 rename {tests => keystoneclient/tests}/v2_0/utils.py (98%)
 rename {tests => keystoneclient/tests}/v3/__init__.py (100%)
 rename {tests => keystoneclient/tests}/v3/client_fixtures.py (100%)
 rename {tests => keystoneclient/tests}/v3/test_access.py (98%)
 rename {tests => keystoneclient/tests}/v3/test_auth.py (99%)
 rename {tests => keystoneclient/tests}/v3/test_client.py (98%)
 rename {tests => keystoneclient/tests}/v3/test_credentials.py (96%)
 rename {tests => keystoneclient/tests}/v3/test_discover.py (98%)
 rename {tests => keystoneclient/tests}/v3/test_domains.py (96%)
 rename {tests => keystoneclient/tests}/v3/test_endpoints.py (98%)
 rename {tests => keystoneclient/tests}/v3/test_groups.py (98%)
 rename {tests => keystoneclient/tests}/v3/test_policies.py (96%)
 rename {tests => keystoneclient/tests}/v3/test_projects.py (98%)
 rename {tests => keystoneclient/tests}/v3/test_roles.py (99%)
 rename {tests => keystoneclient/tests}/v3/test_service_catalog.py (97%)
 rename {tests => keystoneclient/tests}/v3/test_services.py (96%)
 rename {tests => keystoneclient/tests}/v3/test_trusts.py (98%)
 rename {tests => keystoneclient/tests}/v3/test_users.py (99%)
 rename {tests => keystoneclient/tests}/v3/utils.py (99%)

diff --git a/.coveragerc b/.coveragerc
index 5cd599a01..f024452c7 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -1,7 +1,7 @@
 [run]
 branch = True
 source = keystoneclient
-omit = keystoneclient/openstack/*
+omit = keystoneclient/tests/*,keystoneclient/openstack/*
 
 [report]
 ignore-errors = True
diff --git a/.testr.conf b/.testr.conf
index 081907d59..9355c2748 100644
--- a/.testr.conf
+++ b/.testr.conf
@@ -1,4 +1,4 @@
 [DEFAULT]
-test_command=${PYTHON:-python} -m subunit.run discover -t ./ ./tests $LISTOPT $IDOPTION
+test_command=${PYTHON:-python} -m subunit.run discover -t ./ ./keystoneclient/tests $LISTOPT $IDOPTION
 test_id_option=--load-list $IDFILE
 test_list_option=--list
diff --git a/tests/__init__.py b/keystoneclient/tests/__init__.py
similarity index 100%
rename from tests/__init__.py
rename to keystoneclient/tests/__init__.py
diff --git a/tests/apiclient/test_exceptions.py b/keystoneclient/tests/apiclient/test_exceptions.py
similarity index 98%
rename from tests/apiclient/test_exceptions.py
rename to keystoneclient/tests/apiclient/test_exceptions.py
index cfdf91909..d41ac02b3 100644
--- a/tests/apiclient/test_exceptions.py
+++ b/keystoneclient/tests/apiclient/test_exceptions.py
@@ -13,9 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from tests import utils
-
 from keystoneclient.apiclient import exceptions
+from keystoneclient.tests import utils
 
 
 class FakeResponse(object):
diff --git a/tests/client_fixtures.py b/keystoneclient/tests/client_fixtures.py
similarity index 97%
rename from tests/client_fixtures.py
rename to keystoneclient/tests/client_fixtures.py
index 0abb06ef1..dd1c95fa1 100644
--- a/tests/client_fixtures.py
+++ b/keystoneclient/tests/client_fixtures.py
@@ -22,9 +22,10 @@ from keystoneclient.openstack.common import timeutils
 from keystoneclient import utils
 
 
-ROOTDIR = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
-CERTDIR = os.path.join(ROOTDIR, "examples/pki/certs")
-CMSDIR = os.path.join(ROOTDIR, "examples/pki/cms")
+CLIENTDIR = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
+ROOTDIR = os.path.dirname(CLIENTDIR)
+CERTDIR = os.path.join(ROOTDIR, 'examples', 'pki', 'certs')
+CMSDIR = os.path.join(ROOTDIR, 'examples', 'pki', 'cms')
 
 
 # @TODO(mordred) This should become a testresources resource attached to the
diff --git a/tests/fakes.py b/keystoneclient/tests/fakes.py
similarity index 100%
rename from tests/fakes.py
rename to keystoneclient/tests/fakes.py
diff --git a/tests/test_auth_token_middleware.py b/keystoneclient/tests/test_auth_token_middleware.py
similarity index 99%
rename from tests/test_auth_token_middleware.py
rename to keystoneclient/tests/test_auth_token_middleware.py
index 17eacb60a..06e760989 100644
--- a/tests/test_auth_token_middleware.py
+++ b/keystoneclient/tests/test_auth_token_middleware.py
@@ -34,8 +34,8 @@ from keystoneclient.middleware import auth_token
 from keystoneclient.openstack.common import jsonutils
 from keystoneclient.openstack.common import memorycache
 from keystoneclient.openstack.common import timeutils
+from keystoneclient.tests import client_fixtures
 
-import client_fixtures
 
 EXPECTED_V2_DEFAULT_ENV_RESPONSE = {
     'HTTP_X_IDENTITY_STATUS': 'Confirmed',
diff --git a/tests/test_base.py b/keystoneclient/tests/test_base.py
similarity index 99%
rename from tests/test_base.py
rename to keystoneclient/tests/test_base.py
index a781a7ced..46e3dd248 100644
--- a/tests/test_base.py
+++ b/keystoneclient/tests/test_base.py
@@ -13,9 +13,9 @@
 #    under the License.
 
 from keystoneclient import base
+from keystoneclient.tests import utils
 from keystoneclient.v2_0 import client
 from keystoneclient.v2_0 import roles
-from tests import utils
 
 
 class HumanReadable(base.Resource):
diff --git a/tests/test_ec2utils.py b/keystoneclient/tests/test_ec2utils.py
similarity index 100%
rename from tests/test_ec2utils.py
rename to keystoneclient/tests/test_ec2utils.py
diff --git a/tests/test_http.py b/keystoneclient/tests/test_http.py
similarity index 99%
rename from tests/test_http.py
rename to keystoneclient/tests/test_http.py
index 6cd2e4804..a4b8e8f82 100644
--- a/tests/test_http.py
+++ b/keystoneclient/tests/test_http.py
@@ -20,7 +20,7 @@ from testtools import matchers
 
 from keystoneclient import exceptions
 from keystoneclient import httpclient
-from tests import utils
+from keystoneclient.tests import utils
 
 RESPONSE_BODY = '{"hi": "there"}'
 
diff --git a/tests/test_https.py b/keystoneclient/tests/test_https.py
similarity index 99%
rename from tests/test_https.py
rename to keystoneclient/tests/test_https.py
index 5bbccba86..1477720b6 100644
--- a/tests/test_https.py
+++ b/keystoneclient/tests/test_https.py
@@ -17,7 +17,7 @@ import mock
 import requests
 
 from keystoneclient import httpclient
-from tests import utils
+from keystoneclient.tests import utils
 
 FAKE_RESPONSE = utils.TestResponse({
     "status_code": 200,
diff --git a/tests/test_keyring.py b/keystoneclient/tests/test_keyring.py
similarity index 98%
rename from tests/test_keyring.py
rename to keystoneclient/tests/test_keyring.py
index 29f3897a1..a44d432eb 100644
--- a/tests/test_keyring.py
+++ b/keystoneclient/tests/test_keyring.py
@@ -19,9 +19,8 @@ import mock
 from keystoneclient import access
 from keystoneclient import httpclient
 from keystoneclient.openstack.common import timeutils
-
-from tests import utils
-from tests.v2_0 import client_fixtures
+from keystoneclient.tests import utils
+from keystoneclient.tests.v2_0 import client_fixtures
 
 try:
     import keyring  # noqa
diff --git a/tests/test_memcache_crypt.py b/keystoneclient/tests/test_memcache_crypt.py
similarity index 100%
rename from tests/test_memcache_crypt.py
rename to keystoneclient/tests/test_memcache_crypt.py
diff --git a/tests/test_shell.py b/keystoneclient/tests/test_shell.py
similarity index 99%
rename from tests/test_shell.py
rename to keystoneclient/tests/test_shell.py
index 6814eb62f..8c9c06fae 100644
--- a/tests/test_shell.py
+++ b/keystoneclient/tests/test_shell.py
@@ -26,8 +26,9 @@ from testtools import matchers
 
 from keystoneclient import exceptions
 from keystoneclient import shell as openstack_shell
+from keystoneclient.tests import utils
 from keystoneclient.v2_0 import shell as shell_v2_0
-from tests import utils
+
 
 DEFAULT_USERNAME = 'username'
 DEFAULT_PASSWORD = 'password'
diff --git a/tests/test_utils.py b/keystoneclient/tests/test_utils.py
similarity index 98%
rename from tests/test_utils.py
rename to keystoneclient/tests/test_utils.py
index 36cf1e020..65c6a1a3f 100644
--- a/tests/test_utils.py
+++ b/keystoneclient/tests/test_utils.py
@@ -13,8 +13,8 @@
 #    under the License.
 
 from keystoneclient import exceptions
+from keystoneclient.tests import utils as test_utils
 from keystoneclient import utils
-from tests import utils as test_utils
 
 
 class FakeResource(object):
diff --git a/tests/utils.py b/keystoneclient/tests/utils.py
similarity index 100%
rename from tests/utils.py
rename to keystoneclient/tests/utils.py
diff --git a/tests/v2_0/__init__.py b/keystoneclient/tests/v2_0/__init__.py
similarity index 100%
rename from tests/v2_0/__init__.py
rename to keystoneclient/tests/v2_0/__init__.py
diff --git a/tests/v2_0/client_fixtures.py b/keystoneclient/tests/v2_0/client_fixtures.py
similarity index 100%
rename from tests/v2_0/client_fixtures.py
rename to keystoneclient/tests/v2_0/client_fixtures.py
diff --git a/tests/v2_0/fakes.py b/keystoneclient/tests/v2_0/fakes.py
similarity index 99%
rename from tests/v2_0/fakes.py
rename to keystoneclient/tests/v2_0/fakes.py
index b02c9faa4..943efe075 100644
--- a/tests/v2_0/fakes.py
+++ b/keystoneclient/tests/v2_0/fakes.py
@@ -15,8 +15,8 @@
 
 import urlparse
 
-from tests import fakes
-from tests.v2_0 import utils
+from keystoneclient.tests import fakes
+from keystoneclient.tests.v2_0 import utils
 
 
 class FakeHTTPClient(fakes.FakeClient):
diff --git a/tests/v2_0/test_access.py b/keystoneclient/tests/v2_0/test_access.py
similarity index 97%
rename from tests/v2_0/test_access.py
rename to keystoneclient/tests/v2_0/test_access.py
index 3eaa11a93..896803e8b 100644
--- a/tests/v2_0/test_access.py
+++ b/keystoneclient/tests/v2_0/test_access.py
@@ -16,9 +16,9 @@ import datetime
 
 from keystoneclient import access
 from keystoneclient.openstack.common import timeutils
-from tests import client_fixtures as token_data
-from tests.v2_0 import client_fixtures
-from tests.v2_0 import utils
+from keystoneclient.tests import client_fixtures as token_data
+from keystoneclient.tests.v2_0 import client_fixtures
+from keystoneclient.tests.v2_0 import utils
 
 UNSCOPED_TOKEN = client_fixtures.UNSCOPED_TOKEN
 PROJECT_SCOPED_TOKEN = client_fixtures.PROJECT_SCOPED_TOKEN
diff --git a/tests/v2_0/test_auth.py b/keystoneclient/tests/v2_0/test_auth.py
similarity index 99%
rename from tests/v2_0/test_auth.py
rename to keystoneclient/tests/v2_0/test_auth.py
index 4d3a2116d..f25ff9fa7 100644
--- a/tests/v2_0/test_auth.py
+++ b/keystoneclient/tests/v2_0/test_auth.py
@@ -19,8 +19,8 @@ import httpretty
 
 from keystoneclient import exceptions
 from keystoneclient.openstack.common import timeutils
+from keystoneclient.tests.v2_0 import utils
 from keystoneclient.v2_0 import client
-from tests.v2_0 import utils
 
 
 class AuthenticateAgainstKeystoneTests(utils.TestCase):
diff --git a/tests/v2_0/test_client.py b/keystoneclient/tests/v2_0/test_client.py
similarity index 97%
rename from tests/v2_0/test_client.py
rename to keystoneclient/tests/v2_0/test_client.py
index 6c93fcdef..3cf0ffc92 100644
--- a/tests/v2_0/test_client.py
+++ b/keystoneclient/tests/v2_0/test_client.py
@@ -17,9 +17,9 @@ import json
 import httpretty
 
 from keystoneclient import exceptions
+from keystoneclient.tests.v2_0 import client_fixtures
+from keystoneclient.tests.v2_0 import utils
 from keystoneclient.v2_0 import client
-from tests.v2_0 import client_fixtures
-from tests.v2_0 import utils
 
 
 class KeystoneClientTest(utils.TestCase):
diff --git a/tests/v2_0/test_discovery.py b/keystoneclient/tests/v2_0/test_discovery.py
similarity index 98%
rename from tests/v2_0/test_discovery.py
rename to keystoneclient/tests/v2_0/test_discovery.py
index c85d9dea0..fed61d4b4 100644
--- a/tests/v2_0/test_discovery.py
+++ b/keystoneclient/tests/v2_0/test_discovery.py
@@ -15,7 +15,7 @@
 import httpretty
 
 from keystoneclient.generic import client
-from tests.v2_0 import utils
+from keystoneclient.tests.v2_0 import utils
 
 
 class DiscoverKeystoneTests(utils.UnauthenticatedTestCase):
diff --git a/tests/v2_0/test_ec2.py b/keystoneclient/tests/v2_0/test_ec2.py
similarity index 98%
rename from tests/v2_0/test_ec2.py
rename to keystoneclient/tests/v2_0/test_ec2.py
index 30b7ead7a..6153a8d66 100644
--- a/tests/v2_0/test_ec2.py
+++ b/keystoneclient/tests/v2_0/test_ec2.py
@@ -14,8 +14,8 @@
 
 import httpretty
 
+from keystoneclient.tests.v2_0 import utils
 from keystoneclient.v2_0 import ec2
-from tests.v2_0 import utils
 
 
 class EC2Tests(utils.TestCase):
diff --git a/tests/v2_0/test_endpoints.py b/keystoneclient/tests/v2_0/test_endpoints.py
similarity index 98%
rename from tests/v2_0/test_endpoints.py
rename to keystoneclient/tests/v2_0/test_endpoints.py
index dfbbc6129..d0f85e718 100644
--- a/tests/v2_0/test_endpoints.py
+++ b/keystoneclient/tests/v2_0/test_endpoints.py
@@ -14,8 +14,8 @@
 
 import httpretty
 
+from keystoneclient.tests.v2_0 import utils
 from keystoneclient.v2_0 import endpoints
-from tests.v2_0 import utils
 
 
 class EndpointTests(utils.TestCase):
diff --git a/tests/v2_0/test_roles.py b/keystoneclient/tests/v2_0/test_roles.py
similarity index 98%
rename from tests/v2_0/test_roles.py
rename to keystoneclient/tests/v2_0/test_roles.py
index 21b9ec581..72b4d444d 100644
--- a/tests/v2_0/test_roles.py
+++ b/keystoneclient/tests/v2_0/test_roles.py
@@ -14,8 +14,8 @@
 
 import httpretty
 
+from keystoneclient.tests.v2_0 import utils
 from keystoneclient.v2_0 import roles
-from tests.v2_0 import utils
 
 
 class RoleTests(utils.TestCase):
diff --git a/tests/v2_0/test_service_catalog.py b/keystoneclient/tests/v2_0/test_service_catalog.py
similarity index 97%
rename from tests/v2_0/test_service_catalog.py
rename to keystoneclient/tests/v2_0/test_service_catalog.py
index c337b692f..07f300402 100644
--- a/tests/v2_0/test_service_catalog.py
+++ b/keystoneclient/tests/v2_0/test_service_catalog.py
@@ -16,9 +16,8 @@ import copy
 
 from keystoneclient import access
 from keystoneclient import exceptions
-
-from tests.v2_0 import client_fixtures
-from tests.v2_0 import utils
+from keystoneclient.tests.v2_0 import client_fixtures
+from keystoneclient.tests.v2_0 import utils
 
 
 class ServiceCatalogTest(utils.TestCase):
diff --git a/tests/v2_0/test_services.py b/keystoneclient/tests/v2_0/test_services.py
similarity index 98%
rename from tests/v2_0/test_services.py
rename to keystoneclient/tests/v2_0/test_services.py
index 2c953e5a4..0b539a98d 100644
--- a/tests/v2_0/test_services.py
+++ b/keystoneclient/tests/v2_0/test_services.py
@@ -14,8 +14,8 @@
 
 import httpretty
 
+from keystoneclient.tests.v2_0 import utils
 from keystoneclient.v2_0 import services
-from tests.v2_0 import utils
 
 
 class ServiceTests(utils.TestCase):
diff --git a/tests/v2_0/test_shell.py b/keystoneclient/tests/v2_0/test_shell.py
similarity index 99%
rename from tests/v2_0/test_shell.py
rename to keystoneclient/tests/v2_0/test_shell.py
index b3a05d371..1b6db200b 100644
--- a/tests/v2_0/test_shell.py
+++ b/keystoneclient/tests/v2_0/test_shell.py
@@ -20,9 +20,8 @@ from mox3 import stubout
 from testtools import matchers
 
 from keystoneclient import httpclient
-
-from tests.v2_0 import fakes
-from tests.v2_0 import utils
+from keystoneclient.tests.v2_0 import fakes
+from keystoneclient.tests.v2_0 import utils
 
 
 DEFAULT_USERNAME = 'username'
diff --git a/tests/v2_0/test_tenants.py b/keystoneclient/tests/v2_0/test_tenants.py
similarity index 99%
rename from tests/v2_0/test_tenants.py
rename to keystoneclient/tests/v2_0/test_tenants.py
index 02797a83a..95859d482 100644
--- a/tests/v2_0/test_tenants.py
+++ b/keystoneclient/tests/v2_0/test_tenants.py
@@ -15,8 +15,8 @@
 import httpretty
 
 from keystoneclient import exceptions
+from keystoneclient.tests.v2_0 import utils
 from keystoneclient.v2_0 import tenants
-from tests.v2_0 import utils
 
 
 class TenantTests(utils.TestCase):
diff --git a/tests/v2_0/test_tokens.py b/keystoneclient/tests/v2_0/test_tokens.py
similarity index 94%
rename from tests/v2_0/test_tokens.py
rename to keystoneclient/tests/v2_0/test_tokens.py
index 6424d2856..b623adaf7 100644
--- a/tests/v2_0/test_tokens.py
+++ b/keystoneclient/tests/v2_0/test_tokens.py
@@ -14,7 +14,7 @@
 
 import httpretty
 
-from tests.v2_0 import utils
+from keystoneclient.tests.v2_0 import utils
 
 
 class TokenTests(utils.TestCase):
diff --git a/tests/v2_0/test_users.py b/keystoneclient/tests/v2_0/test_users.py
similarity index 99%
rename from tests/v2_0/test_users.py
rename to keystoneclient/tests/v2_0/test_users.py
index 288b55549..1c9395c13 100644
--- a/tests/v2_0/test_users.py
+++ b/keystoneclient/tests/v2_0/test_users.py
@@ -14,8 +14,8 @@
 
 import httpretty
 
+from keystoneclient.tests.v2_0 import utils
 from keystoneclient.v2_0 import users
-from tests.v2_0 import utils
 
 
 class UserTests(utils.TestCase):
diff --git a/tests/v2_0/utils.py b/keystoneclient/tests/v2_0/utils.py
similarity index 98%
rename from tests/v2_0/utils.py
rename to keystoneclient/tests/v2_0/utils.py
index 870f06c65..6716527fd 100644
--- a/tests/v2_0/utils.py
+++ b/keystoneclient/tests/v2_0/utils.py
@@ -14,8 +14,8 @@
 
 import httpretty
 
+from keystoneclient.tests import utils
 from keystoneclient.v2_0 import client
-from tests import utils
 
 TestResponse = utils.TestResponse
 
diff --git a/tests/v3/__init__.py b/keystoneclient/tests/v3/__init__.py
similarity index 100%
rename from tests/v3/__init__.py
rename to keystoneclient/tests/v3/__init__.py
diff --git a/tests/v3/client_fixtures.py b/keystoneclient/tests/v3/client_fixtures.py
similarity index 100%
rename from tests/v3/client_fixtures.py
rename to keystoneclient/tests/v3/client_fixtures.py
diff --git a/tests/v3/test_access.py b/keystoneclient/tests/v3/test_access.py
similarity index 98%
rename from tests/v3/test_access.py
rename to keystoneclient/tests/v3/test_access.py
index 6c9fe9978..4bc3db6f5 100644
--- a/tests/v3/test_access.py
+++ b/keystoneclient/tests/v3/test_access.py
@@ -16,8 +16,8 @@ import datetime
 
 from keystoneclient import access
 from keystoneclient.openstack.common import timeutils
-from tests.v3 import client_fixtures
-from tests.v3 import utils
+from keystoneclient.tests.v3 import client_fixtures
+from keystoneclient.tests.v3 import utils
 
 TOKEN_RESPONSE = utils.TestResponse({
     "headers": client_fixtures.AUTH_RESPONSE_HEADERS
diff --git a/tests/v3/test_auth.py b/keystoneclient/tests/v3/test_auth.py
similarity index 99%
rename from tests/v3/test_auth.py
rename to keystoneclient/tests/v3/test_auth.py
index 1cd5407af..c7149a85a 100644
--- a/tests/v3/test_auth.py
+++ b/keystoneclient/tests/v3/test_auth.py
@@ -15,10 +15,9 @@
 import httpretty
 
 from keystoneclient import exceptions
+from keystoneclient.tests.v3 import utils
 from keystoneclient.v3 import client
 
-from tests.v3 import utils
-
 
 class AuthenticateAgainstKeystoneTests(utils.TestCase):
     def setUp(self):
diff --git a/tests/v3/test_client.py b/keystoneclient/tests/v3/test_client.py
similarity index 98%
rename from tests/v3/test_client.py
rename to keystoneclient/tests/v3/test_client.py
index a49e4f5cb..f479ef78a 100644
--- a/tests/v3/test_client.py
+++ b/keystoneclient/tests/v3/test_client.py
@@ -17,11 +17,10 @@ import json
 import httpretty
 
 from keystoneclient import exceptions
+from keystoneclient.tests.v3 import client_fixtures
+from keystoneclient.tests.v3 import utils
 from keystoneclient.v3 import client
 
-from tests.v3 import client_fixtures
-from tests.v3 import utils
-
 
 class KeystoneClientTest(utils.TestCase):
 
diff --git a/tests/v3/test_credentials.py b/keystoneclient/tests/v3/test_credentials.py
similarity index 96%
rename from tests/v3/test_credentials.py
rename to keystoneclient/tests/v3/test_credentials.py
index 25ec1b2bd..50b4a9316 100644
--- a/tests/v3/test_credentials.py
+++ b/keystoneclient/tests/v3/test_credentials.py
@@ -14,8 +14,8 @@
 
 import uuid
 
+from keystoneclient.tests.v3 import utils
 from keystoneclient.v3 import credentials
-from tests.v3 import utils
 
 
 class CredentialTests(utils.TestCase, utils.CrudTests):
diff --git a/tests/v3/test_discover.py b/keystoneclient/tests/v3/test_discover.py
similarity index 98%
rename from tests/v3/test_discover.py
rename to keystoneclient/tests/v3/test_discover.py
index 40538bc15..994f95921 100644
--- a/tests/v3/test_discover.py
+++ b/keystoneclient/tests/v3/test_discover.py
@@ -17,7 +17,7 @@ import json
 import httpretty
 
 from keystoneclient.generic import client
-from tests.v3 import utils
+from keystoneclient.tests.v3 import utils
 
 
 class DiscoverKeystoneTests(utils.UnauthenticatedTestCase):
diff --git a/tests/v3/test_domains.py b/keystoneclient/tests/v3/test_domains.py
similarity index 96%
rename from tests/v3/test_domains.py
rename to keystoneclient/tests/v3/test_domains.py
index ab4500fbf..f70c67dc6 100644
--- a/tests/v3/test_domains.py
+++ b/keystoneclient/tests/v3/test_domains.py
@@ -14,8 +14,8 @@
 
 import uuid
 
+from keystoneclient.tests.v3 import utils
 from keystoneclient.v3 import domains
-from tests.v3 import utils
 
 
 class DomainTests(utils.TestCase, utils.CrudTests):
diff --git a/tests/v3/test_endpoints.py b/keystoneclient/tests/v3/test_endpoints.py
similarity index 98%
rename from tests/v3/test_endpoints.py
rename to keystoneclient/tests/v3/test_endpoints.py
index 1534b90bd..673452396 100644
--- a/tests/v3/test_endpoints.py
+++ b/keystoneclient/tests/v3/test_endpoints.py
@@ -14,8 +14,8 @@
 
 import uuid
 
+from keystoneclient.tests.v3 import utils
 from keystoneclient.v3 import endpoints
-from tests.v3 import utils
 
 
 class EndpointTests(utils.TestCase, utils.CrudTests):
diff --git a/tests/v3/test_groups.py b/keystoneclient/tests/v3/test_groups.py
similarity index 98%
rename from tests/v3/test_groups.py
rename to keystoneclient/tests/v3/test_groups.py
index 5e9b9adbb..c72826709 100644
--- a/tests/v3/test_groups.py
+++ b/keystoneclient/tests/v3/test_groups.py
@@ -18,8 +18,8 @@ import uuid
 
 import httpretty
 
+from keystoneclient.tests.v3 import utils
 from keystoneclient.v3 import groups
-from tests.v3 import utils
 
 
 class GroupTests(utils.TestCase, utils.CrudTests):
diff --git a/tests/v3/test_policies.py b/keystoneclient/tests/v3/test_policies.py
similarity index 96%
rename from tests/v3/test_policies.py
rename to keystoneclient/tests/v3/test_policies.py
index b2ce1eabb..a692d1cc0 100644
--- a/tests/v3/test_policies.py
+++ b/keystoneclient/tests/v3/test_policies.py
@@ -14,8 +14,8 @@
 
 import uuid
 
+from keystoneclient.tests.v3 import utils
 from keystoneclient.v3 import policies
-from tests.v3 import utils
 
 
 class PolicyTests(utils.TestCase, utils.CrudTests):
diff --git a/tests/v3/test_projects.py b/keystoneclient/tests/v3/test_projects.py
similarity index 98%
rename from tests/v3/test_projects.py
rename to keystoneclient/tests/v3/test_projects.py
index ad696dc3d..6aa738361 100644
--- a/tests/v3/test_projects.py
+++ b/keystoneclient/tests/v3/test_projects.py
@@ -16,8 +16,8 @@ import uuid
 
 import httpretty
 
+from keystoneclient.tests.v3 import utils
 from keystoneclient.v3 import projects
-from tests.v3 import utils
 
 
 class ProjectTests(utils.TestCase, utils.CrudTests):
diff --git a/tests/v3/test_roles.py b/keystoneclient/tests/v3/test_roles.py
similarity index 99%
rename from tests/v3/test_roles.py
rename to keystoneclient/tests/v3/test_roles.py
index 59db0800a..8abe885e1 100644
--- a/tests/v3/test_roles.py
+++ b/keystoneclient/tests/v3/test_roles.py
@@ -19,8 +19,8 @@ import uuid
 import httpretty
 
 from keystoneclient import exceptions
+from keystoneclient.tests.v3 import utils
 from keystoneclient.v3 import roles
-from tests.v3 import utils
 
 
 class RoleTests(utils.TestCase, utils.CrudTests):
diff --git a/tests/v3/test_service_catalog.py b/keystoneclient/tests/v3/test_service_catalog.py
similarity index 97%
rename from tests/v3/test_service_catalog.py
rename to keystoneclient/tests/v3/test_service_catalog.py
index 2bcc29668..18d8109d9 100644
--- a/tests/v3/test_service_catalog.py
+++ b/keystoneclient/tests/v3/test_service_catalog.py
@@ -16,9 +16,8 @@ import copy
 
 from keystoneclient import access
 from keystoneclient import exceptions
-
-from tests.v3 import client_fixtures
-from tests.v3 import utils
+from keystoneclient.tests.v3 import client_fixtures
+from keystoneclient.tests.v3 import utils
 
 
 class ServiceCatalogTest(utils.TestCase):
diff --git a/tests/v3/test_services.py b/keystoneclient/tests/v3/test_services.py
similarity index 96%
rename from tests/v3/test_services.py
rename to keystoneclient/tests/v3/test_services.py
index be73b3b1a..5b0e91dcb 100644
--- a/tests/v3/test_services.py
+++ b/keystoneclient/tests/v3/test_services.py
@@ -14,8 +14,8 @@
 
 import uuid
 
+from keystoneclient.tests.v3 import utils
 from keystoneclient.v3 import services
-from tests.v3 import utils
 
 
 class ServiceTests(utils.TestCase, utils.CrudTests):
diff --git a/tests/v3/test_trusts.py b/keystoneclient/tests/v3/test_trusts.py
similarity index 98%
rename from tests/v3/test_trusts.py
rename to keystoneclient/tests/v3/test_trusts.py
index d97ead143..9c3d95322 100644
--- a/tests/v3/test_trusts.py
+++ b/keystoneclient/tests/v3/test_trusts.py
@@ -17,8 +17,8 @@ import uuid
 
 from keystoneclient import exceptions
 from keystoneclient.openstack.common import timeutils
+from keystoneclient.tests.v3 import utils
 from keystoneclient.v3.contrib import trusts
-from tests.v3 import utils
 
 
 class TrustTests(utils.TestCase, utils.CrudTests):
diff --git a/tests/v3/test_users.py b/keystoneclient/tests/v3/test_users.py
similarity index 99%
rename from tests/v3/test_users.py
rename to keystoneclient/tests/v3/test_users.py
index 1c28ef5a1..92135ddaa 100644
--- a/tests/v3/test_users.py
+++ b/keystoneclient/tests/v3/test_users.py
@@ -19,8 +19,8 @@ import uuid
 import httpretty
 
 from keystoneclient import exceptions
+from keystoneclient.tests.v3 import utils
 from keystoneclient.v3 import users
-from tests.v3 import utils
 
 
 class UserTests(utils.TestCase, utils.CrudTests):
diff --git a/tests/v3/utils.py b/keystoneclient/tests/v3/utils.py
similarity index 99%
rename from tests/v3/utils.py
rename to keystoneclient/tests/v3/utils.py
index 87cba88d1..00a2c2b00 100644
--- a/tests/v3/utils.py
+++ b/keystoneclient/tests/v3/utils.py
@@ -18,10 +18,9 @@ import uuid
 import httpretty
 
 from keystoneclient.openstack.common import jsonutils
+from keystoneclient.tests import utils
 from keystoneclient.v3 import client
 
-from tests import utils
-
 TestResponse = utils.TestResponse
 
 
diff --git a/run_tests.sh b/run_tests.sh
index cd11fcf1b..ecfb32568 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -81,7 +81,7 @@ function run_tests {
     if [ "$testropts" = "" ] && [ "$testrargs" = "" ]; then
       # Default to running all tests if specific test is not
       # provided.
-      testrargs="discover ./tests"
+      testrargs="discover ./keystoneclient/tests"
     fi
     ${wrapper} python -m testtools.run $testropts $testrargs
 
@@ -112,7 +112,7 @@ function run_tests {
     echo "Generating coverage report in covhtml/"
     # Don't compute coverage for common code, which is tested elsewhere
     ${wrapper} coverage combine
-    ${wrapper} coverage html --include='keystoneclient/*' --omit='keystoneclient/openstack/common/*' -d covhtml -i
+    ${wrapper} coverage html -d covhtml -i
   fi
 
   return $RESULT
@@ -127,7 +127,7 @@ function copy_subunit_log {
 
 function run_flake8 {
   echo "Running flake8 ..."
-  srcfiles="keystoneclient tests"
+  srcfiles="keystoneclient"
   # Just run Flake8 in current environment
   ${wrapper} flake8 ${srcfiles}
 }