diff --git a/heat/tests/ceilometer/__init__.py b/heat/engine/resources/openstack/ceilometer/gnocchi/__init__.py
similarity index 100%
rename from heat/tests/ceilometer/__init__.py
rename to heat/engine/resources/openstack/ceilometer/gnocchi/__init__.py
diff --git a/heat/engine/resources/openstack/ceilometer/gnocchi_alarm.py b/heat/engine/resources/openstack/ceilometer/gnocchi/alarm.py
similarity index 100%
rename from heat/engine/resources/openstack/ceilometer/gnocchi_alarm.py
rename to heat/engine/resources/openstack/ceilometer/gnocchi/alarm.py
diff --git a/heat/tests/openstack/ceilometer/__init__.py b/heat/tests/openstack/ceilometer/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/heat/tests/ceilometer/test_ceilometer_alarm.py b/heat/tests/openstack/ceilometer/test_ceilometer_alarm.py
similarity index 100%
rename from heat/tests/ceilometer/test_ceilometer_alarm.py
rename to heat/tests/openstack/ceilometer/test_ceilometer_alarm.py
diff --git a/heat/tests/ceilometer/test_gnocchi_alarm.py b/heat/tests/openstack/ceilometer/test_gnocchi_alarm.py
similarity index 99%
rename from heat/tests/ceilometer/test_gnocchi_alarm.py
rename to heat/tests/openstack/ceilometer/test_gnocchi_alarm.py
index 2f15551731..2072dbffa0 100644
--- a/heat/tests/ceilometer/test_gnocchi_alarm.py
+++ b/heat/tests/openstack/ceilometer/test_gnocchi_alarm.py
@@ -19,7 +19,8 @@ import mox
 from heat.common import exception
 from heat.common import template_format
 from heat.engine.clients.os import ceilometer
-from heat.engine.resources.openstack.ceilometer import gnocchi_alarm as gnocchi
+from heat.engine.resources.openstack.ceilometer.gnocchi import \
+    alarm as gnocchi
 from heat.engine import scheduler
 from heat.tests import common
 from heat.tests import utils