diff --git a/tacker/tests/etc/api-paste.ini.test b/tacker/tests/etc/api-paste.ini.test
index 62196af79..6eee00161 100644
--- a/tacker/tests/etc/api-paste.ini.test
+++ b/tacker/tests/etc/api-paste.ini.test
@@ -5,4 +5,4 @@ pipeline = extensions extensions_test_app
 paste.filter_factory = tacker.common.extensions:plugin_aware_extension_middleware_factory
 
 [app:extensions_test_app]
-paste.app_factory = tacker.tests.unit.test_extensions:app_factory
+paste.app_factory = tacker.tests.unit.api.test_extensions:app_factory
diff --git a/tacker/tests/unit/agent/__init__.py b/tacker/tests/unit/agent/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tacker/tests/unit/test_api_api_common.py b/tacker/tests/unit/api/test_api_common.py
similarity index 100%
rename from tacker/tests/unit/test_api_api_common.py
rename to tacker/tests/unit/api/test_api_common.py
diff --git a/tacker/tests/unit/test_extensions.py b/tacker/tests/unit/api/test_extensions.py
similarity index 100%
rename from tacker/tests/unit/test_extensions.py
rename to tacker/tests/unit/api/test_extensions.py
diff --git a/tacker/tests/unit/test_api_v2_extension.py b/tacker/tests/unit/api/test_v2_extension.py
similarity index 97%
rename from tacker/tests/unit/test_api_v2_extension.py
rename to tacker/tests/unit/api/test_v2_extension.py
index 1b54ea3b7..c5830937a 100644
--- a/tacker/tests/unit/test_api_v2_extension.py
+++ b/tacker/tests/unit/api/test_v2_extension.py
@@ -22,8 +22,8 @@ import webtest
 
 from tacker.api import extensions
 from tacker.api.v1 import attributes
-from tacker.tests.unit import test_api_v2
-from tacker.tests.unit import test_extensions
+from tacker.tests.unit.api import test_extensions
+from tacker.tests.unit.api.v2 import test_api_v2
 from tacker.tests.unit import testlib_api
 
 
diff --git a/tacker/tests/unit/test_attributes.py b/tacker/tests/unit/api/v1/test_attributes.py
similarity index 100%
rename from tacker/tests/unit/test_attributes.py
rename to tacker/tests/unit/api/v1/test_attributes.py
diff --git a/tacker/tests/unit/api/v2/__init__.py b/tacker/tests/unit/api/v2/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tacker/tests/unit/test_api_v2.py b/tacker/tests/unit/api/v2/test_api_v2.py
similarity index 100%
rename from tacker/tests/unit/test_api_v2.py
rename to tacker/tests/unit/api/v2/test_api_v2.py
diff --git a/tacker/tests/unit/test_api_v2_resource.py b/tacker/tests/unit/api/v2/test_resource.py
similarity index 100%
rename from tacker/tests/unit/test_api_v2_resource.py
rename to tacker/tests/unit/api/v2/test_resource.py
diff --git a/tacker/tests/unit/common/__init__.py b/tacker/tests/unit/common/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tacker/tests/unit/test_config.py b/tacker/tests/unit/common/test_config.py
similarity index 96%
rename from tacker/tests/unit/test_config.py
rename to tacker/tests/unit/common/test_config.py
index 9266d7cf6..1be407c22 100644
--- a/tacker/tests/unit/test_config.py
+++ b/tacker/tests/unit/common/test_config.py
@@ -33,7 +33,7 @@ class ConfigurationTest(base.BaseTestCase):
         self.assertEqual('keystone', cfg.CONF.auth_strategy)
         self.assertTrue(cfg.CONF.allow_bulk)
         relative_dir = os.path.join(os.path.dirname(__file__),
-                                    '..', '..', '..')
+                                    '..', '..', '..', '..')
         absolute_dir = os.path.abspath(relative_dir)
         self.assertEqual(absolute_dir, cfg.CONF.state_path)
         self.assertEqual('tacker', cfg.CONF.control_exchange)
