diff --git a/telemetry_tempest_plugin/scenario/telemetry_integration_gabbits/create_stack.json b/telemetry_tempest_plugin/scenario/telemetry_integration_gabbits/create_stack.json
index 3d7b1a0..6a9f2ee 100644
--- a/telemetry_tempest_plugin/scenario/telemetry_integration_gabbits/create_stack.json
+++ b/telemetry_tempest_plugin/scenario/telemetry_integration_gabbits/create_stack.json
@@ -3,6 +3,22 @@
     "template": {
         "heat_template_version": "2013-05-23",
         "description": "Integration Test AutoScaling with heat+ceilometer+gnocchi+aodh",
+        "outputs": {
+            "query": {
+                "description": "CLI command to check the metrics alarms are triggered on",
+                "value": {
+                    "str_replace": {
+                        "template": "openstack metric aggregates --resource-type instance '(aggregate AGGREGATION (metric METRIC mean))' server_group=STACK_ID --stop now --needed-overlap 0 --granularity GRANULARITY",
+                        "params": {
+                            "METRIC": "$ENVIRON['CEILOMETER_METRIC_NAME']",
+                            "AGGREGATION": "$ENVIRON['GNOCCHI_AGGREGATION_METHOD']",
+                            "GRANULARITY": "$ENVIRON['AODH_GRANULARITY']",
+                            "STACK_ID": { "get_param": "OS::stack_id" }
+                        }
+                    }
+                }
+            }
+        },
         "resources": {
             "asg": {
                 "type": "OS::Heat::AutoScalingGroup",
@@ -43,11 +59,11 @@
                 "type": "OS::Aodh::GnocchiAggregationByResourcesAlarm",
                 "properties": {
                     "description": "Scale-up if the mean CPU > 10% on 1 minute",
-                    "metric": "$ENVIRON["CEILOMETER_METRIC_NAME"]",
-                    "aggregation_method": "$ENVIRON["GNOCCHI_AGGREGATION_METHOD"]",
-                    "granularity": $ENVIRON["AODH_GRANULARITY"],
+                    "metric": "$ENVIRON['CEILOMETER_METRIC_NAME']",
+                    "aggregation_method": "$ENVIRON['GNOCCHI_AGGREGATION_METHOD']",
+                    "granularity": $ENVIRON['AODH_GRANULARITY'],
                     "evaluation_periods": 2,
-                    "threshold": $ENVIRON["AODH_THRESHOLD"],
+                    "threshold": $ENVIRON['AODH_THRESHOLD'],
                     "comparison_operator": "gt",
                     "alarm_actions": [
                         {
@@ -83,11 +99,11 @@
                 "type": "OS::Aodh::GnocchiAggregationByResourcesAlarm",
                 "properties": {
                     "description": "Scale-down if the mean CPU < 10% on 1 minute",
-                    "metric": "$ENVIRON["CEILOMETER_METRIC_NAME"]",
-                    "aggregation_method": "$ENVIRON["GNOCCHI_AGGREGATION_METHOD"]",
-                    "granularity": $ENVIRON["AODH_GRANULARITY"],
+                    "metric": "$ENVIRON['CEILOMETER_METRIC_NAME']",
+                    "aggregation_method": "$ENVIRON['GNOCCHI_AGGREGATION_METHOD']",
+                    "granularity": $ENVIRON['AODH_GRANULARITY'],
                     "evaluation_periods": 2,
-                    "threshold": $ENVIRON["AODH_THRESHOLD"],
+                    "threshold": $ENVIRON['AODH_THRESHOLD'],
                     "resource_type": "instance",
                     "comparison_operator": "lt",
                     "alarm_actions": [