diff --git a/ceilometer/tests/tempest/config.py b/ceilometer/tests/tempest/config.py
index 1490921..87b50af 100644
--- a/ceilometer/tests/tempest/config.py
+++ b/ceilometer/tests/tempest/config.py
@@ -23,6 +23,10 @@
                   cfg.BoolOpt('panko',
                               default=True,
                               help="Whether or not Panko is expected to be"
+                                   "available"),
+                  cfg.BoolOpt("aodh_plugin",
+                              default=True,
+                              help="Whether or not Aodh is expected to be"
                                    "available")]
 
 telemetry_group = cfg.OptGroup(name='telemetry',
@@ -31,6 +35,9 @@
 event_group = cfg.OptGroup(name='event',
                            title='Event Service Options')
 
+alarming_group = cfg.OptGroup(name='alarming_plugin',
+                              title='Alarming Service Options')
+
 TelemetryGroup = [
     cfg.IntOpt('notification_wait',
                default=120,
@@ -57,3 +64,14 @@
                         'publicURL', 'adminURL', 'internalURL'],
                help="The endpoint type to use for the event service."),
 ]
+
+AlarmingGroup = [
+    cfg.StrOpt('catalog_type',
+               default='alarming',
+               help="Catalog type of the Alarming service."),
+    cfg.StrOpt('endpoint_type',
+               default='publicURL',
+               choices=['public', 'admin', 'internal',
+                        'publicURL', 'adminURL', 'internalURL'],
+               help="The endpoint type to use for the alarming service."),
+]