diff --git a/tacker/tests/unit/test_common_log.py b/tacker/tests/unit/common/test_log.py
similarity index 100%
rename from tacker/tests/unit/test_common_log.py
rename to tacker/tests/unit/common/test_log.py
diff --git a/tacker/tests/unit/test_common_utils.py b/tacker/tests/unit/common/test_utils.py
similarity index 100%
rename from tacker/tests/unit/test_common_utils.py
rename to tacker/tests/unit/common/test_utils.py
diff --git a/tacker/tests/unit/conductor/__init__.py b/tacker/tests/unit/conductor/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tacker/tests/unit/test_db_migration.py b/tacker/tests/unit/db/test_db_migration.py
similarity index 100%
rename from tacker/tests/unit/test_db_migration.py
rename to tacker/tests/unit/db/test_db_migration.py
diff --git a/tacker/tests/unit/test_db_purge_delete.py b/tacker/tests/unit/db/test_db_purge_delete.py
similarity index 100%
rename from tacker/tests/unit/test_db_purge_delete.py
rename to tacker/tests/unit/db/test_db_purge_delete.py
diff --git a/tacker/tests/unit/test_common_services_plugin.py b/tacker/tests/unit/extensions/test_common_services.py
similarity index 100%
rename from tacker/tests/unit/test_common_services_plugin.py
rename to tacker/tests/unit/extensions/test_common_services.py
diff --git a/tacker/tests/unit/test_extension_extended_attribute.py b/tacker/tests/unit/extensions/test_extension_extended_attribute.py
similarity index 98%
rename from tacker/tests/unit/test_extension_extended_attribute.py
rename to tacker/tests/unit/extensions/test_extension_extended_attribute.py
index 7db94a699..ad445f904 100644
--- a/tacker/tests/unit/test_extension_extended_attribute.py
+++ b/tacker/tests/unit/extensions/test_extension_extended_attribute.py
@@ -25,8 +25,8 @@ from tacker.api.v1 import attributes
 from tacker.common import config
 from tacker import manager
 from tacker.tests import base
+from tacker.tests.unit.api.v2 import test_api_v2
 from tacker.tests.unit.extensions import extendedattribute as extattr
-from tacker.tests.unit import test_api_v2
 from tacker.tests.unit import testlib_api
 from tacker import wsgi
 
diff --git a/tacker/tests/unit/hacking/__init__.py b/tacker/tests/unit/hacking/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tacker/tests/unit/keymgr/__init__.py b/tacker/tests/unit/keymgr/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tacker/tests/unit/mistral/__init__.py b/tacker/tests/unit/mistral/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tacker/tests/unit/nfvo/workflows/__init__.py b/tacker/tests/unit/nfvo/workflows/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tacker/tests/unit/nfvo/workflows/vim_monitor/__init__.py b/tacker/tests/unit/nfvo/workflows/vim_monitor/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tacker/tests/unit/plugins/__init__.py b/tacker/tests/unit/plugins/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tacker/tests/unit/services/__init__.py b/tacker/tests/unit/services/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tacker/tests/unit/test_tacker_context.py b/tacker/tests/unit/test_context.py
similarity index 100%
rename from tacker/tests/unit/test_tacker_context.py
rename to tacker/tests/unit/test_context.py
diff --git a/tacker/tests/unit/tests/__init__.py b/tacker/tests/unit/tests/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tacker/tests/unit/test_post_mortem_debug.py b/tacker/tests/unit/tests/test_post_mortem_debug.py
similarity index 100%
rename from tacker/tests/unit/test_post_mortem_debug.py
rename to tacker/tests/unit/tests/test_post_mortem_debug.py
diff --git a/tacker/tests/unit/tosca/__init__.py b/tacker/tests/unit/tosca/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tacker/tests/unit/test_tosca_templates_under_samples.py b/tacker/tests/unit/tosca/test_tosca_templates_under_samples.py
similarity index 97%
rename from tacker/tests/unit/test_tosca_templates_under_samples.py
rename to tacker/tests/unit/tosca/test_tosca_templates_under_samples.py
index e339ec7b1..9c3c7923e 100644
--- a/tacker/tests/unit/test_tosca_templates_under_samples.py
+++ b/tacker/tests/unit/tosca/test_tosca_templates_under_samples.py
@@ -33,7 +33,7 @@ class TestSamples(testtools.TestCase):
     def _get_list_of_sample(self, tosca_files):
         if tosca_files:
             base_path = (os.path.dirname(os.path.abspath(__file__)) +
-                         '/../../../samples/tosca-templates/vnfd/')
+                         '/../../../../samples/tosca-templates/vnfd/')
             if isinstance(tosca_files, list):
                 list_of_samples = []
                 for tosca_file in tosca_files:
diff --git a/tacker/tests/unit/vnfm/mgmt_drivers/__init__.py b/tacker/tests/unit/vnfm/mgmt_drivers/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tacker/tests/unit/vnfm/policy_actions/__init__.py b/tacker/tests/unit/vnfm/policy_actions/__init__.py
new file mode 100644
index 000000000..e69de29bb