diff --git a/.testr.conf b/.testr.conf
index 081907d5..a2f6f4d5 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 ./ ${OS_TEST_PATH:-./glanceclient/tests/unit} $LISTOPT $IDOPTION
 test_id_option=--load-list $IDFILE
 test_list_option=--list
diff --git a/tests/__init__.py b/glanceclient/tests/__init__.py
similarity index 100%
rename from tests/__init__.py
rename to glanceclient/tests/__init__.py
diff --git a/tests/v1/__init__.py b/glanceclient/tests/unit/__init__.py
similarity index 100%
rename from tests/v1/__init__.py
rename to glanceclient/tests/unit/__init__.py
diff --git a/tests/test_base.py b/glanceclient/tests/unit/test_base.py
similarity index 100%
rename from tests/test_base.py
rename to glanceclient/tests/unit/test_base.py
diff --git a/tests/test_client.py b/glanceclient/tests/unit/test_client.py
similarity index 100%
rename from tests/test_client.py
rename to glanceclient/tests/unit/test_client.py
diff --git a/tests/test_exc.py b/glanceclient/tests/unit/test_exc.py
similarity index 100%
rename from tests/test_exc.py
rename to glanceclient/tests/unit/test_exc.py
diff --git a/tests/test_http.py b/glanceclient/tests/unit/test_http.py
similarity index 99%
rename from tests/test_http.py
rename to glanceclient/tests/unit/test_http.py
index 4aa10ce8..e8bfaaa5 100644
--- a/tests/test_http.py
+++ b/glanceclient/tests/unit/test_http.py
@@ -27,7 +27,7 @@ import glanceclient
 from glanceclient.common import http
 from glanceclient.common import https
 from glanceclient import exc
-from tests import utils
+from glanceclient.tests import utils
 
 
 class TestClient(testtools.TestCase):
diff --git a/tests/test_progressbar.py b/glanceclient/tests/unit/test_progressbar.py
similarity index 98%
rename from tests/test_progressbar.py
rename to glanceclient/tests/unit/test_progressbar.py
index beb3c281..1dd42a03 100644
--- a/tests/test_progressbar.py
+++ b/glanceclient/tests/unit/test_progressbar.py
@@ -19,7 +19,7 @@ import six
 import testtools
 
 from glanceclient.common import progressbar
-from tests import utils as test_utils
+from glanceclient.tests import utils as test_utils
 
 
 class TestProgressBarWrapper(testtools.TestCase):
diff --git a/tests/test_shell.py b/glanceclient/tests/unit/test_shell.py
similarity index 99%
rename from tests/test_shell.py
rename to glanceclient/tests/unit/test_shell.py
index 6a705f69..ef15561c 100644
--- a/tests/test_shell.py
+++ b/glanceclient/tests/unit/test_shell.py
@@ -30,10 +30,10 @@ import six
 from glanceclient import exc
 from glanceclient import shell as openstack_shell
 
+from glanceclient.tests import utils
 #NOTE (esheffield) Used for the schema caching tests
 from glanceclient.v2 import schemas as schemas
 import json
-from tests import utils
 
 
 DEFAULT_IMAGE_URL = 'http://127.0.0.1:5000/'
diff --git a/tests/test_ssl.py b/glanceclient/tests/unit/test_ssl.py
similarity index 100%
rename from tests/test_ssl.py
rename to glanceclient/tests/unit/test_ssl.py
diff --git a/tests/test_utils.py b/glanceclient/tests/unit/test_utils.py
similarity index 100%
rename from tests/test_utils.py
rename to glanceclient/tests/unit/test_utils.py
diff --git a/tests/v2/__init__.py b/glanceclient/tests/unit/v1/__init__.py
similarity index 100%
rename from tests/v2/__init__.py
rename to glanceclient/tests/unit/v1/__init__.py
diff --git a/tests/v1/test_image_members.py b/glanceclient/tests/unit/v1/test_image_members.py
similarity index 99%
rename from tests/v1/test_image_members.py
rename to glanceclient/tests/unit/v1/test_image_members.py
index 8cf8f55d..d6e3150d 100644
--- a/tests/v1/test_image_members.py
+++ b/glanceclient/tests/unit/v1/test_image_members.py
@@ -15,9 +15,9 @@
 
 import testtools
 
+from glanceclient.tests import utils
 import glanceclient.v1.image_members
 import glanceclient.v1.images
