diff --git a/heat/tests/magnum/__init__.py b/heat/tests/openstack/magnum/__init__.py
similarity index 100%
rename from heat/tests/magnum/__init__.py
rename to heat/tests/openstack/magnum/__init__.py
diff --git a/heat/tests/magnum/test_magnum_bay.py b/heat/tests/openstack/magnum/test_bay.py
similarity index 100%
rename from heat/tests/magnum/test_magnum_bay.py
rename to heat/tests/openstack/magnum/test_bay.py
diff --git a/heat/tests/magnum/test_magnum_baymodel.py b/heat/tests/openstack/magnum/test_baymodel.py
similarity index 100%
rename from heat/tests/magnum/test_magnum_baymodel.py
rename to heat/tests/openstack/magnum/test_baymodel.py