diff --git a/heat/tests/manila/__init__.py b/heat/tests/openstack/manila/__init__.py
similarity index 100%
rename from heat/tests/manila/__init__.py
rename to heat/tests/openstack/manila/__init__.py
diff --git a/heat/tests/manila/test_manila_security_service.py b/heat/tests/openstack/manila/test_security_service.py
similarity index 100%
rename from heat/tests/manila/test_manila_security_service.py
rename to heat/tests/openstack/manila/test_security_service.py
diff --git a/heat/tests/manila/test_manila_share.py b/heat/tests/openstack/manila/test_share.py
similarity index 100%
rename from heat/tests/manila/test_manila_share.py
rename to heat/tests/openstack/manila/test_share.py
diff --git a/heat/tests/manila/test_share_network.py b/heat/tests/openstack/manila/test_share_network.py
similarity index 100%
rename from heat/tests/manila/test_share_network.py
rename to heat/tests/openstack/manila/test_share_network.py
diff --git a/heat/tests/manila/test_manila_share_type.py b/heat/tests/openstack/manila/test_share_type.py
similarity index 100%
rename from heat/tests/manila/test_manila_share_type.py
rename to heat/tests/openstack/manila/test_share_type.py