diff --git a/tempest/tests/identity/admin/test_roles.py b/tempest/tests/identity/admin/test_roles.py
index 0e1da7d..f0dd8d9 100644
--- a/tempest/tests/identity/admin/test_roles.py
+++ b/tempest/tests/identity/admin/test_roles.py
@@ -40,26 +40,26 @@
         return (user, tenant, role)
 
     def test_list_roles(self):
-        """Return a list of all roles"""
+        # Return a list of all roles
         resp, body = self.client.list_roles()
         found = [role for role in body if role in self.data.roles]
         self.assertTrue(any(found))
         self.assertEqual(len(found), len(self.data.roles))
 
     def test_list_roles_by_unauthorized_user(self):
-        """Non admin user should not be able to list roles"""
+        # Non admin user should not be able to list roles
         self.assertRaises(exceptions.Unauthorized,
                           self.non_admin_client.list_roles)
 
     def test_list_roles_request_without_token(self):
-        """Request to list roles without a valid token should fail"""
+        # Request to list roles without a valid token should fail
         token = self.client.get_auth()
         self.client.delete_token(token)
         self.assertRaises(exceptions.Unauthorized, self.client.list_roles)
         self.client.clear_auth()
 
     def test_role_create_delete(self):
-        """Role should be created, verified, and deleted"""
+        # Role should be created, verified, and deleted
         role_name = rand_name('role-test-')
         resp, body = self.client.create_role(role_name)
         self.assertTrue('status' in resp)
@@ -79,11 +79,11 @@
         self.assertFalse(any(found))
 
     def test_role_create_blank_name(self):
-        """Should not be able to create a role with a blank name"""
+        # Should not be able to create a role with a blank name
         self.assertRaises(exceptions.BadRequest, self.client.create_role, '')
 
     def test_role_create_duplicate(self):
-        """Role names should be unique"""
+        # Role names should be unique
         role_name = rand_name('role-dup-')
         resp, body = self.client.create_role(role_name)
         role1_id = body.get('id')
@@ -121,7 +121,7 @@
 class UserRolesTestBase(RolesTestBase):
 
     def test_assign_user_role(self):
-        """Assign a role to a user on a tenant"""
+        # Assign a role to a user on a tenant
         (user, tenant, role) = self._get_role_params()
         self.client.assign_user_role(tenant['id'], user['id'], role['id'])
         resp, roles = self.client.list_user_roles(tenant['id'], user['id'])
@@ -129,14 +129,14 @@
         self.assertEquals(roles[0]['id'], role['id'])
 
     def test_assign_user_role_by_unauthorized_user(self):
-        """Non admin user should not be authorized to assign a role to user"""
+        # Non admin user should not be authorized to assign a role to user
         (user, tenant, role) = self._get_role_params()
         self.assertRaises(exceptions.Unauthorized,
                           self.non_admin_client.assign_user_role,
                           tenant['id'], user['id'], role['id'])
 
     def test_assign_user_role_request_without_token(self):
-        """Request to assign a role to a user without a valid token"""
+        # Request to assign a role to a user without a valid token
         (user, tenant, role) = self._get_role_params()
         token = self.client.get_auth()
         self.client.delete_token(token)
@@ -146,32 +146,32 @@
         self.client.clear_auth()
 
     def test_assign_user_role_for_non_existent_user(self):
-        """Attempt to assign a role to a non existent user should fail"""
+        # Attempt to assign a role to a non existent user should fail
         (user, tenant, role) = self._get_role_params()
         self.assertRaises(exceptions.NotFound, self.client.assign_user_role,
                           tenant['id'], 'junk-user-id-999', role['id'])
 
     def test_assign_user_role_for_non_existent_role(self):
-        """Attempt to assign a non existent role to user should fail"""
+        # Attempt to assign a non existent role to user should fail
         (user, tenant, role) = self._get_role_params()
         self.assertRaises(exceptions.NotFound, self.client.assign_user_role,
                           tenant['id'], user['id'], 'junk-role-id-12345')
 
     def test_assign_user_role_for_non_existent_tenant(self):
-        """Attempt to assign a role on a non existent tenant should fail"""
+        # Attempt to assign a role on a non existent tenant should fail
         (user, tenant, role) = self._get_role_params()
         self.assertRaises(exceptions.NotFound, self.client.assign_user_role,
                           'junk-tenant-1234', user['id'], role['id'])
 
     def test_assign_duplicate_user_role(self):