-from tests import utils
 
 
 fixtures = {
diff --git a/tests/v1/test_images.py b/glanceclient/tests/unit/v1/test_images.py
similarity index 99%
rename from tests/v1/test_images.py
rename to glanceclient/tests/unit/v1/test_images.py
index 1cf1794f..90849d1f 100644
--- a/tests/v1/test_images.py
+++ b/glanceclient/tests/unit/v1/test_images.py
@@ -20,10 +20,10 @@ import testtools
 import six
 from six.moves.urllib import parse
 
+from glanceclient.tests import utils
 from glanceclient.v1 import client
 from glanceclient.v1 import images
 from glanceclient.v1 import shell
-from tests import utils
 
 
 fixtures = {
diff --git a/tests/v1/test_shell.py b/glanceclient/tests/unit/v1/test_shell.py
similarity index 99%
rename from tests/v1/test_shell.py
rename to glanceclient/tests/unit/v1/test_shell.py
index d0885000..342dce14 100644
--- a/tests/v1/test_shell.py
+++ b/glanceclient/tests/unit/v1/test_shell.py
@@ -31,7 +31,7 @@ import glanceclient.v1.client as client
 import glanceclient.v1.images
 import glanceclient.v1.shell as v1shell
 
-from tests import utils
+from glanceclient.tests import utils
 
 if six.PY3:
     import io
diff --git a/glanceclient/tests/unit/v2/__init__.py b/glanceclient/tests/unit/v2/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/v2/test_images.py b/glanceclient/tests/unit/v2/test_images.py
similarity index 99%
rename from tests/v2/test_images.py
rename to glanceclient/tests/unit/v2/test_images.py
index f15d795e..7fc7558e 100644
--- a/tests/v2/test_images.py
+++ b/glanceclient/tests/unit/v2/test_images.py
@@ -18,8 +18,8 @@ import errno
 import testtools
 
 from glanceclient import exc
+from glanceclient.tests import utils
 from glanceclient.v2 import images
-from tests import utils
 
 _CHKSUM = '93264c3edf5972c9f1cb309543d38a5c'
 _CHKSUM1 = '54264c3edf5972c9f1cb309453d38a46'
diff --git a/tests/v2/test_members.py b/glanceclient/tests/unit/v2/test_members.py
similarity index 98%
rename from tests/v2/test_members.py
rename to glanceclient/tests/unit/v2/test_members.py
index 744f3a6f..cf56a36d 100644
--- a/tests/v2/test_members.py
+++ b/glanceclient/tests/unit/v2/test_members.py
@@ -15,8 +15,8 @@
 
 import testtools
 
+from glanceclient.tests import utils
 from glanceclient.v2 import image_members
-from tests import utils
 
 
 IMAGE = '3a4560a1-e585-443e-9b39-553b46ec92d1'
diff --git a/tests/v2/test_metadefs_namespaces.py b/glanceclient/tests/unit/v2/test_metadefs_namespaces.py
similarity index 99%
rename from tests/v2/test_metadefs_namespaces.py
rename to glanceclient/tests/unit/v2/test_metadefs_namespaces.py
index b03dcd15..ecc05ee5 100644
--- a/tests/v2/test_metadefs_namespaces.py
+++ b/glanceclient/tests/unit/v2/test_metadefs_namespaces.py
@@ -15,8 +15,8 @@
 
 import testtools
 
+from glanceclient.tests import utils
 from glanceclient.v2 import metadefs
-from tests import utils
 
 NAMESPACE1 = 'Namespace1'
 NAMESPACE2 = 'Namespace2'
diff --git a/tests/v2/test_metadefs_objects.py b/glanceclient/tests/unit/v2/test_metadefs_objects.py
similarity index 99%
rename from tests/v2/test_metadefs_objects.py
rename to glanceclient/tests/unit/v2/test_metadefs_objects.py
index 701d5621..c565b3c7 100644
--- a/tests/v2/test_metadefs_objects.py
+++ b/glanceclient/tests/unit/v2/test_metadefs_objects.py
@@ -16,8 +16,8 @@
 import six
 import testtools
 
+from glanceclient.tests import utils
 from glanceclient.v2 import metadefs
-from tests import utils
 
 NAMESPACE1 = 'Namespace1'
 OBJECT1 = 'Object1'
diff --git a/tests/v2/test_metadefs_properties.py b/glanceclient/tests/unit/v2/test_metadefs_properties.py
similarity index 99%
rename from tests/v2/test_metadefs_properties.py
rename to glanceclient/tests/unit/v2/test_metadefs_properties.py
index d2ac25dd..388bf938 100644
--- a/tests/v2/test_metadefs_properties.py
+++ b/glanceclient/tests/unit/v2/test_metadefs_properties.py
@@ -15,8 +15,8 @@
 
 import testtools
 
+from glanceclient.tests import utils
 from glanceclient.v2 import metadefs
-from tests import utils
 
 NAMESPACE1 = 'Namespace1'
 PROPERTY1 = 'Property1'
diff --git a/tests/v2/test_metadefs_resource_types.py b/glanceclient/tests/unit/v2/test_metadefs_resource_types.py
similarity index 99%
rename from tests/v2/test_metadefs_resource_types.py
rename to glanceclient/tests/unit/v2/test_metadefs_resource_types.py
index bcb4993a..de3f9c2e 100644
--- a/tests/v2/test_metadefs_resource_types.py
+++ b/glanceclient/tests/unit/v2/test_metadefs_resource_types.py
@@ -15,8 +15,8 @@
 
 import testtools
 
+from glanceclient.tests import utils
 from glanceclient.v2 import metadefs
-from tests import utils
 
 NAMESPACE1 = 'Namespace1'
 RESOURCE_TYPE1 = 'ResourceType1'
diff --git a/tests/v2/test_schemas.py b/glanceclient/tests/unit/v2/test_schemas.py
similarity index 99%
rename from tests/v2/test_schemas.py
rename to glanceclient/tests/unit/v2/test_schemas.py
index 20d817bb..35788cd5 100644
--- a/tests/v2/test_schemas.py
+++ b/glanceclient/tests/unit/v2/test_schemas.py
@@ -17,8 +17,8 @@ from jsonpatch import JsonPatch
 import testtools
 import warlock
 
+from glanceclient.tests import utils
 from glanceclient.v2 import schemas
-from tests import utils
 
 
 fixtures = {
diff --git a/tests/v2/test_shell_v2.py b/glanceclient/tests/unit/v2/test_shell_v2.py
similarity index 100%
rename from tests/v2/test_shell_v2.py
rename to glanceclient/tests/unit/v2/test_shell_v2.py
diff --git a/tests/v2/test_tags.py b/glanceclient/tests/unit/v2/test_tags.py
similarity index 98%
rename from tests/v2/test_tags.py
rename to glanceclient/tests/unit/v2/test_tags.py
index 88ec2fec..790080ed 100644
--- a/tests/v2/test_tags.py
+++ b/glanceclient/tests/unit/v2/test_tags.py
@@ -15,8 +15,8 @@
 
 import testtools
 
+from glanceclient.tests import utils
 from glanceclient.v2 import image_tags
-from tests import utils
 
 
 IMAGE = '3a4560a1-e585-443e-9b39-553b46ec92d1'
diff --git a/tests/v2/test_tasks.py b/glanceclient/tests/unit/v2/test_tasks.py
similarity index 99%
rename from tests/v2/test_tasks.py
rename to glanceclient/tests/unit/v2/test_tasks.py
index 4e1f78c4..ed63286e 100644
--- a/tests/v2/test_tasks.py
+++ b/glanceclient/tests/unit/v2/test_tasks.py
@@ -16,8 +16,8 @@
 
 import testtools
 
+from glanceclient.tests import utils
 from glanceclient.v2 import tasks
-from tests import utils
 
 
 _OWNED_TASK_ID = 'a4963502-acc7-42ba-ad60-5aa0962b7faf'
diff --git a/tests/var/ca.crt b/glanceclient/tests/unit/var/ca.crt
similarity index 100%
rename from tests/var/ca.crt
rename to glanceclient/tests/unit/var/ca.crt
diff --git a/tests/var/certificate.crt b/glanceclient/tests/unit/var/certificate.crt
similarity index 100%
rename from tests/var/certificate.crt
rename to glanceclient/tests/unit/var/certificate.crt
diff --git a/tests/var/expired-cert.crt b/glanceclient/tests/unit/var/expired-cert.crt
similarity index 100%
rename from tests/var/expired-cert.crt
rename to glanceclient/tests/unit/var/expired-cert.crt
diff --git a/tests/var/privatekey.key b/glanceclient/tests/unit/var/privatekey.key
similarity index 100%
rename from tests/var/privatekey.key
rename to glanceclient/tests/unit/var/privatekey.key
diff --git a/tests/var/wildcard-certificate.crt b/glanceclient/tests/unit/var/wildcard-certificate.crt
similarity index 100%
rename from tests/var/wildcard-certificate.crt
rename to glanceclient/tests/unit/var/wildcard-certificate.crt
diff --git a/tests/var/wildcard-san-certificate.crt b/glanceclient/tests/unit/var/wildcard-san-certificate.crt
similarity index 100%
rename from tests/var/wildcard-san-certificate.crt
rename to glanceclient/tests/unit/var/wildcard-san-certificate.crt
diff --git a/tests/utils.py b/glanceclient/tests/utils.py
similarity index 100%
rename from tests/utils.py
rename to glanceclient/tests/utils.py