diff --git a/heat/tests/ceilometer/__init__.py b/heat/tests/ceilometer/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/heat/tests/test_ceilometer_alarm.py b/heat/tests/ceilometer/test_ceilometer_alarm.py
similarity index 100%
rename from heat/tests/test_ceilometer_alarm.py
rename to heat/tests/ceilometer/test_ceilometer_alarm.py
diff --git a/heat/tests/test_gnocchi_alarm.py b/heat/tests/ceilometer/test_gnocchi_alarm.py
similarity index 100%
rename from heat/tests/test_gnocchi_alarm.py
rename to heat/tests/ceilometer/test_gnocchi_alarm.py