-        """Duplicate user role should not get assigned"""
+        # Duplicate user role should not get assigned
         (user, tenant, role) = self._get_role_params()
         self.client.assign_user_role(tenant['id'], user['id'], role['id'])
         self.assertRaises(exceptions.Duplicate, self.client.assign_user_role,
                           tenant['id'], user['id'], role['id'])
 
     def test_remove_user_role(self):
-        """Remove a role assigned to a user on a tenant"""
+        # Remove a role assigned to a user on a tenant
         (user, tenant, role) = self._get_role_params()
         resp, user_role = self.client.assign_user_role(tenant['id'],
                                                        user['id'], role['id'])
@@ -180,7 +180,7 @@
         self.assertEquals(resp['status'], '204')
 
     def test_remove_user_role_by_unauthorized_user(self):
-        """Non admin user should not be authorized to remove a user's role"""
+        # Non admin user should not be authorized to remove a user's role
         (user, tenant, role) = self._get_role_params()
         resp, user_role = self.client.assign_user_role(tenant['id'],
                                                        user['id'],
@@ -190,7 +190,7 @@
                           tenant['id'], user['id'], role['id'])
 
     def test_remove_user_role_request_without_token(self):
-        """Request to remove a user's role without a valid token"""
+        # Request to remove a user's role without a valid token
         (user, tenant, role) = self._get_role_params()
         resp, user_role = self.client.assign_user_role(tenant['id'],
                                                        user['id'],
@@ -203,7 +203,7 @@
         self.client.clear_auth()
 
     def test_remove_user_role_non_existant_user(self):
-        """Attempt to remove a role from a non existent user should fail"""
+        # Attempt to remove a role from a non existent user should fail
         (user, tenant, role) = self._get_role_params()
         resp, user_role = self.client.assign_user_role(tenant['id'],
                                                        user['id'],
@@ -212,7 +212,7 @@
                           tenant['id'], 'junk-user-id-123', role['id'])
 
     def test_remove_user_role_non_existant_role(self):
-        """Attempt to delete a non existent role from a user should fail"""
+        # Attempt to delete a non existent role from a user should fail
         (user, tenant, role) = self._get_role_params()
         resp, user_role = self.client.assign_user_role(tenant['id'],
                                                        user['id'],
@@ -221,7 +221,7 @@
                           tenant['id'], user['id'], 'junk-user-role-123')
 
     def test_remove_user_role_non_existant_tenant(self):
-        """Attempt to remove a role from a non existent tenant should fail"""
+        # Attempt to remove a role from a non existent tenant should fail
         (user, tenant, role) = self._get_role_params()
         resp, user_role = self.client.assign_user_role(tenant['id'],
                                                        user['id'],
@@ -230,7 +230,7 @@
                           'junk-tenant-id-123', user['id'], role['id'])
 
     def test_list_user_roles(self):
-        """List roles assigned to a user on tenant"""
+        # List roles assigned to a user on tenant
         (user, tenant, role) = self._get_role_params()
         self.client.assign_user_role(tenant['id'], user['id'], role['id'])
         resp, roles = self.client.list_user_roles(tenant['id'], user['id'])
@@ -238,7 +238,7 @@
         self.assertEquals(role['id'], roles[0]['id'])
 
     def test_list_user_roles_by_unauthorized_user(self):
-        """Non admin user should not be authorized to list a user's roles"""
+        # Non admin user should not be authorized to list a user's roles
         (user, tenant, role) = self._get_role_params()
         self.client.assign_user_role(tenant['id'], user['id'], role['id'])
         self.assertRaises(exceptions.Unauthorized,
@@ -246,7 +246,7 @@
                           user['id'])
 
     def test_list_user_roles_request_without_token(self):
-        """Request to list user's roles without a valid token should fail"""
+        # Request to list user's roles without a valid token should fail
         (user, tenant, role) = self._get_role_params()
         token = self.client.get_auth()
         self.client.delete_token(token)
@@ -258,7 +258,7 @@
             self.client.clear_auth()
 
     def test_list_user_roles_for_non_existent_user(self):
-        """Attempt to list roles of a non existent user should fail"""
+        # Attempt to list roles of a non existent user should fail
         (user, tenant, role) = self._get_role_params()
         self.assertRaises(exceptions.NotFound, self.client.list_user_roles,
                           tenant['id'], 'junk-role-aabbcc11')
diff --git a/tempest/tests/identity/admin/test_services.py b/tempest/tests/identity/admin/test_services.py
index 6baa7c2..30dfeb0 100644
--- a/tempest/tests/identity/admin/test_services.py
+++ b/tempest/tests/identity/admin/test_services.py
@@ -25,7 +25,7 @@
 class ServicesTestBase(object):
 
     def test_create_get_delete_service(self):
-        """GET Service"""
+        # GET Service
         try:
             #Creating a Service
             name = rand_name('service-')
diff --git a/tempest/tests/identity/admin/test_tenants.py b/tempest/tests/identity/admin/test_tenants.py
index 226aae6..8fba7e3 100644
--- a/tempest/tests/identity/admin/test_tenants.py
+++ b/tempest/tests/identity/admin/test_tenants.py
@@ -31,7 +31,7 @@
             cls.data.tenants.append(tenant)
 
     def test_list_tenants(self):
-        """Return a list of all tenants"""
+        # Return a list of all tenants
         resp, body = self.client.list_tenants()
         found = [tenant for tenant in body if tenant in self.data.tenants]
         self.assertTrue(any(found), 'List did not return newly created '
@@ -40,19 +40,19 @@
         self.assertTrue(resp['status'].startswith('2'))
 
     def test_list_tenants_by_unauthorized_user(self):
-        """Non-admin user should not be able to list tenants"""
+        # Non-admin user should not be able to list tenants
         self.assertRaises(exceptions.Unauthorized,
                           self.non_admin_client.list_tenants)
 
     def test_list_tenant_request_without_token(self):
-        """Request to list tenants without a valid token should fail"""
+        # Request to list tenants without a valid token should fail
         token = self.client.get_auth()
         self.client.delete_token(token)
         self.assertRaises(exceptions.Unauthorized, self.client.list_tenants)
         self.client.clear_auth()
 
     def test_tenant_delete(self):
-        """Create several tenants and delete them"""
+        # Create several tenants and delete them
         tenants = []
         for _ in xrange(5):
             resp, body = self.client.create_tenant(rand_name('tenant-new'))
@@ -70,14 +70,14 @@
         self.assertFalse(any(found_2), 'Tenants failed to delete')
 
     def test_tenant_delete_by_unauthorized_user(self):
-        """Non-admin user should not be able to delete a tenant"""
+        # Non-admin user should not be able to delete a tenant
         tenant_name = rand_name('tenant-')
         resp, tenant = self.client.create_tenant(tenant_name)
         self.assertRaises(exceptions.Unauthorized,
                           self.non_admin_client.delete_tenant, tenant['id'])
 
     def test_tenant_delete_request_without_token(self):
-        """Request to delete a tenant without a valid token should fail"""
+        # Request to delete a tenant without a valid token should fail
         tenant_name = rand_name('tenant-')
         resp, tenant = self.client.create_tenant(tenant_name)
         token = self.client.get_auth()
@@ -87,12 +87,12 @@
         self.client.clear_auth()
 
     def test_delete_non_existent_tenant(self):
-        """Attempt to delete a non existent tenant should fail"""
+        # Attempt to delete a non existent tenant should fail
         self.assertRaises(exceptions.NotFound, self.client.delete_tenant,
                           'junk_tenant_123456abc')
 
     def test_tenant_create_with_description(self):
-        """Create tenant with a description"""
+        # Create tenant with a description
         tenant_name = rand_name('tenant-')
         tenant_desc = rand_name('desc-')
         resp, body = self.client.create_tenant(tenant_name,
@@ -110,7 +110,7 @@
         self.client.delete_tenant(tenant_id)
 
     def test_tenant_create_enabled(self):
-        """Create a tenant that is enabled"""
+        # Create a tenant that is enabled
         tenant_name = rand_name('tenant-')
         resp, body = self.client.create_tenant(tenant_name, enabled=True)
         tenant_id = body['id']
@@ -124,7 +124,7 @@
         self.client.delete_tenant(tenant_id)
 
     def test_tenant_create_not_enabled(self):
-        """Create a tenant that is not enabled"""
+        # Create a tenant that is not enabled
         tenant_name = rand_name('tenant-')
         resp, body = self.client.create_tenant(tenant_name, enabled=False)
         tenant_id = body['id']
@@ -140,7 +140,7 @@
         self.client.delete_tenant(tenant_id)
 
     def test_tenant_create_duplicate(self):
-        """Tenant names should be unique"""
+        # Tenant names should be unique
         tenant_name = rand_name('tenant-dup-')
         resp, body = self.client.create_tenant(tenant_name)
         tenant1_id = body.get('id')
@@ -155,13 +155,13 @@
             self.client.delete_tenant(tenant1_id)
 
     def test_create_tenant_by_unauthorized_user(self):
-        """Non-admin user should not be authorized to create a tenant"""
+        # Non-admin user should not be authorized to create a tenant
         tenant_name = rand_name('tenant-')
         self.assertRaises(exceptions.Unauthorized,
                           self.non_admin_client.create_tenant, tenant_name)
 
     def test_create_tenant_request_without_token(self):
-        """Create tenant request without a token should not be authorized"""
+        # Create tenant request without a token should not be authorized
         tenant_name = rand_name('tenant-')
         token = self.client.get_auth()
         self.client.delete_token(token)
@@ -170,18 +170,18 @@
         self.client.clear_auth()
 
     def test_create_tenant_with_empty_name(self):
-        """Tenant name should not be empty"""
+        # Tenant name should not be empty
         self.assertRaises(exceptions.BadRequest, self.client.create_tenant,
                           name='')
 
     def test_create_tenants_name_length_over_64(self):
-        """Tenant name length should not be greater than 64 characters"""
+        # Tenant name length should not be greater than 64 characters
         tenant_name = 'a' * 65
         self.assertRaises(exceptions.BadRequest, self.client.create_tenant,
                           tenant_name)
 
     def test_tenant_update_name(self):
-        """Update name attribute of a tenant"""
+        # Update name attribute of a tenant
         t_name1 = rand_name('tenant-')
         resp, body = self.client.create_tenant(t_name1)
         t_id = body['id']
@@ -204,7 +204,7 @@
         self.client.delete_tenant(t_id)
 
     def test_tenant_update_desc(self):
-        """Update description attribute of a tenant"""
+        # Update description attribute of a tenant
         t_name = rand_name('tenant-')
         t_desc = rand_name('desc-')
         resp, body = self.client.create_tenant(t_name, description=t_desc)
@@ -228,7 +228,7 @@
         self.client.delete_tenant(t_id)
 
     def test_tenant_update_enable(self):
-        """Update the enabled attribute of a tenant"""
+        # Update the enabled attribute of a tenant
         t_name = rand_name('tenant-')
         t_en = False
         resp, body = self.client.create_tenant(t_name, enabled=t_en)
diff --git a/tempest/tests/identity/admin/test_users.py b/tempest/tests/identity/admin/test_users.py
index e2938bd..27a214c 100644
--- a/tempest/tests/identity/admin/test_users.py
+++ b/tempest/tests/identity/admin/test_users.py
@@ -33,7 +33,7 @@
 
     @attr(type='smoke')
     def test_create_user(self):
-        """Create a user"""
+        # Create a user
         self.data.setup_test_tenant()
         resp, user = self.client.create_user(self.alt_user, self.alt_password,
                                              self.data.tenant['id'],
@@ -44,7 +44,7 @@
 
     @attr(type='negative')
     def test_create_user_by_unauthorized_user(self):
-        """Non-admin should not be authorized to create a user"""
+        # Non-admin should not be authorized to create a user
         self.data.setup_test_tenant()
         self.assertRaises(exceptions.Unauthorized,
                           self.non_admin_client.create_user, self.alt_user,
@@ -53,7 +53,7 @@
 
     @attr(type='negative')
     def test_create_user_with_empty_name(self):
-        """User with an empty name should not be created"""
+        # User with an empty name should not be created
         self.data.setup_test_tenant()
         self.assertRaises(exceptions.BadRequest, self.client.create_user, '',
                           self.alt_password, self.data.tenant['id'],
@@ -62,7 +62,7 @@
     @attr(type='negative')
     @unittest.skip("Until Bug 966251 is fixed")
     def test_create_user_with_name_length_over_64(self):
-        """Length of user name filed should be restricted to 64 characters"""
+        # Length of user name filed should be restricted to 64 characters
         self.data.setup_test_tenant()
         self.assertRaises(exceptions.BadRequest, self.client.create_user,
                           'a' * 65, self.alt_password,
@@ -70,7 +70,7 @@
 
     @attr(type='negative')
     def test_create_user_with_duplicate_name(self):
-        """Duplicate user should not be created"""
+        # Duplicate user should not be created
         self.data.setup_test_user()
         self.assertRaises(exceptions.Duplicate, self.client.create_user,
                           self.data.test_user, self.data.test_password,
@@ -79,7 +79,7 @@
     @attr(type='negative')
     @unittest.skip("Until Bug 999084 is fixed")
     def test_create_user_with_empty_password(self):
-        """User with an empty password should not be created"""
+        # User with an empty password should not be created
         self.data.setup_test_tenant()
         self.assertRaises(exceptions.BadRequest, self.client.create_user,
                           self.alt_user, '', self.data.tenant['id'],
@@ -88,7 +88,7 @@
     @attr(type='nagative')
     @unittest.skip("Until Bug 999084 is fixed")
     def test_create_user_with_long_password(self):
-        """User having password exceeding max length should not be created"""
+        # User having password exceeding max length should not be created
         self.data.setup_test_tenant()
         self.assertRaises(exceptions.BadRequest, self.client.create_user,
                           self.alt_user, 'a' * 65, self.data.tenant['id'],
@@ -97,21 +97,21 @@
     @attr(type='negative')
     @unittest.skip("Until Bug 999084 is fixed")
     def test_create_user_with_invalid_email_format(self):
-        """Email format should be validated while creating a user"""
+        # Email format should be validated while creating a user
         self.data.setup_test_tenant()
         self.assertRaises(exceptions.BadRequest, self.client.create_user,
                           self.alt_user, '', self.data.tenant['id'], '12345')
 
     @attr(type='negative')
     def test_create_user_for_non_existant_tenant(self):
-        """Attempt to create a user in a non-existent tenant should fail"""
+        # Attempt to create a user in a non-existent tenant should fail
         self.assertRaises(exceptions.NotFound, self.client.create_user,
                           self.alt_user, self.alt_password, '49ffgg99999',
                           self.alt_email)
 
     @attr(type='negative')
     def test_create_user_request_without_a_token(self):
-        """Request to create a user without a valid token should fail"""
+        # Request to create a user without a valid token should fail
         self.data.setup_test_tenant()
         # Get the token of the current client
         token = self.client.get_auth()
@@ -126,7 +126,7 @@
 
     @attr(type='smoke')
     def test_delete_user(self):
-        """Delete a user"""
+        # Delete a user
         self.data.setup_test_tenant()
         resp, user = self.client.create_user('user_1234', self.alt_password,
                                              self.data.tenant['id'],
@@ -136,7 +136,7 @@
 
     @attr(type='negative')
     def test_delete_users_by_unauthorized_user(self):
-        """Non admin user should not be authorized to delete a user"""
+        # Non admin user should not be authorized to delete a user
         self.data.setup_test_user()
         self.assertRaises(exceptions.Unauthorized,
                           self.non_admin_client.delete_user,
@@ -144,13 +144,13 @@
 
     @attr(type='negative')
     def test_delete_non_existant_user(self):
-        """Attempt to delete a non-existent user should fail"""
+        # Attempt to delete a non-existent user should fail
         self.assertRaises(exceptions.NotFound, self.client.delete_user,
                           'junk12345123')
 
     @attr(type='smoke')
     def test_user_authentication(self):
-        """Valid user's token is authenticated"""
+        # Valid user's token is authenticated
         self.data.setup_test_user()
         # Get a token
         self.token_client.auth(self.data.test_user, self.data.test_password,
@@ -163,7 +163,7 @@
 
     @attr(type='negative')
     def test_authentication_for_disabled_user(self):
-        """Disabled user's token should not get authenticated"""
+        # Disabled user's token should not get authenticated
         self.data.setup_test_user()
         self.disable_user(self.data.test_user)
         self.assertRaises(exceptions.Unauthorized, self.token_client.auth,
@@ -174,7 +174,7 @@
     @attr(type='negative')
     @unittest.skip('Until Bug 988920 is fixed')
     def test_authentication_when_tenant_is_disabled(self):
-        """User's token for a disabled tenant should not be authenticated"""
+        # User's token for a disabled tenant should not be authenticated
         self.data.setup_test_user()
         self.disable_tenant(self.data.test_tenant)
         self.assertRaises(exceptions.Unauthorized, self.token_client.auth,
@@ -185,7 +185,7 @@
     @attr(type='negative')
     @unittest.skip('Until Bug 988920 is fixed')
     def test_authentication_with_invalid_tenant(self):
-        """User's token for an invalid tenant should not be authenticated"""
+        # User's token for an invalid tenant should not be authenticated
         self.data.setup_one_user()
         self.assertRaises(exceptions.Unauthorized, self.token_client.auth,
                           self.data.test_user,
@@ -194,14 +194,14 @@
 
     @attr(type='negative')
     def test_authentication_with_invalid_username(self):
-        """Non-existent user's token should not get authenticated"""
+        # Non-existent user's token should not get authenticated
         self.assertRaises(exceptions.Unauthorized, self.token_client.auth,
                           'junkuser123', self.data.test_password,
                           self.data.test_tenant)
 
     @attr(type='negative')
     def test_authentication_with_invalid_password(self):
-        """User's token with invalid password should not be authenticated"""
+        # User's token with invalid password should not be authenticated
         self.data.setup_test_user()
         self.assertRaises(exceptions.Unauthorized, self.token_client.auth,
                           self.data.test_user, 'junkpass1234',
@@ -209,7 +209,7 @@
 
     @attr(type='positive')
     def test_authentication_request_without_token(self):
-        """Request for token authentication with a valid token in header"""
+        # Request for token authentication with a valid token in header
         self.data.setup_test_user()
         self.token_client.auth(self.data.test_user, self.data.test_password,
                                self.data.test_tenant)
@@ -226,7 +226,7 @@
 
     @attr(type='smoke')
     def test_get_users(self):
-        """Get a list of users and find the test user"""
+        # Get a list of users and find the test user
         self.data.setup_test_user()
         resp, users = self.client.get_users()
         self.assertIn(self.data.test_user, [u['name'] for u in users],
@@ -234,14 +234,14 @@
 
     @attr(type='negative')
     def test_get_users_by_unauthorized_user(self):
-        """Non admin user should not be authorized to get user list"""
+        # Non admin user should not be authorized to get user list
         self.data.setup_test_user()
         self.assertRaises(exceptions.Unauthorized,
                           self.non_admin_client.get_users)
 
     @attr(type='negative')
     def test_get_users_request_without_token(self):
-        """Request to get list of users without a valid token should fail"""
+        # Request to get list of users without a valid token should fail
         token = self.client.get_auth()
         self.client.delete_token(token)
         self.assertRaises(exceptions.Unauthorized, self.client.get_users)
@@ -249,7 +249,7 @@
 
     @attr(type='positive')
     def test_list_users_for_tenant(self):
-        """Return a list of all users for a tenant"""
+        # Return a list of all users for a tenant
         self.data.setup_test_tenant()
         user_ids = list()
         fetched_user_ids = list()
@@ -277,7 +277,7 @@
 
     @attr(type='positive')
     def test_list_users_with_roles_for_tenant(self):
-        """Return list of users on tenant when roles are assigned to users"""
+        # Return list of users on tenant when roles are assigned to users
         self.data.setup_test_user()
         self.data.setup_test_role()
         user = self.get_user_by_name(self.data.test_user)
@@ -309,10 +309,8 @@
 
     @attr(type='negative')
     def test_list_users_with_invalid_tenant(self):
-        """
-        Should not be able to return a list of all
-        users for a nonexistant tenant
-        """
+        # Should not be able to return a list of all
+        # users for a nonexistant tenant
         #Assign invalid tenant ids
         invalid_id = list()
         invalid_id.append(rand_name('999'))
diff --git a/tempest/tests/image/test_images.py b/tempest/tests/image/test_images.py
index a3c9390..2429a32 100644
--- a/tempest/tests/image/test_images.py
+++ b/tempest/tests/image/test_images.py
@@ -54,7 +54,7 @@
 
     @attr(type='image')
     def test_register_with_invalid_data(self):
-        """Negative tests for invalid data supplied to POST /images"""
+        # Negative tests for invalid data supplied to POST /images
 
         metas = [
             {
@@ -76,7 +76,7 @@
 
     @attr(type='image')
     def test_register_then_upload(self):
-        """Register, then upload an image"""
+        # Register, then upload an image
         meta = {
             'name': 'New Name',
             'is_public': True,
@@ -108,7 +108,7 @@
 
     @attr(type='image')
     def test_register_remote_image(self):
-        """Register a new remote image"""
+        # Register a new remote image
         meta = {
             'name': 'New Remote Image',
             'is_public': True,
@@ -194,8 +194,6 @@
 
     @attr(type='image')
     def test_index_no_params(self):
-        """
-        Simple test to see all fixture images returned
-        """
+        # Simple test to see all fixture images returned
         current_images = set(i.id for i in self.client.images.list())
         self.assertTrue(set(self.created_images) <= current_images)
diff --git a/tempest/tests/network/test_networks.py b/tempest/tests/network/test_networks.py
index 5476551..d7f09c4 100644
--- a/tempest/tests/network/test_networks.py
+++ b/tempest/tests/network/test_networks.py
@@ -31,7 +31,7 @@
 
     @attr(type='positive')
     def test_create_delete_network(self):
-        """Creates and deletes a network for a tenant"""
+        # Creates and deletes a network for a tenant
         name = rand_name('network')
         resp, body = self.client.create_network(name)
         self.assertEqual('202', resp['status'])
@@ -42,7 +42,7 @@
 
     @attr(type='positive')
     def test_show_network(self):
-        """Verifies the details of a network"""
+        # Verifies the details of a network
         resp, body = self.client.get_network(self.network['id'])
         self.assertEqual('200', resp['status'])
         network = body['network']
@@ -51,7 +51,7 @@
 
     @attr(type='positive')
     def test_show_network_details(self):
-        """Verifies the full details of a network"""
+        # Verifies the full details of a network
         resp, body = self.client.get_network_details(self.network['id'])
         self.assertEqual('200', resp['status'])
         network = body['network']
@@ -61,7 +61,7 @@
 
     @attr(type='positive')
     def test_list_networks(self):
-        """Verify the network exists in the list of all networks"""
+        # Verify the network exists in the list of all networks
         resp, body = self.client.list_networks()
         networks = body['networks']
         found = any(n for n in networks if n['id'] == self.network['id'])
@@ -69,7 +69,7 @@
 
     @attr(type='positive')
     def test_list_networks_with_detail(self):
-        """Verify the network exists in the detailed list of all networks"""
+        # Verify the network exists in the detailed list of all networks
         resp, body = self.client.list_networks_details()
         networks = body['networks']
         found = any(n for n in networks if n['id'] == self.network['id'])
diff --git a/tempest/tests/object_storage/test_account_services.py b/tempest/tests/object_storage/test_account_services.py
index db3aa69..cae2da1 100644
--- a/tempest/tests/object_storage/test_account_services.py
+++ b/tempest/tests/object_storage/test_account_services.py
@@ -36,7 +36,7 @@
 
     @attr(type='smoke')
     def test_list_containers(self):
-        """List of all containers should not be empty"""
+        # List of all containers should not be empty
 
         params = {'format': 'json'}
         resp, container_list = \
@@ -48,7 +48,7 @@
 
     @attr(type='smoke')
     def test_list_account_metadata(self):
-        """List all account metadata"""
+        # List all account metadata
 
         resp, metadata = self.account_client.list_account_metadata()
         self.assertEqual(resp['status'], '204')
@@ -58,7 +58,7 @@
 
     @attr(type='smoke')
     def test_create_account_metadata(self):
-        """Add metadata to account"""
+        # Add metadata to account
 
         metadata = {'test-account-meta': 'Meta!'}
         resp, _ = \
@@ -71,7 +71,7 @@
 
     @attr(type='smoke')
     def test_delete_account_metadata(self):
-        """Delete metadata from account"""
+        # Delete metadata from account
 
         metadata = ['test-account-meta']
         resp, _ = \
diff --git a/tempest/tests/object_storage/test_container_services.py b/tempest/tests/object_storage/test_container_services.py
index b99859e..fe09341 100644
--- a/tempest/tests/object_storage/test_container_services.py
+++ b/tempest/tests/object_storage/test_container_services.py
@@ -46,7 +46,7 @@
 
     @attr(type='smoke')
     def test_create_container(self):
-        """Create a container, test responses"""
+        # Create a container, test responses
 
         #Create a container
         container_name = rand_name(name='TestContainer')
@@ -57,7 +57,7 @@
 
     @attr(type='smoke')
     def test_delete_container(self):
-        """Create and Delete a container, test responses"""
+        # Create and Delete a container, test responses
 
         #Create a container
         container_name = rand_name(name='TestContainer')
@@ -71,7 +71,7 @@
 
     @attr(type='smoke')
     def test_list_container_contents_json(self):
-        """Add metadata to object"""
+        # Add metadata to object
 
         #Create a container
         container_name = rand_name(name='TestContainer')
@@ -107,7 +107,7 @@
 
     @attr(type='smoke')
     def test_container_metadata(self):
-        """Update/Retrieve/Delete Container Metadata"""
+        # Update/Retrieve/Delete Container Metadata
 
         # Create a container
         container_name = rand_name(name='TestContainer')
diff --git a/tempest/tests/object_storage/test_object_expiry.py b/tempest/tests/object_storage/test_object_expiry.py
index 8437d55..099fc16 100644
--- a/tempest/tests/object_storage/test_object_expiry.py
+++ b/tempest/tests/object_storage/test_object_expiry.py
@@ -57,7 +57,7 @@
     @unittest.skip('Until bug 1069849 is resolved.')
     @attr(type='regression')
     def test_get_object_after_expiry_time(self):
-        """GET object after expiry time"""
+        # GET object after expiry time
         #TODO(harika-vakadi): Similar test case has to be created for
         # "X-Delete-At", after this test case works.
 
diff --git a/tempest/tests/object_storage/test_object_services.py b/tempest/tests/object_storage/test_object_services.py
index 43af072..8b87ad6 100644
--- a/tempest/tests/object_storage/test_object_services.py
+++ b/tempest/tests/object_storage/test_object_services.py
@@ -49,7 +49,7 @@
 
     @attr(type='smoke')
     def test_create_object(self):
-        """Create storage object, test response"""
+        # Create storage object, test response
 
         #Create Object
         object_name = rand_name(name='TestObject')
@@ -66,7 +66,7 @@
 
     @attr(type='smoke')
     def test_delete_object(self):
-        """Create and delete a storage object, test responses"""
+        # Create and delete a storage object, test responses
 
         #Create Object
         object_name = rand_name(name='TestObject')
@@ -80,7 +80,7 @@
 
     @attr(type='smoke')
     def test_object_metadata(self):
-        """Add metadata to storage object, test if metadata is retrievable"""
+        # Add metadata to storage object, test if metadata is retrievable
 
         #Create Object
         object_name = rand_name(name='TestObject')
@@ -110,7 +110,7 @@
 
     @attr(type='smoke')
     def test_get_object(self):
-        """Retrieve object's data(in response body)"""
+        # Retrieve object's data(in response body)
 
         #Create Object
         object_name = rand_name(name='TestObject')
@@ -126,7 +126,7 @@
 
     @attr(type='smoke')
     def test_copy_object_in_same_container(self):
-        """Copy storage object"""
+        # Copy storage object
 
         # Create source Object
         src_object_name = rand_name(name='SrcObject')
@@ -154,7 +154,7 @@
 
     @attr(type='smoke')
     def test_copy_object_to_itself(self):
-        """Change the content type of an existing object"""
+        # Change the content type of an existing object
 
         # Create Object
         object_name = rand_name(name='TestObject')
@@ -179,7 +179,7 @@
 
     @attr(type='smoke')
     def test_copy_object_2d_way(self):
-        """Copy storage object"""
+        # Copy storage object
 
         # Create source Object
         src_object_name = rand_name(name='SrcObject')
@@ -208,7 +208,7 @@
 
     @attr(type='smoke')
     def test_copy_object_across_containers(self):
-        """Copy storage object across containers"""
+        # Copy storage object across containers
 
         #Create a container so as to use as source container
         src_container_name = rand_name(name='TestSourceContainer')
@@ -267,8 +267,8 @@
 
     @attr(type='smoke')
     def test_access_public_container_object_without_using_creds(self):
-        """Make container public-readable, and access the object
-           anonymously, e.g. without using credentials"""
+        # Make container public-readable, and access the object
+           # anonymously, e.g. without using credentials
 
         try:
             resp_meta = None
@@ -318,8 +318,8 @@
 
     @attr(type='negative')
     def test_access_object_without_using_creds(self):
-        """Attempt to access the object anonymously, e.g.
-        not using any credentials"""
+        # Attempt to access the object anonymously, e.g.
+        # not using any credentials
 
         # Create Object
         object_name = rand_name(name='Object')
@@ -336,8 +336,8 @@
 
     @attr(type='negative')
     def test_write_object_without_using_creds(self):
-        """Attempt to write to the object anonymously, e.g.
-        not using any credentials"""
+        # Attempt to write to the object anonymously, e.g.
+        # not using any credentials
 
         # Trying to Create Object with empty Headers
         object_name = rand_name(name='Object')
@@ -353,8 +353,8 @@
 
     @attr(type='negative')
     def test_delete_object_without_using_creds(self):
-        """Attempt to delete the object anonymously,
-        e.g. not using any credentials"""
+        # Attempt to delete the object anonymously,
+        # e.g. not using any credentials
 
         # Create Object
         object_name = rand_name(name='Object')
diff --git a/tempest/tests/object_storage/test_object_version.py b/tempest/tests/object_storage/test_object_version.py
index a291ae7..28e0893 100644
--- a/tempest/tests/object_storage/test_object_version.py
+++ b/tempest/tests/object_storage/test_object_version.py
@@ -54,7 +54,7 @@
 
     @attr(type='smoke')
     def test_versioned_container(self):
-        """Versioned container responses tests"""
+        # Versioned container responses tests
 
         # Create a containers
         vers_container_name = rand_name(name='TestVersionContainer')