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

52 files changed, 59 insertions, 65 deletions

diff --git a/.coveragerc b/.coveragerc
index 5cd599a..f024452 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 081907d..9355c27 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
index e69de29..e69de29 100644
--- a/tests/__init__.py
+++ b/keystoneclient/tests/__init__.py
diff --git a/tests/apiclient/test_exceptions.py b/keystoneclient/tests/apiclient/test_exceptions.py
index cfdf919..d41ac02 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
index 0abb06e..dd1c95f 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
index 941f9e4..941f9e4 100644
--- a/tests/fakes.py
+++ b/keystoneclient/tests/fakes.py
diff --git a/tests/test_auth_token_middleware.py b/keystoneclient/tests/test_auth_token_middleware.py
index 17eacb6..06e7609 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
index a781a7c..46e3dd2 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
index 361396d..361396d 100644
--- a/tests/test_ec2utils.py
+++ b/keystoneclient/tests/test_ec2utils.py
diff --git a/tests/test_http.py b/keystoneclient/tests/test_http.py
index 6cd2e48..a4b8e8f 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
index 5bbccba..1477720 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
index 29f3897..a44d432 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
index 500a509..500a509 100644
--- a/tests/test_memcache_crypt.py
+++ b/keystoneclient/tests/test_memcache_crypt.py
diff --git a/tests/test_shell.py b/keystoneclient/tests/test_shell.py
index 6814eb6..8c9c06f 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
index 36cf1e0..65c6a1a 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
index 24e8bed..24e8bed 100644
--- a/tests/utils.py
+++ b/keystoneclient/tests/utils.py
diff --git a/tests/v2_0/__init__.py b/keystoneclient/tests/v2_0/__init__.py
index e69de29..e69de29 100644
--- a/tests/v2_0/__init__.py
+++ b/keystoneclient/tests/v2_0/__init__.py
diff --git a/tests/v2_0/client_fixtures.py b/keystoneclient/tests/v2_0/client_fixtures.py
index 5735fd4..5735fd4 100644
--- a/tests/v2_0/client_fixtures.py
+++ b/keystoneclient/tests/v2_0/client_fixtures.py
diff --git a/tests/v2_0/fakes.py b/keystoneclient/tests/v2_0/fakes.py
index b02c9fa..943efe0 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
index 3eaa11a..896803e 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
index 4d3a211..f25ff9f 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
index 6c93fcd..3cf0ffc 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
index c85d9de..fed61d4 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
index 30b7ead..6153a8d 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
index dfbbc61..d0f85e7 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
index 21b9ec5..72b4d44 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
index c337b69..07f3004 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
index 2c953e5..0b539a9 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
index b3a05d3..1b6db20 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
index 02797a8..95859d4 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
index 6424d28..b623ada 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
index 288b555..1c9395c 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
index 870f06c..6716527 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
index e69de29..e69de29 100644
--- a/tests/v3/__init__.py
+++ b/keystoneclient/tests/v3/__init__.py
diff --git a/tests/v3/client_fixtures.py b/keystoneclient/tests/v3/client_fixtures.py
index 179916b..179916b 100644
--- a/tests/v3/client_fixtures.py
+++ b/keystoneclient/tests/v3/client_fixtures.py
diff --git a/tests/v3/test_access.py b/keystoneclient/tests/v3/test_access.py
index 6c9fe99..4bc3db6 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
index 1cd5407..c7149a8 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
index a49e4f5..f479ef7 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
index 25ec1b2..50b4a93 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
index 40538bc..994f959 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
index ab4500f..f70c67d 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
index 1534b90..6734523 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
index 5e9b9ad..c728267 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
index b2ce1ea..a692d1c 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
index ad696dc..6aa7383 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
index 59db080..8abe885 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
index 2bcc296..18d8109 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
index be73b3b..5b0e91d 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
index d97ead1..9c3d953 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
index 1c28ef5..92135dd 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
index 87cba88..00a2c2b 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 cd11fcf..ecfb325 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}
 }