diff --git a/telemetry_tempest_plugin/config.py b/telemetry_tempest_plugin/config.py
index 87b50af..7fc17a8 100644
--- a/telemetry_tempest_plugin/config.py
+++ b/telemetry_tempest_plugin/config.py
@@ -27,6 +27,10 @@
                   cfg.BoolOpt("aodh_plugin",
                               default=True,
                               help="Whether or not Aodh is expected to be"
+                                   "available"),
+                  cfg.BoolOpt('gnocchi',
+                              default=True,
+                              help="Whether or not Gnocchi is expected to be"
                                    "available")]
 
 telemetry_group = cfg.OptGroup(name='telemetry',
@@ -38,6 +42,9 @@
 alarming_group = cfg.OptGroup(name='alarming_plugin',
                               title='Alarming Service Options')
 
+metric_group = cfg.OptGroup(name='metric',
+                            title='Metric Service Options')
+
 TelemetryGroup = [
     cfg.IntOpt('notification_wait',
                default=120,
@@ -75,3 +82,14 @@
                         'publicURL', 'adminURL', 'internalURL'],
                help="The endpoint type to use for the alarming service."),
 ]
+
+metric_opts = [
+    cfg.StrOpt('catalog_type',
+               default='metric',
+               help="Catalog type of the Metric service."),
+    cfg.StrOpt('endpoint_type',
+               default='publicURL',
+               choices=['public', 'admin', 'internal',
+                        'publicURL', 'adminURL', 'internalURL'],
+               help="The endpoint type to use for the metric service."),
+]