diff --git a/tempest/api/compute/flavors/test_flavors.py b/tempest/api/compute/flavors/test_flavors.py
index 2fd03ff..d51d9d8 100644
--- a/tempest/api/compute/flavors/test_flavors.py
+++ b/tempest/api/compute/flavors/test_flavors.py
@@ -56,14 +56,14 @@
         self.assertRaises(exceptions.NotFound, self.client.get_flavor_details,
                           999)
 
-    @attr(type='positive', bug='lp912922')
+    @attr(type='positive')
     def test_list_flavors_limit_results(self):
         # Only the expected number of flavors should be returned
         params = {'limit': 1}
         resp, flavors = self.client.list_flavors(params)
         self.assertEqual(1, len(flavors))
 
-    @attr(type='positive', bug='lp912922')
+    @attr(type='positive')
     def test_list_flavors_detailed_limit_results(self):
         # Only the expected number of flavors (detailed) should be returned
         params = {'limit': 1}
diff --git a/tempest/api/compute/servers/test_list_server_filters.py b/tempest/api/compute/servers/test_list_server_filters.py
index 7c4f5f5..637a86f 100644
--- a/tempest/api/compute/servers/test_list_server_filters.py
+++ b/tempest/api/compute/servers/test_list_server_filters.py
@@ -205,7 +205,7 @@
         self.assertNotIn(self.s3_name, map(lambda x: x['name'], servers))
 
     @testtools.skip('Until Bug #1170718 is resolved.')
-    @attr(type='positive', bug='lp1170718')
+    @attr(type='positive')
     def test_list_servers_filtered_by_ip(self):
         # Filter servers by ip
         # Here should be listed 1 server
diff --git a/tempest/api/compute/servers/test_server_addresses.py b/tempest/api/compute/servers/test_server_addresses.py
index 01e4341..7cb78e9 100644
--- a/tempest/api/compute/servers/test_server_addresses.py
+++ b/tempest/api/compute/servers/test_server_addresses.py
@@ -30,20 +30,20 @@
 
         resp, cls.server = cls.create_server(wait_until='ACTIVE')
 
-    @attr(type='negative', category='server-addresses')
+    @attr(type='negative')
     def test_list_server_addresses_invalid_server_id(self):
         # List addresses request should fail if server id not in system
         self.assertRaises(exceptions.NotFound, self.client.list_addresses,
                           '999')
 
-    @attr(type='negative', category='server-addresses')
+    @attr(type='negative')
     def test_list_server_addresses_by_network_neg(self):
         # List addresses by network should fail if network name not valid
         self.assertRaises(exceptions.NotFound,
                           self.client.list_addresses_by_network,
                           self.server['id'], 'invalid')
 
-    @attr(type='smoke', category='server-addresses')
+    @attr(type='smoke')
     def test_list_server_addresses(self):
         # All public and private addresses for
         # a server should be returned
@@ -60,7 +60,7 @@
                 self.assertTrue(address['addr'])
                 self.assertTrue(address['version'])
 
-    @attr(type='smoke', category='server-addresses')
+    @attr(type='smoke')
     def test_list_server_addresses_by_network(self):
         # Providing a network type should filter
         # the addresses return by that type
diff --git a/tempest/api/compute/test_live_block_migration.py b/tempest/api/compute/test_live_block_migration.py
index 622800a..15ca129 100644
--- a/tempest/api/compute/test_live_block_migration.py
+++ b/tempest/api/compute/test_live_block_migration.py
@@ -26,7 +26,6 @@
 from tempest.test import attr
 
 
-@attr(category='live-migration')
 class LiveBlockMigrationTestJSON(base.BaseComputeAdminTest):
     _host_key = 'OS-EXT-SRV-ATTR:host'
     _interface = 'json'
diff --git a/tempest/api/object_storage/test_object_expiry.py b/tempest/api/object_storage/test_object_expiry.py
index ab192e8..1fe47ea 100644
--- a/tempest/api/object_storage/test_object_expiry.py
+++ b/tempest/api/object_storage/test_object_expiry.py
@@ -23,7 +23,6 @@
 from tempest.common.utils.data_utils import arbitrary_string
 from tempest.common.utils.data_utils import rand_name
 from tempest import exceptions
-from tempest.test import attr
 
 
 class ObjectExpiryTest(base.BaseObjectTest):
@@ -51,7 +50,6 @@
         resp, _ = cls.container_client.delete_container(cls.container_name)
 
     @testtools.skip('Until Bug #1069849 is resolved.')
-    @attr(type='regression')
     def test_get_object_after_expiry_time(self):
         #TODO(harika-vakadi): similar test case has to be created for
         # "X-Delete-At", after this test case works.
