diff --git a/senlin/tests/drivers/__init__.py b/senlin/tests/drivers/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/senlin/drivers/os_test/README.rst b/senlin/tests/drivers/os_test/README.rst
similarity index 100%
rename from senlin/drivers/os_test/README.rst
rename to senlin/tests/drivers/os_test/README.rst
diff --git a/senlin/drivers/os_test/__init__.py b/senlin/tests/drivers/os_test/__init__.py
similarity index 64%
rename from senlin/drivers/os_test/__init__.py
rename to senlin/tests/drivers/os_test/__init__.py
index 36e681009..00bce3346 100644
--- a/senlin/drivers/os_test/__init__.py
+++ b/senlin/tests/drivers/os_test/__init__.py
@@ -11,16 +11,16 @@
 # under the License.
 
 
-from senlin.drivers.os_test import cinder_v2
-from senlin.drivers.os_test import glance_v2
-from senlin.drivers.os_test import heat_v1
-from senlin.drivers.os_test import keystone_v3
-from senlin.drivers.os_test import lbaas
-from senlin.drivers.os_test import mistral_v2
-from senlin.drivers.os_test import neutron_v2
-from senlin.drivers.os_test import nova_v2
-from senlin.drivers.os_test import octavia_v2
-from senlin.drivers.os_test import zaqar_v2
+from senlin.tests.drivers.os_test import cinder_v2
+from senlin.tests.drivers.os_test import glance_v2
+from senlin.tests.drivers.os_test import heat_v1
+from senlin.tests.drivers.os_test import keystone_v3
+from senlin.tests.drivers.os_test import lbaas
+from senlin.tests.drivers.os_test import mistral_v2
+from senlin.tests.drivers.os_test import neutron_v2
+from senlin.tests.drivers.os_test import nova_v2
+from senlin.tests.drivers.os_test import octavia_v2
+from senlin.tests.drivers.os_test import zaqar_v2
 
 
 block_storage = cinder_v2.CinderClient
diff --git a/senlin/drivers/os_test/cinder_v2.py b/senlin/tests/drivers/os_test/cinder_v2.py
similarity index 100%
rename from senlin/drivers/os_test/cinder_v2.py
rename to senlin/tests/drivers/os_test/cinder_v2.py
diff --git a/senlin/drivers/os_test/glance_v2.py b/senlin/tests/drivers/os_test/glance_v2.py
similarity index 100%
rename from senlin/drivers/os_test/glance_v2.py
rename to senlin/tests/drivers/os_test/glance_v2.py
diff --git a/senlin/drivers/os_test/heat_v1.py b/senlin/tests/drivers/os_test/heat_v1.py
similarity index 100%
rename from senlin/drivers/os_test/heat_v1.py
rename to senlin/tests/drivers/os_test/heat_v1.py
diff --git a/senlin/drivers/os_test/keystone_v3.py b/senlin/tests/drivers/os_test/keystone_v3.py
similarity index 100%
rename from senlin/drivers/os_test/keystone_v3.py
rename to senlin/tests/drivers/os_test/keystone_v3.py
diff --git a/senlin/drivers/os_test/lbaas.py b/senlin/tests/drivers/os_test/lbaas.py
similarity index 100%
rename from senlin/drivers/os_test/lbaas.py
rename to senlin/tests/drivers/os_test/lbaas.py
diff --git a/senlin/drivers/os_test/mistral_v2.py b/senlin/tests/drivers/os_test/mistral_v2.py
similarity index 100%
rename from senlin/drivers/os_test/mistral_v2.py
rename to senlin/tests/drivers/os_test/mistral_v2.py
diff --git a/senlin/drivers/os_test/neutron_v2.py b/senlin/tests/drivers/os_test/neutron_v2.py
similarity index 100%
rename from senlin/drivers/os_test/neutron_v2.py
rename to senlin/tests/drivers/os_test/neutron_v2.py
diff --git a/senlin/drivers/os_test/nova_v2.py b/senlin/tests/drivers/os_test/nova_v2.py
similarity index 100%
rename from senlin/drivers/os_test/nova_v2.py
rename to senlin/tests/drivers/os_test/nova_v2.py
diff --git a/senlin/drivers/os_test/octavia_v2.py b/senlin/tests/drivers/os_test/octavia_v2.py
similarity index 100%
rename from senlin/drivers/os_test/octavia_v2.py
rename to senlin/tests/drivers/os_test/octavia_v2.py
diff --git a/senlin/drivers/os_test/zaqar_v2.py b/senlin/tests/drivers/os_test/zaqar_v2.py
similarity index 100%
rename from senlin/drivers/os_test/zaqar_v2.py
rename to senlin/tests/drivers/os_test/zaqar_v2.py
diff --git a/setup.cfg b/setup.cfg
index a67f46c66..5b39cb8cd 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -47,7 +47,7 @@ oslo.policy.policies =
 
 senlin.drivers =
     openstack = senlin.drivers.os
-    openstack_test = senlin.drivers.os_test
+    openstack_test = senlin.tests.drivers.os_test
 
 senlin.profiles =
     os.heat.stack-1.0 = senlin.profiles.os.heat.stack:StackProfile