diff --git a/heat/tests/barbican/__init__.py b/heat/tests/openstack/barbican/__init__.py
similarity index 100%
rename from heat/tests/barbican/__init__.py
rename to heat/tests/openstack/barbican/__init__.py
diff --git a/heat/tests/barbican/test_order.py b/heat/tests/openstack/barbican/test_order.py
similarity index 100%
rename from heat/tests/barbican/test_order.py
rename to heat/tests/openstack/barbican/test_order.py
diff --git a/heat/tests/barbican/test_secret.py b/heat/tests/openstack/barbican/test_secret.py
similarity index 100%
rename from heat/tests/barbican/test_secret.py
rename to heat/tests/openstack/barbican/test_secret.py