diff --git a/tempest/tests/boto/test_ec2_instance_run.py b/tempest/tests/boto/test_ec2_instance_run.py
index 840d6dd..95ef23c 100644
--- a/tempest/tests/boto/test_ec2_instance_run.py
+++ b/tempest/tests/boto/test_ec2_instance_run.py
@@ -93,7 +93,7 @@
 
     @attr(type='smoke')
     def test_run_stop_terminate_instance(self):
-        """EC2 run, stop and terminate instance"""
+        # EC2 run, stop and terminate instance
         image_ami = self.ec2_client.get_image(self.images["ami"]
                                               ["image_id"])
         reservation = image_ami.run(kernel_id=self.images["aki"]["image_id"],
@@ -122,7 +122,7 @@
 
     @attr(type='smoke')
     def test_run_terminate_instance(self):
-        """EC2 run, terminate immediately"""
+        # EC2 run, terminate immediately
         image_ami = self.ec2_client.get_image(self.images["ami"]
                                               ["image_id"])
         reservation = image_ami.run(kernel_id=self.images["aki"]["image_id"],
@@ -139,7 +139,7 @@
     # with normal validation it would fail
     @attr("slow", type='smoke')
     def test_integration_1(self):
-        """EC2 1. integration test (not strict)"""
+        # EC2 1. integration test (not strict)
         image_ami = self.ec2_client.get_image(self.images["ami"]["image_id"])
         sec_group_name = rand_name("securitygroup-")
         group_desc = sec_group_name + " security group description "
diff --git a/tempest/tests/boto/test_ec2_keys.py b/tempest/tests/boto/test_ec2_keys.py
index 162e2fb..fcec02d 100644
--- a/tempest/tests/boto/test_ec2_keys.py
+++ b/tempest/tests/boto/test_ec2_keys.py
@@ -39,7 +39,7 @@
 
     @attr(type='smoke')
     def test_create_ec2_keypair(self):
-        """EC2 create KeyPair"""
+        # EC2 create KeyPair
         key_name = rand_name("keypair-")
         self.addResourceCleanUp(self.client.delete_key_pair, key_name)
         keypair = self.client.create_key_pair(key_name)
@@ -49,7 +49,7 @@
     @attr(type='smoke')
     @unittest.skip("Skipped until the Bug #1072318 is resolved")
     def test_delete_ec2_keypair(self):
-        """EC2 delete KeyPair"""
+        # EC2 delete KeyPair
         key_name = rand_name("keypair-")
         self.client.create_key_pair(key_name)
         self.client.delete_key_pair(key_name)
@@ -57,7 +57,7 @@
 
     @attr(type='smoke')
     def test_get_ec2_keypair(self):
-        """EC2 get KeyPair"""
+        # EC2 get KeyPair
         key_name = rand_name("keypair-")
         self.addResourceCleanUp(self.client.delete_key_pair, key_name)
         keypair = self.client.create_key_pair(key_name)
@@ -67,7 +67,7 @@
     @attr(type='smoke')
     @unittest.skip("Skipped until the Bug #1072762 is resolved")
     def test_duplicate_ec2_keypair(self):
-        """EC2 duplicate KeyPair"""
+        # EC2 duplicate KeyPair
         key_name = rand_name("keypair-")
         self.addResourceCleanUp(self.client.delete_key_pair, key_name)
         keypair = self.client.create_key_pair(key_name)
diff --git a/tempest/tests/boto/test_ec2_network.py b/tempest/tests/boto/test_ec2_network.py
index c544b06..27649e6 100644
--- a/tempest/tests/boto/test_ec2_network.py
+++ b/tempest/tests/boto/test_ec2_network.py
@@ -35,7 +35,7 @@
     @unittest.skip("Skipped until the Bug #1080406 is resolved")
     @attr(type='smoke')
     def test_disassociate_not_associated_floating_ip(self):
-        """EC2 disassociate not associated floating ip"""
+        # EC2 disassociate not associated floating ip
         ec2_codes = self.ec2_error_code
         address = self.client.allocate_address()
         public_ip = address.public_ip
diff --git a/tempest/tests/boto/test_ec2_security_groups.py b/tempest/tests/boto/test_ec2_security_groups.py
index c10f1df..09da82c 100644
--- a/tempest/tests/boto/test_ec2_security_groups.py
+++ b/tempest/tests/boto/test_ec2_security_groups.py
@@ -34,7 +34,7 @@
 
     @attr(type='smoke')
     def test_create_authorize_security_group(self):
-        """EC2 Create, authorize/revoke security group"""
+        # EC2 Create, authorize/revoke security group
         group_name = rand_name("securty_group-")
         group_description = group_name + " security group description "
         group = self.client.create_security_group(group_name,
diff --git a/tempest/tests/boto/test_ec2_volumes.py b/tempest/tests/boto/test_ec2_volumes.py
index 8d6cf6f..7898926 100644
--- a/tempest/tests/boto/test_ec2_volumes.py
+++ b/tempest/tests/boto/test_ec2_volumes.py
@@ -45,7 +45,7 @@
 #NOTE(afazekas): as admin it can trigger the Bug #1074901
     @attr(type='smoke')
     def test_create_get_delete(self):
-        """EC2 Create, get, delete Volume"""
+        # EC2 Create, get, delete Volume
         volume = self.client.create_volume(1, self.zone)
         cuk = self.addResourceCleanUp(self.client.delete_volume, volume.id)
         self.assertIn(volume.status, self.valid_volume_status)
@@ -63,7 +63,7 @@
 
     @attr(type='smoke')
     def test_create_volme_from_snapshot(self):
-        """EC2 Create volume from snapshot"""
+        # EC2 Create volume from snapshot
         volume = self.client.create_volume(1, self.zone)
         self.addResourceCleanUp(self.client.delete_volume, volume.id)
 
diff --git a/tempest/tests/boto/test_s3_buckets.py b/tempest/tests/boto/test_s3_buckets.py
index 5587673..beed28b 100644
--- a/tempest/tests/boto/test_s3_buckets.py
+++ b/tempest/tests/boto/test_s3_buckets.py
@@ -36,7 +36,7 @@
     @unittest.skip("Skipped until the Bug #1076965 is resolved")
     @attr(type='smoke')
     def test_create_and_get_delete_bucket(self):
-        """S3 Create, get and delete bucket"""
+        # S3 Create, get and delete bucket
         bucket_name = rand_name("s3bucket-")
         cleanup_key = self.addResourceCleanUp(self.client.delete_bucket,
                                               bucket_name)
diff --git a/tempest/tests/boto/test_s3_ec2_images.py b/tempest/tests/boto/test_s3_ec2_images.py
index 7020f51..f14115a 100644
--- a/tempest/tests/boto/test_s3_ec2_images.py
+++ b/tempest/tests/boto/test_s3_ec2_images.py
@@ -62,7 +62,7 @@
     # otherwise I would skip it too
     @attr(type='smoke')
     def test_register_get_deregister_ami_image(self):
-        """Register and deregister ami image"""
+        # Register and deregister ami image
         image = {"name": rand_name("ami-name-"),
                  "location": self.bucket_name + "/" + self.ami_manifest,
                  "type": "ami"}
@@ -90,7 +90,7 @@
 
     @unittest.skip("Skipped until the Bug #1074904 is resolved")
     def test_register_get_deregister_aki_image(self):
-        """Register and deregister aki image"""
+        # Register and deregister aki image
         image = {"name": rand_name("aki-name-"),
                  "location": self.bucket_name + "/" + self.ari_manifest,
                  "type": "aki"}
@@ -118,7 +118,7 @@
 
     @unittest.skip("Skipped until the Bug #1074908 and #1074904 is resolved")
     def test_register_get_deregister_ari_image(self):
-        """Register and deregister ari image"""
+        # Register and deregister ari image
         image = {"name": rand_name("ari-name-"),
                  "location": "/" + self.bucket_name + "/" + self.ari_manifest,
                  "type": "ari"}
diff --git a/tempest/tests/boto/test_s3_objects.py b/tempest/tests/boto/test_s3_objects.py
index 94b04dc..6e89539 100644
--- a/tempest/tests/boto/test_s3_objects.py
+++ b/tempest/tests/boto/test_s3_objects.py
@@ -40,7 +40,7 @@
     @unittest.skip("Skipped until the Bug #1076534 is resolved")
     @attr(type='smoke')
     def test_create_get_delete_object(self):
-        """S3 Create, get and delete object"""
+        # S3 Create, get and delete object
         bucket_name = rand_name("s3bucket-")
         object_name = rand_name("s3object-")
         content = 'x' * 42