diff --git a/tests/scenario/congress_datasources/_test_keystonev2.py b/tests/scenario/congress_datasources/_test_keystonev2.py
index dbb6c0d..f080db4 100644
--- a/tests/scenario/congress_datasources/_test_keystonev2.py
+++ b/tests/scenario/congress_datasources/_test_keystonev2.py
@@ -16,8 +16,8 @@
 from tempest import clients
 from tempest import config
 from tempest.lib.common.utils import test_utils
+from tempest.lib import decorators
 from tempest.lib import exceptions
-from tempest import test
 
 from congress_tempest_tests.tests.scenario import manager_congress
 
@@ -46,7 +46,7 @@ class TestKeystoneV2Driver(manager_congress.ScenarioPolicyBase):
         cls.datasource_id = manager_congress.get_datasource_id(
             cls.admin_manager.congress_client, 'keystone')
 
-    @test.attr(type='smoke')
+    @decorators.attr(type='smoke')
     def test_keystone_users_table(self):
         user_schema = (
             self.admin_manager.congress_client.show_datasource_table_schema(
@@ -89,7 +89,7 @@ class TestKeystoneV2Driver(manager_congress.ScenarioPolicyBase):
             raise exceptions.TimeoutException("Data did not converge in time "
                                               "or failure in server")
 
-    @test.attr(type='smoke')
+    @decorators.attr(type='smoke')
     def test_keystone_roles_table(self):
         role_schema = (
             self.admin_manager.congress_client.show_datasource_table_schema(
@@ -125,7 +125,7 @@ class TestKeystoneV2Driver(manager_congress.ScenarioPolicyBase):
             raise exceptions.TimeoutException("Data did not converge in time "
                                               "or failure in server")
 
-    @test.attr(type='smoke')
+    @decorators.attr(type='smoke')
     def test_keystone_tenants_table(self):
         tenant_schema = (
             self.admin_manager.congress_client.show_datasource_table_schema(
@@ -161,7 +161,7 @@ class TestKeystoneV2Driver(manager_congress.ScenarioPolicyBase):
             raise exceptions.TimeoutException("Data did not converge in time "
                                               "or failure in server")
 
-    @test.attr(type='smoke')
+    @decorators.attr(type='smoke')
     def test_update_no_error(self):
         if not test_utils.call_until_true(
                 func=lambda: self.check_datasource_no_error('keystone'),
diff --git a/tests/scenario/congress_datasources/test_aodh.py b/tests/scenario/congress_datasources/test_aodh.py
index 2cec9c2..2bd28bd 100644
--- a/tests/scenario/congress_datasources/test_aodh.py
+++ b/tests/scenario/congress_datasources/test_aodh.py
@@ -15,8 +15,8 @@
 
 from tempest import config
 from tempest.lib.common.utils import test_utils
+from tempest.lib import decorators
 from tempest.lib import exceptions
-from tempest import test
 
 from congress_tempest_tests.tests.scenario import manager_congress
 
@@ -40,7 +40,7 @@ class TestAodhDriver(manager_congress.ScenarioPolicyBase):
         cls.datasource_id = manager_congress.get_datasource_id(
             cls.admin_manager.congress_client, 'aodh')
 
-    @test.attr(type='smoke')
+    @decorators.attr(type='smoke')
     def test_aodh_alarms_table(self):
         # Add test alarm
         rule = {'meter_name': 'cpu_util',
@@ -97,7 +97,7 @@ class TestAodhDriver(manager_congress.ScenarioPolicyBase):
             raise exceptions.TimeoutException("Data did not converge in time "
                                               "or failure in server")
 
-    @test.attr(type='smoke')
+    @decorators.attr(type='smoke')
     def test_update_no_error(self):
         if not test_utils.call_until_true(
                 func=lambda: self.check_datasource_no_error('aodh'),
diff --git a/tests/scenario/congress_datasources/test_ceilometer.py b/tests/scenario/congress_datasources/test_ceilometer.py
index 5dcf79b..1c832c9 100644
--- a/tests/scenario/congress_datasources/test_ceilometer.py
+++ b/tests/scenario/congress_datasources/test_ceilometer.py
@@ -15,8 +15,8 @@
 
 from tempest import config
 from tempest.lib.common.utils import test_utils
+from tempest.lib import decorators
 from tempest.lib import exceptions
-from tempest import test
 
 from congress_tempest_tests.tests.scenario import manager_congress
 
@@ -40,7 +40,7 @@ class TestCeilometerDriver(manager_congress.ScenarioPolicyBase):
         cls.datasource_id = manager_congress.get_datasource_id(
             cls.admin_manager.congress_client, 'ceilometer')
 
-    @test.attr(type='smoke')
+    @decorators.attr(type='smoke')
     def test_ceilometer_meters_table(self):
         meter_schema = (
             self.admin_manager.congress_client.show_datasource_table_schema(
@@ -76,7 +76,7 @@ class TestCeilometerDriver(manager_congress.ScenarioPolicyBase):
             raise exceptions.TimeoutException("Data did not converge in time "
                                               "or failure in server")
 
-    @test.attr(type='smoke')
+    @decorators.attr(type='smoke')
     def test_update_no_error(self):
         if not test_utils.call_until_true(
                 func=lambda: self.check_datasource_no_error('ceilometer'),
diff --git a/tests/scenario/congress_datasources/test_cinder.py b/tests/scenario/congress_datasources/test_cinder.py
index 0b6c0ba..4ff7e13 100644
--- a/tests/scenario/congress_datasources/test_cinder.py
+++ b/tests/scenario/congress_datasources/test_cinder.py
@@ -17,8 +17,8 @@ from oslo_log import log as logging
 from tempest import clients
 from tempest import config
 from tempest.lib.common.utils import test_utils
+from tempest.lib import decorators
 from tempest.lib import exceptions
-from tempest import test
 
 from congress_tempest_tests.tests.scenario import manager_congress
 
@@ -53,7 +53,7 @@ class TestCinderDriver(manager_congress.ScenarioPolicyBase):
                                        consistencygroup_id=None, metadata={})
         LOG.debug('result of creating new volume: %s', res)
 
-    @test.attr(type='smoke')
+    @decorators.attr(type='smoke')
     def test_cinder_volumes_table(self):
         volume_schema = (
             self.admin_manager.congress_client.show_datasource_table_schema(
@@ -106,7 +106,7 @@ class TestCinderDriver(manager_congress.ScenarioPolicyBase):
             raise exceptions.TimeoutException("Data did not converge in time "
                                               "or failure in server")
 
-    @test.attr(type='smoke')
+    @decorators.attr(type='smoke')
     def test_update_no_error(self):
         if not test_utils.call_until_true(
                 func=lambda: self.check_datasource_no_error('cinder'),
diff --git a/tests/scenario/congress_datasources/test_doctor.py b/tests/scenario/congress_datasources/test_doctor.py
index e8f2ce4..951267d 100644
--- a/tests/scenario/congress_datasources/test_doctor.py
+++ b/tests/scenario/congress_datasources/test_doctor.py
@@ -13,8 +13,8 @@
 #    under the License.
 
 from tempest.lib.common.utils import test_utils
+from tempest.lib import decorators
 from tempest.lib import exceptions
-from tempest import test
 
 from congress_tempest_tests.tests.scenario import helper
 from congress_tempest_tests.tests.scenario import manager_congress
@@ -40,7 +40,7 @@ class TestDoctorDriver(manager_congress.ScenarioPolicyBase):
     def _list_datasource_rows(self, datasource, table):
         return self.client.list_datasource_rows(datasource, table)
 
-    @test.attr(type='smoke')
+    @decorators.attr(type='smoke')
     def test_doctor_event_tables(self):
         rows = [
             {
diff --git a/tests/scenario/congress_datasources/test_glancev2.py b/tests/scenario/congress_datasources/test_glancev2.py
index 3ff8685..47d76c8 100644
--- a/tests/scenario/congress_datasources/test_glancev2.py
+++ b/tests/scenario/congress_datasources/test_glancev2.py
@@ -16,6 +16,7 @@
 from tempest import clients
 from tempest import config
 from tempest.lib.common.utils import test_utils
+from tempest.lib import decorators
 from tempest.lib import exceptions
 from tempest import test
 
@@ -47,7 +48,7 @@ class TestGlanceV2Driver(manager_congress.ScenarioPolicyBase):
         cls.datasource_id = manager_congress.get_datasource_id(
             cls.admin_manager.congress_client, 'glancev2')
 
-    @test.attr(type='smoke')
+    @decorators.attr(type='smoke')
     @test.services('image')
     def test_glancev2_images_table(self):
         image_schema = (
@@ -94,7 +95,7 @@ class TestGlanceV2Driver(manager_congress.ScenarioPolicyBase):
             raise exceptions.TimeoutException("Data did not converge in time "
                                               "or failure in server")
 
-    @test.attr(type='smoke')
+    @decorators.attr(type='smoke')
     @test.services('image')
     def test_glancev2_tags_table(self):
         def _check_data_table_glance_images():
@@ -125,7 +126,7 @@ class TestGlanceV2Driver(manager_congress.ScenarioPolicyBase):
             raise exceptions.TimeoutException("Data did not converge in time "
                                               "or failure in server")
 
-    @test.attr(type='smoke')
+    @decorators.attr(type='smoke')
     def test_update_no_error(self):
         if not test_utils.call_until_true(
                 func=lambda: self.check_datasource_no_error('glancev2'),
diff --git a/tests/scenario/congress_datasources/test_heat.py b/tests/scenario/congress_datasources/test_heat.py
index a421a0b..e335ae5 100644
--- a/tests/scenario/congress_datasources/test_heat.py
+++ b/tests/scenario/congress_datasources/test_heat.py
@@ -15,8 +15,8 @@
 
 from tempest import config
 from tempest.lib.common.utils import test_utils
+from tempest.lib import decorators
 from tempest.lib import exceptions
-from tempest import test
 
 from congress_tempest_tests.tests.scenario import manager_congress
 
@@ -36,7 +36,7 @@ class TestHeatDriver(manager_congress.ScenarioPolicyBase):
 
     # TODO(testing): checks on correctness of data in updates
 
-    @test.attr(type='smoke')
+    @decorators.attr(type='smoke')
     def test_update_no_error(self):
         if not test_utils.call_until_true(
                 func=lambda: self.check_datasource_no_error('heat'),
diff --git a/tests/scenario/congress_datasources/test_ironic.py b/tests/scenario/congress_datasources/test_ironic.py
index 0e49283..0c0a9fd 100644
--- a/tests/scenario/congress_datasources/test_ironic.py
+++ b/tests/scenario/congress_datasources/test_ironic.py
@@ -15,8 +15,8 @@
 
 from tempest import config
 from tempest.lib.common.utils import test_utils
+from tempest.lib import decorators
 from tempest.lib import exceptions
-from tempest import test
 
 from congress_tempest_tests.tests.scenario import manager_congress
 
@@ -36,7 +36,7 @@ class TestIronicDriver(manager_congress.ScenarioPolicyBase):
 
     # TODO(testing): checks on correctness of data in updates
 
-    @test.attr(type='smoke')
+    @decorators.attr(type='smoke')
     def test_update_no_error(self):
         if not test_utils.call_until_true(
                 func=lambda: self.check_datasource_no_error('ironic'),
diff --git a/tests/scenario/congress_datasources/test_murano.py b/tests/scenario/congress_datasources/test_murano.py
index 5873384..97ba480 100644
--- a/tests/scenario/congress_datasources/test_murano.py
+++ b/tests/scenario/congress_datasources/test_murano.py
@@ -16,6 +16,7 @@ import string
 
 from tempest import config
 from tempest.lib.common.utils import test_utils
+from tempest.lib import decorators
 from tempest.lib import exceptions
 from tempest import test
 
@@ -47,7 +48,7 @@ class TestMuranoDriver(manager_congress.ScenarioPolicyBase):
         self.congress_client = (
             self.admin_manager.congress_client)
 
-    @test.attr(type='smoke')
+    @decorators.attr(type='smoke')
     @test.services('compute')
     def test_murano_predeployment(self):
 
@@ -198,7 +199,7 @@ class TestMuranoDriver(manager_congress.ScenarioPolicyBase):
         result = _simulate_policy(policy_name, sim_query2)
         self.assertEqual('predeploy_error("env_uuid")', result[0])
 
-    @test.attr(type='smoke')
+    @decorators.attr(type='smoke')
     def test_update_no_error(self):
         if not test_utils.call_until_true(
                 func=lambda: self.check_datasource_no_error('murano'),
diff --git a/tests/scenario/congress_datasources/test_neutronv2.py b/tests/scenario/congress_datasources/test_neutronv2.py
index 354ea3f..8e35f47 100644
--- a/tests/scenario/congress_datasources/test_neutronv2.py
+++ b/tests/scenario/congress_datasources/test_neutronv2.py
@@ -17,6 +17,7 @@ import time
 from tempest import clients
 from tempest import config
 from tempest.lib.common.utils import test_utils
+from tempest.lib import decorators
 from tempest.lib import exceptions
 from tempest import test
 
@@ -54,7 +55,7 @@ class TestNeutronV2Driver(manager_congress.ScenarioPolicyBase):
         cls.datasource_id = manager_congress.get_datasource_id(
             cls.admin_manager.congress_client, 'neutronv2')
 
-    @test.attr(type='smoke')
+    @decorators.attr(type='smoke')
     @test.services('network')
     def test_neutronv2_networks_table(self):
 
@@ -87,7 +88,7 @@ class TestNeutronV2Driver(manager_congress.ScenarioPolicyBase):
             raise exceptions.TimeoutException("Data did not converge in time "
                                               "or failure in server")
 
-    @test.attr(type='smoke')
+    @decorators.attr(type='smoke')
     @test.services('network')
     def test_neutronv2_ports_tables(self):
         port_schema = (
@@ -164,7 +165,7 @@ class TestNeutronV2Driver(manager_congress.ScenarioPolicyBase):
             raise exceptions.TimeoutException("Data did not converge in time "
                                               "or failure in server")
 
-    @test.attr(type='smoke')
+    @decorators.attr(type='smoke')
     @test.services('network')
     def test_neutronv2_subnets_tables(self):
         subnet_schema = (
@@ -259,7 +260,7 @@ class TestNeutronV2Driver(manager_congress.ScenarioPolicyBase):
             raise exceptions.TimeoutException("Data did not converge in time "
                                               "or failure in server")
 
-    @test.attr(type='smoke')
+    @decorators.attr(type='smoke')
     @test.services('network')
     def test_neutronv2_routers_tables(self):
         router_schema = (
@@ -313,7 +314,7 @@ class TestNeutronV2Driver(manager_congress.ScenarioPolicyBase):
             raise exceptions.TimeoutException("Data did not converge in time "
                                               "or failure in server")
 
-    @test.attr(type='smoke')
+    @decorators.attr(type='smoke')
     @test.services('network')
     def test_neutronv2_security_groups_table(self):
         sg_schema = (
@@ -350,7 +351,7 @@ class TestNeutronV2Driver(manager_congress.ScenarioPolicyBase):
             raise exceptions.TimeoutException("Data did not converge in time "
                                               "or failure in server")
 
-    @test.attr(type='smoke')
+    @decorators.attr(type='smoke')
     @test.services('network')
     def test_neutronv2_security_group_rules_table(self):
         sgrs_schema = (
@@ -388,7 +389,7 @@ class TestNeutronV2Driver(manager_congress.ScenarioPolicyBase):
             raise exceptions.TimeoutException("Data did not converge in time "
                                               "or failure in server")
 
-    @test.attr(type='smoke')
+    @decorators.attr(type='smoke')
     def test_update_no_error(self):
         if not test_utils.call_until_true(
                 func=lambda: self.check_datasource_no_error('neutronv2'),
diff --git a/tests/scenario/congress_datasources/test_nova.py b/tests/scenario/congress_datasources/test_nova.py
index 16ad716..764502b 100644
--- a/tests/scenario/congress_datasources/test_nova.py
+++ b/tests/scenario/congress_datasources/test_nova.py
@@ -15,6 +15,7 @@
 
 from tempest import config
 from tempest.lib.common.utils import test_utils
+from tempest.lib import decorators
 from tempest.lib import exceptions
 from tempest import test
 
@@ -47,7 +48,7 @@ class TestNovaDriver(manager_congress.ScenarioPolicyBase):
         self.datasource_id = manager_congress.get_datasource_id(
             self.admin_manager.congress_client, 'nova')
 
-    @test.attr(type='smoke')
+    @decorators.attr(type='smoke')
     @test.services('compute', 'network')
     def test_nova_datasource_driver_servers(self):
         self._setup_network_and_servers()
@@ -103,7 +104,7 @@ class TestNovaDriver(manager_congress.ScenarioPolicyBase):
             raise exceptions.TimeoutException("Data did not converge in time "
                                               "or failure in server")
 
-    @test.attr(type='smoke')
+    @decorators.attr(type='smoke')
     @test.services('compute', 'network')
     def test_nova_datasource_driver_flavors(self):
 
@@ -142,7 +143,7 @@ class TestNovaDriver(manager_congress.ScenarioPolicyBase):
             raise exceptions.TimeoutException("Data did not converge in time "
                                               "or failure in server")
 
-    @test.attr(type='smoke')
+    @decorators.attr(type='smoke')
     def test_update_no_error(self):
         if not test_utils.call_until_true(
                 func=lambda: self.check_datasource_no_error('nova'),
diff --git a/tests/scenario/congress_datasources/test_swift.py b/tests/scenario/congress_datasources/test_swift.py
index d2fceea..d2aaa1a 100644
--- a/tests/scenario/congress_datasources/test_swift.py
+++ b/tests/scenario/congress_datasources/test_swift.py
@@ -17,7 +17,6 @@ from tempest import config
 from tempest.lib.common.utils import test_utils
 from tempest.lib import decorators
 from tempest.lib import exceptions
-from tempest import test
 
 from congress_tempest_tests.tests.scenario import manager_congress
 
@@ -39,7 +38,7 @@ class TestSwiftDriver(manager_congress.ScenarioPolicyBase):
 
     # swift driver experiences auth error in test
     @decorators.skip_because(bug="980688")
-    @test.attr(type='smoke')
+    @decorators.attr(type='smoke')
     def test_update_no_error(self):
         if not test_utils.call_until_true(
                 func=lambda: self.check_datasource_no_error('swift'),
diff --git a/tests/scenario/congress_ha/test_ha.py b/tests/scenario/congress_ha/test_ha.py
index e4b607a..1469c42 100644
--- a/tests/scenario/congress_ha/test_ha.py
+++ b/tests/scenario/congress_ha/test_ha.py
@@ -25,7 +25,6 @@ from tempest.lib.common.utils import test_utils
 from tempest.lib import decorators
 from tempest.lib import exceptions
 from tempest import manager as tempestmanager
-from tempest import test
 from urllib3 import exceptions as urllib3_exceptions
 
 from congress_tempest_tests.services.policy import policy_client
@@ -205,7 +204,7 @@ class TestHA(manager_congress.ScenarioPolicyBase):
         return ret['id']
 
     @decorators.skip_because(bug="1689220")
-    @test.attr(type='smoke')
+    @decorators.attr(type='smoke')
     def test_datasource_db_sync_add_remove(self):
         # Verify that a replica adds a datasource when a datasource
         # appears in the database.
diff --git a/tests/scenario/test_congress_basic_ops.py b/tests/scenario/test_congress_basic_ops.py
index 135b661..55e10e0 100644
--- a/tests/scenario/test_congress_basic_ops.py
+++ b/tests/scenario/test_congress_basic_ops.py
@@ -16,6 +16,7 @@
 
 from tempest import config
 from tempest.lib.common.utils import test_utils
+from tempest.lib import decorators
 from tempest.lib import exceptions
 from tempest import test
 
@@ -88,7 +89,7 @@ class TestPolicyBasicOps(manager_congress.ScenarioPolicyBase):
                                       **create_kwargs)
         return instance
 
-    @test.attr(type='smoke')
+    @decorators.attr(type='smoke')
     @test.services('compute', 'network')
     def test_execution_action(self):
         metadata = {'testkey1': 'value3'}
@@ -117,7 +118,7 @@ class TestPolicyBasicOps(manager_congress.ScenarioPolicyBase):
                                               False, body)
         helper.retry_check_function_return_value(f, res)
 
-    @test.attr(type='smoke')
+    @decorators.attr(type='smoke')
     @test.services('compute', 'network')
     def test_policy_basic_op(self):
         self._setup_network_and_servers()
@@ -159,7 +160,7 @@ class TestPolicyBasicOps(manager_congress.ScenarioPolicyBase):
         self.assertTrue(check_data(),
                         "Data did not converge in time or failure in server")
 
-    @test.attr(type='smoke')
+    @decorators.attr(type='smoke')
     @test.services('compute', 'network')
     def test_reactive_enforcement(self):
         servers_client = self.admin_manager.servers_client