diff --git a/heatclient/tests/v1/__init__.py b/heatclient/tests/unit/__init__.py
similarity index 100%
rename from heatclient/tests/v1/__init__.py
rename to heatclient/tests/unit/__init__.py
diff --git a/heatclient/tests/fakes.py b/heatclient/tests/unit/fakes.py
similarity index 100%
rename from heatclient/tests/fakes.py
rename to heatclient/tests/unit/fakes.py
diff --git a/heatclient/tests/test_actions.py b/heatclient/tests/unit/test_actions.py
similarity index 100%
rename from heatclient/tests/test_actions.py
rename to heatclient/tests/unit/test_actions.py
diff --git a/heatclient/tests/test_build_info.py b/heatclient/tests/unit/test_build_info.py
similarity index 100%
rename from heatclient/tests/test_build_info.py
rename to heatclient/tests/unit/test_build_info.py
diff --git a/heatclient/tests/test_common_http.py b/heatclient/tests/unit/test_common_http.py
similarity index 99%
rename from heatclient/tests/test_common_http.py
rename to heatclient/tests/unit/test_common_http.py
index eea489bc..257d76fc 100644
--- a/heatclient/tests/test_common_http.py
+++ b/heatclient/tests/unit/test_common_http.py
@@ -21,8 +21,8 @@ import testtools
 
 from heatclient.common import http
 from heatclient import exc
-from heatclient.tests import fakes
-from heatclient.tests import test_shell
+from heatclient.tests.unit import fakes
+from heatclient.tests.unit import test_shell
 from keystoneclient.auth.identity import v2 as ks_v2_auth
 from keystoneclient import session
 from mox3 import mox
diff --git a/heatclient/tests/test_deployment_utils.py b/heatclient/tests/unit/test_deployment_utils.py
similarity index 100%
rename from heatclient/tests/test_deployment_utils.py
rename to heatclient/tests/unit/test_deployment_utils.py
diff --git a/heatclient/tests/test_environment_format.py b/heatclient/tests/unit/test_environment_format.py
similarity index 100%
rename from heatclient/tests/test_environment_format.py
rename to heatclient/tests/unit/test_environment_format.py
diff --git a/heatclient/tests/test_events.py b/heatclient/tests/unit/test_events.py
similarity index 100%
rename from heatclient/tests/test_events.py
rename to heatclient/tests/unit/test_events.py
diff --git a/heatclient/tests/test_resource_types.py b/heatclient/tests/unit/test_resource_types.py
similarity index 100%
rename from heatclient/tests/test_resource_types.py
rename to heatclient/tests/unit/test_resource_types.py
diff --git a/heatclient/tests/test_resources.py b/heatclient/tests/unit/test_resources.py
similarity index 100%
rename from heatclient/tests/test_resources.py
rename to heatclient/tests/unit/test_resources.py
diff --git a/heatclient/tests/test_service.py b/heatclient/tests/unit/test_service.py
similarity index 100%
rename from heatclient/tests/test_service.py
rename to heatclient/tests/unit/test_service.py
diff --git a/heatclient/tests/test_shell.py b/heatclient/tests/unit/test_shell.py
similarity index 99%
rename from heatclient/tests/test_shell.py
rename to heatclient/tests/unit/test_shell.py
index f1dbbc0d..34fff410 100644
--- a/heatclient/tests/test_shell.py
+++ b/heatclient/tests/unit/test_shell.py
@@ -38,7 +38,7 @@ from heatclient.common import http
 from heatclient.common import utils
 from heatclient import exc
 import heatclient.shell
-from heatclient.tests import fakes
+from heatclient.tests.unit import fakes
 import heatclient.v1.shell
 
 load_tests = testscenarios.load_tests_apply_scenarios
diff --git a/heatclient/tests/test_software_configs.py b/heatclient/tests/unit/test_software_configs.py
similarity index 100%
rename from heatclient/tests/test_software_configs.py
rename to heatclient/tests/unit/test_software_configs.py
diff --git a/heatclient/tests/test_software_deployments.py b/heatclient/tests/unit/test_software_deployments.py
similarity index 100%
rename from heatclient/tests/test_software_deployments.py
rename to heatclient/tests/unit/test_software_deployments.py
diff --git a/heatclient/tests/test_stacks.py b/heatclient/tests/unit/test_stacks.py
similarity index 100%
rename from heatclient/tests/test_stacks.py
rename to heatclient/tests/unit/test_stacks.py
diff --git a/heatclient/tests/test_template_format.py b/heatclient/tests/unit/test_template_format.py
similarity index 100%
rename from heatclient/tests/test_template_format.py
rename to heatclient/tests/unit/test_template_format.py
diff --git a/heatclient/tests/test_template_utils.py b/heatclient/tests/unit/test_template_utils.py
similarity index 100%
rename from heatclient/tests/test_template_utils.py
rename to heatclient/tests/unit/test_template_utils.py
diff --git a/heatclient/tests/test_utils.py b/heatclient/tests/unit/test_utils.py
similarity index 100%
rename from heatclient/tests/test_utils.py
rename to heatclient/tests/unit/test_utils.py
diff --git a/heatclient/tests/unit/v1/__init__.py b/heatclient/tests/unit/v1/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/heatclient/tests/v1/test_hooks.py b/heatclient/tests/unit/v1/test_hooks.py
similarity index 100%
rename from heatclient/tests/v1/test_hooks.py
rename to heatclient/tests/unit/v1/test_hooks.py
diff --git a/heatclient/tests/var/adopt_stack_data.json b/heatclient/tests/unit/var/adopt_stack_data.json
similarity index 100%
rename from heatclient/tests/var/adopt_stack_data.json
rename to heatclient/tests/unit/var/adopt_stack_data.json
diff --git a/heatclient/tests/var/minimal.template b/heatclient/tests/unit/var/minimal.template
similarity index 100%
rename from heatclient/tests/var/minimal.template
rename to heatclient/tests/unit/var/minimal.template