diff --git a/tempest/thirdparty/boto/test_ec2_instance_run.py b/tempest/thirdparty/boto/test_ec2_instance_run.py
index bbe11d1..e8abe97 100644
--- a/tempest/thirdparty/boto/test_ec2_instance_run.py
+++ b/tempest/thirdparty/boto/test_ec2_instance_run.py
@@ -33,7 +33,6 @@
 LOG = logging.getLogger(__name__)
 
 
-@attr("S3", "EC2")
 class InstanceRunTest(BotoTestCase):
 
     @classmethod
@@ -141,7 +140,7 @@
 
     #NOTE(afazekas): doctored test case,
     # with normal validation it would fail
-    @attr("slow", type='smoke')
+    @attr(type='smoke')
     def test_integration_1(self):
         # EC2 1. integration test (not strict)
         image_ami = self.ec2_client.get_image(self.images["ami"]["image_id"])
diff --git a/tempest/thirdparty/boto/test_ec2_keys.py b/tempest/thirdparty/boto/test_ec2_keys.py
index 5304649..1072356 100644
--- a/tempest/thirdparty/boto/test_ec2_keys.py
+++ b/tempest/thirdparty/boto/test_ec2_keys.py
@@ -28,7 +28,6 @@
             a.fingerprint == b.fingerprint)
 
 
-@attr("EC2")
 class EC2KeysTest(BotoTestCase):
 
     @classmethod
diff --git a/tempest/thirdparty/boto/test_ec2_network.py b/tempest/thirdparty/boto/test_ec2_network.py
index 6878df1..f4602d8 100644
--- a/tempest/thirdparty/boto/test_ec2_network.py
+++ b/tempest/thirdparty/boto/test_ec2_network.py
@@ -22,7 +22,6 @@
 from tempest.thirdparty.boto.test import BotoTestCase
 
 
-@attr("EC2")
 class EC2NetworkTest(BotoTestCase):
 
     @classmethod
diff --git a/tempest/thirdparty/boto/test_ec2_security_groups.py b/tempest/thirdparty/boto/test_ec2_security_groups.py
index 54a94f8..3db9a88 100644
--- a/tempest/thirdparty/boto/test_ec2_security_groups.py
+++ b/tempest/thirdparty/boto/test_ec2_security_groups.py
@@ -21,7 +21,6 @@
 from tempest.thirdparty.boto.test import BotoTestCase
 
 
-@attr("EC2")
 class EC2SecurityGroupTest(BotoTestCase):
 
     @classmethod
diff --git a/tempest/thirdparty/boto/test_ec2_volumes.py b/tempest/thirdparty/boto/test_ec2_volumes.py
index b4d763d..edf0180 100644
--- a/tempest/thirdparty/boto/test_ec2_volumes.py
+++ b/tempest/thirdparty/boto/test_ec2_volumes.py
@@ -29,7 +29,6 @@
             a.size == b.size)
 
 
-@attr("EC2")
 class EC2VolumesTest(BotoTestCase):
 
     @classmethod
diff --git a/tempest/thirdparty/boto/test_s3_buckets.py b/tempest/thirdparty/boto/test_s3_buckets.py
index 3b7c5a7..b28f751 100644
--- a/tempest/thirdparty/boto/test_s3_buckets.py
+++ b/tempest/thirdparty/boto/test_s3_buckets.py
@@ -23,7 +23,6 @@
 from tempest.thirdparty.boto.test import BotoTestCase
 
 
-@attr("S3")
 class S3BucketsTest(BotoTestCase):
 
     @classmethod
diff --git a/tempest/thirdparty/boto/test_s3_ec2_images.py b/tempest/thirdparty/boto/test_s3_ec2_images.py
index 594f416..2c0d8ae 100644
--- a/tempest/thirdparty/boto/test_s3_ec2_images.py
+++ b/tempest/thirdparty/boto/test_s3_ec2_images.py
@@ -27,7 +27,6 @@
 from tempest.thirdparty.boto.utils.wait import state_wait
 
 
-@attr("S3", "EC2")
 class S3ImagesTest(BotoTestCase):
 
     @classmethod
diff --git a/tempest/thirdparty/boto/test_s3_objects.py b/tempest/thirdparty/boto/test_s3_objects.py
index b256bc4..daacb12 100644
--- a/tempest/thirdparty/boto/test_s3_objects.py
+++ b/tempest/thirdparty/boto/test_s3_objects.py
@@ -25,7 +25,6 @@
 from tempest.thirdparty.boto.test import BotoTestCase
 
 
-@attr("S3")
 class S3BucketsTest(BotoTestCase):
 
     @classmethod