diff --git a/stacklight_tests/toolchain/test_openstack_telemetry.py b/stacklight_tests/toolchain/test_openstack_telemetry.py
index 838a558..36c01f3 100644
--- a/stacklight_tests/toolchain/test_openstack_telemetry.py
+++ b/stacklight_tests/toolchain/test_openstack_telemetry.py
@@ -49,8 +49,7 @@ class TestOpenstackTelemetry(api.ToolchainApi):
     def _deploy_telemetry_plugin(self, caller, advanced_options=None,
                                  additional_tests=None,
                                  additional_plugins=None, roles=None,
-                                 settings=None, should_fail=0,
-                                 failed_test_name=None):
+                                 settings=None, test_sets=None):
         self.check_run(caller)
         self.env.revert_snapshot("ready_with_5_slaves")
         self.add_plugin(self.OPENSTACK_TELEMETRY)
@@ -72,8 +71,7 @@ class TestOpenstackTelemetry(api.ToolchainApi):
         } if not roles else roles
         self.helpers.deploy_cluster(nodes_roles=node_roles)
         self.check_plugins_online()
-        self.helpers.run_ostf(should_fail=should_fail,
-                              failed_test_name=failed_test_name)
+        self.helpers.run_ostf(test_sets=test_sets)
         self.OPENSTACK_TELEMETRY.check_ceilometer_sample_functionality()
         self.OPENSTACK_TELEMETRY.check_ceilometer_alarm_functionality()
         if additional_tests:
@@ -413,14 +411,12 @@ class TestOpenstackTelemetry(api.ToolchainApi):
         """
         settings = {'ceilometer': True}
 
-        failed_test_name = ("Ceilometer test to list meters, alarms, "
-                            "resources and events")
+        test_sets = ['smoke']
 
         self._deploy_telemetry_plugin("deploy_telemetry_ceilometer_core",
                                       roles=self.ceilometer_core_roles,
                                       settings=settings,
-                                      should_fail=1,
-                                      failed_test_name=failed_test_name)
+                                      test_sets=test_sets)
 
     @test(depends_on_groups=["prepare_slaves_5"],
           groups=["deploy_telemetry_ceilometer_core_resource_api", "deploy",
@@ -460,15 +456,14 @@ class TestOpenstackTelemetry(api.ToolchainApi):
 
         settings = {'ceilometer': True}
 
-        failed_test_name = ("Ceilometer test to list meters, alarms, "
-                            "resources and events")
+        test_sets = ['smoke']
 
         self._deploy_telemetry_plugin(
             "deploy_telemetry_ceilometer_core_resource_api",
             advanced_options=options,
             additional_tests=additional_tests,
             roles=self.ceilometer_core_roles, settings=settings,
-            should_fail=1, failed_test_name=failed_test_name)
+            test_sets=test_sets)
 
     @test(depends_on_groups=["prepare_slaves_5"],
           groups=["deploy_telemetry_ceilometer_core_event_api", "deploy",
@@ -508,15 +503,14 @@ class TestOpenstackTelemetry(api.ToolchainApi):
 
         settings = {'ceilometer': True}
 
-        failed_test_name = ("Ceilometer test to list meters, alarms, "
-                            "resources and events")
+        test_sets = ['smoke']
 
         self._deploy_telemetry_plugin(
             "deploy_telemetry_ceilometer_core_event_api",
             advanced_options=options,
             additional_tests=additional_tests,
             roles=self.ceilometer_core_roles, settings=settings,
-            should_fail=1, failed_test_name=failed_test_name)
+            test_sets=test_sets)
 
     @test(depends_on_groups=["prepare_slaves_5"],
           groups=["deploy_telemetry_ceilometer_core_resource_event_api",
@@ -591,15 +585,13 @@ class TestOpenstackTelemetry(api.ToolchainApi):
         """
         settings = {'ceilometer': True}
 
-        failed_test_name = ("Ceilometer test to list meters, alarms, "
-                            "resources and events")
+        test_sets = ['smoke']
 
         self._deploy_telemetry_plugin("deploy_telemetry_ceilometer_core_kafka",
                                       additional_plugins=self.KAFKA,
                                       roles=self.ceilometer_core_kafka_roles,
                                       settings=settings,
-                                      should_fail=1,
-                                      failed_test_name=failed_test_name)
+                                      test_sets=test_sets)
 
     @test(depends_on_groups=["prepare_slaves_5"],
           groups=["deploy_telemetry_ceilometer_core_kafka_resource_api",
@@ -639,8 +631,7 @@ class TestOpenstackTelemetry(api.ToolchainApi):
 
         settings = {'ceilometer': True}
 
-        failed_test_name = ("Ceilometer test to list meters, alarms, "
-                            "resources and events")
+        test_sets = ['smoke']
 
         self._deploy_telemetry_plugin(
             "deploy_telemetry_ceilometer_core_kafka_resource_api",
@@ -648,7 +639,7 @@ class TestOpenstackTelemetry(api.ToolchainApi):
             additional_tests=additional_tests,
             additional_plugins=self.KAFKA,
             roles=self.ceilometer_core_kafka_roles, settings=settings,
-            should_fail=1, failed_test_name=failed_test_name)
+            test_sets=test_sets)
 
     @test(depends_on_groups=["prepare_slaves_5"],
           groups=["deploy_telemetry_ceilometer_core_kafka_event_api", "deploy",
@@ -688,8 +679,7 @@ class TestOpenstackTelemetry(api.ToolchainApi):
 
         settings = {'ceilometer': True}
 
-        failed_test_name = ("Ceilometer test to list meters, alarms, "
-                            "resources and events")
+        test_sets = ['smoke']
 
         self._deploy_telemetry_plugin(
             "deploy_telemetry_ceilometer_core_kafka_event_api",
@@ -697,7 +687,7 @@ class TestOpenstackTelemetry(api.ToolchainApi):
             additional_tests=additional_tests,
             additional_plugins=self.KAFKA,
             roles=self.ceilometer_core_kafka_roles, settings=settings,
-            should_fail=1, failed_test_name=failed_test_name)
+            test_sets=test_sets)
 
     @test(depends_on_groups=["prepare_slaves_5"],
           groups=["deploy_telemetry_ceilometer_core_kafka_resource_event_api",