diff --git a/stress/driver.py b/stress/driver.py
index 9ab6fb8..35004bb 100644
--- a/stress/driver.py
+++ b/stress/driver.py
@@ -180,13 +180,13 @@
     cases = _create_cases(choice_spec)
     state = ClusterState(max_vms=max_vms)
     create_initial_keypairs(manager, state,
-                             int(kwargs.get('initial_keypairs', 0)))
+                            int(kwargs.get('initial_keypairs', 0)))
     create_initial_vms(manager, state,
                        int(kwargs.get('initial_vms', 0)))
     create_initial_floating_ips(manager, state,
                                 int(kwargs.get('initial_floating_ips', 0)))
     create_initial_volumes(manager, state,
-                                int(kwargs.get('initial_volumes', 0)))
+                           int(kwargs.get('initial_volumes', 0)))
     test_end_time = time.time() + duration.seconds
 
     retry_list = []
diff --git a/stress/test_server_actions.py b/stress/test_server_actions.py
index 6b4f462..87b1067 100644
--- a/stress/test_server_actions.py
+++ b/stress/test_server_actions.py
@@ -129,7 +129,7 @@
                 return False
         target = self._target
         self._logger.info('machine %s %s -> ACTIVE [%.1f secs elapsed]' %
-                              (target['id'], reboot_state, self.elapsed()))
+                          (target['id'], reboot_state, self.elapsed()))
         self._state.set_instance_state(target['id'],
                                       (target, 'ACTIVE'))
 
diff --git a/stress/test_servers.py b/stress/test_servers.py
index 57c923a..3075045 100644
--- a/stress/test_servers.py
+++ b/stress/test_servers.py
@@ -123,7 +123,7 @@
             self._state.get_instances()[self._target['id']][1] ==
             'TERMINATING'):
             self._logger.info('machine %s is deleted or TERMINATING' %
-                               self._target['id'])
+                              self._target['id'])
             return True
 
         admin_pass = self._target['adminPass']
@@ -273,7 +273,7 @@
         new_name = update_target['name'] + '_updated'
         (response, body) = \
             manager.servers_client.update_server(update_target['id'],
-                                                    name=new_name)
+                                                 name=new_name)
         if (response.status != 200):
             self._logger.error("response: %s " % response)
             self._logger.error("body: %s " % body)
diff --git a/tempest/common/rest_client.py b/tempest/common/rest_client.py
index b2d3e22..48f4152 100644
--- a/tempest/common/rest_client.py
+++ b/tempest/common/rest_client.py
@@ -149,8 +149,8 @@
             if service == 'network':
                 # Keystone does not return the correct endpoint for
                 # quantum. Handle this separately.
-                mgmt_url = mgmt_url + self.config.network.api_version + \
-                             "/tenants/" + tenant_id
+                mgmt_url = (mgmt_url + self.config.network.api_version +
+                            "/tenants/" + tenant_id)
 
             return token, mgmt_url
 
diff --git a/tempest/openstack.py b/tempest/openstack.py
index d9cb0a1..0e4a0ef 100644
--- a/tempest/openstack.py
+++ b/tempest/openstack.py
@@ -158,10 +158,10 @@
             self.images_client = IMAGES_CLIENTS[interface](*client_args)
             self.keypairs_client = KEYPAIRS_CLIENTS[interface](*client_args)
             self.flavors_client = FLAVORS_CLIENTS[interface](*client_args)
-            self.extensions_client = \
-                    EXTENSIONS_CLIENTS[interface](*client_args)
-            self.volumes_extensions_client = \
-                    VOLUMES_EXTENSIONS_CLIENTS[interface](*client_args)
+            ext_cli = EXTENSIONS_CLIENTS[interface](*client_args)
+            self.extensions_client = ext_cli
+            vol_ext_cli = VOLUMES_EXTENSIONS_CLIENTS[interface](*client_args)
+            self.volumes_extensions_client = vol_ext_cli
             self.floating_ips_client = FLOAT_CLIENTS[interface](*client_args)
             self.volumes_client = VOLUMES_CLIENTS[interface](*client_args)
             self.admin_client = ADMIN_CLIENT[interface](*client_args)
diff --git a/tempest/services/identity/json/admin_client.py b/tempest/services/identity/json/admin_client.py
index c976613..f9c4f04 100644
--- a/tempest/services/identity/json/admin_client.py
+++ b/tempest/services/identity/json/admin_client.py
@@ -8,7 +8,7 @@
 
     def __init__(self, config, username, password, auth_url, tenant_name=None):
         super(AdminClientJSON, self).__init__(config, username, password,
-                                                    auth_url, tenant_name)
+                                              auth_url, tenant_name)
         self.service = self.config.identity.catalog_type
         self.endpoint_url = 'adminURL'
 
@@ -29,8 +29,7 @@
             'name': name,
         }
         post_body = json.dumps({'role': post_body})
-        resp, body = self.post('OS-KSADM/roles', post_body,
-                                      self.headers)
+        resp, body = self.post('OS-KSADM/roles', post_body, self.headers)
         body = json.loads(body)
         return resp, body['role']
 
@@ -47,8 +46,7 @@
             'enabled': kwargs.get('enabled', 'true'),
         }
         post_body = json.dumps({'tenant': post_body})
-        resp, body = self.post('tenants', post_body,
-                                      self.headers)
+        resp, body = self.post('tenants', post_body, self.headers)
         body = json.loads(body)
         return resp, body['tenant']
 
@@ -67,9 +65,9 @@
     def assign_user_role(self, tenant_id, user_id, role_id):
         """Add roles to a user on a tenant"""
         post_body = json.dumps({})
-        resp, body = self.put('/tenants/%s/users/%s/roles/OS-KSADM/%s'
-                                % (tenant_id, user_id, role_id), post_body,
-                                   self.headers)
+        resp, body = self.put('/tenants/%s/users/%s/roles/OS-KSADM/%s' %
+                              (tenant_id, user_id, role_id), post_body,
+                              self.headers)
         body = json.loads(body)
         return resp, body['role']
 
@@ -122,7 +120,7 @@
         }
         post_body = json.dumps({'tenant': post_body})
         resp, body = self.post('tenants/%s' % tenant_id, post_body,
-                                      self.headers)
+                               self.headers)
         body = json.loads(body)
         return resp, body['tenant']
 
@@ -186,8 +184,7 @@
                       'type': type,
                       'description': kwargs.get('description')}
         post_body = json.dumps({'OS-KSADM:service': post_body})
-        resp, body = self.post('/OS-KSADM/services', post_body,
-                                    self.headers)
+        resp, body = self.post('/OS-KSADM/services', post_body, self.headers)
         body = json.loads(body)
         return resp, body['OS-KSADM:service']
 
diff --git a/tempest/services/identity/xml/admin_client.py b/tempest/services/identity/xml/admin_client.py
index 8d056e5..953a4d5 100644
--- a/tempest/services/identity/xml/admin_client.py
+++ b/tempest/services/identity/xml/admin_client.py
@@ -34,7 +34,7 @@
 
     def __init__(self, config, username, password, auth_url, tenant_name=None):
         super(AdminClientXML, self).__init__(config, username, password,
-                                                    auth_url, tenant_name)
+                                             auth_url, tenant_name)
         self.service = self.config.identity.catalog_type
         self.endpoint_url = 'adminURL'
 
@@ -61,11 +61,9 @@
 
     def create_role(self, name):
         """Create a role"""
-        create_role = Element("role",
-                                xmlns=XMLNS,
-                                name=name)
+        create_role = Element("role", xmlns=XMLNS, name=name)
         resp, body = self.post('OS-KSADM/roles', str(Document(create_role)),
-                                      self.headers)
+                               self.headers)
         body = self._parse_body(etree.fromstring(body))
         return resp, body
 
@@ -83,7 +81,7 @@
                                 description=kwargs.get('description', ''),
                                 enabled=str(en).lower())
         resp, body = self.post('tenants', str(Document(create_tenant)),
-                                      self.headers)
+                               self.headers)
         body = self._parse_body(etree.fromstring(body))
         return resp, body
 
@@ -102,9 +100,8 @@
 
     def assign_user_role(self, tenant_id, user_id, role_id):
         """Add roles to a user on a tenant"""
-        resp, body = self.put('/tenants/%s/users/%s/roles/OS-KSADM/%s'
-                                % (tenant_id, user_id, role_id),
-                                '', self.headers)
+        resp, body = self.put('/tenants/%s/users/%s/roles/OS-KSADM/%s' %
+                              (tenant_id, user_id, role_id), '', self.headers)
         body = self._parse_body(etree.fromstring(body))
         return resp, body
 
@@ -158,11 +155,11 @@
     def create_user(self, name, password, tenant_id, email):
         """Create a user"""
         create_user = Element("user",
-                                xmlns=XMLNS,
-                                name=name,
-                                password=password,
-                                tenantId=tenant_id,
-                                email=email)
+                              xmlns=XMLNS,
+                              name=name,
+                              password=password,
+                              tenantId=tenant_id,
+                              email=email)
         resp, body = self.post('users', str(Document(create_user)),
                                self.headers)
         body = self._parse_body(etree.fromstring(body))
@@ -181,8 +178,7 @@
 
     def enable_disable_user(self, user_id, enabled):
         """Enables or disables a user"""
-        enable_user = Element("user",
-                                enabled=str(enabled).lower())
+        enable_user = Element("user", enabled=str(enabled).lower())
         resp, body = self.put('users/%s/enabled' % user_id,
                               str(Document(enable_user)), self.headers)
         body = self._parse_array(etree.fromstring(body))
@@ -209,7 +205,7 @@
                                  description=kwargs.get('description'))
         resp, body = self.post('OS-KSADM/services',
                                str(Document(create_service)),
-                                    self.headers)
+                               self.headers)
         body = self._parse_body(etree.fromstring(body))
         return resp, body
 
@@ -235,8 +231,7 @@
         passwordCreds = Element("passwordCredentials",
                                 username=user,
                                 password=password)
-        auth = Element("auth",
-                                tenantName=tenant)
+        auth = Element("auth", tenantName=tenant)
         auth.append(passwordCreds)
         headers = {'Content-Type': 'application/xml'}
         resp, body = self.post(self.auth_url, headers=headers,
diff --git a/tempest/services/network/json/network_client.py b/tempest/services/network/json/network_client.py
index 8253f6a..c93c83f 100644
--- a/tempest/services/network/json/network_client.py
+++ b/tempest/services/network/json/network_client.py
@@ -22,9 +22,7 @@
         }
         headers = {'Content-Type': 'application/json'}
         body = json.dumps(post_body)
-        resp, body = self.post('networks',
-                                      headers=headers,
-                                      body=body)
+        resp, body = self.post('networks', headers=headers, body=body)
         body = json.loads(body)
         return resp, body
 
@@ -59,13 +57,13 @@
         headers = {'Content-Type': 'application/json'}
         body = json.dumps(post_body)
         resp, body = self.post('networks/%s/ports.json' % network_id,
-                                        headers=headers, body=body)
+                               headers=headers, body=body)
         body = json.loads(body)
         return resp, body
 
     def delete_port(self, network_id, port_id):
         resp, body = self.delete('networks/%s/ports/%s.json' %
-                                            (network_id, port_id))
+                                 (network_id, port_id))
         return resp, body
 
     def list_ports(self, network_id):
diff --git a/tempest/services/nova/json/images_client.py b/tempest/services/nova/json/images_client.py
index 03df0fb..b2a4a12 100644
--- a/tempest/services/nova/json/images_client.py
+++ b/tempest/services/nova/json/images_client.py
@@ -26,8 +26,8 @@
             post_body['createImage']['metadata'] = meta
 
         post_body = json.dumps(post_body)
-        resp, body = self.post('servers/%s/action' %
-                                      str(server_id), post_body, self.headers)
+        resp, body = self.post('servers/%s/action' % str(server_id),
+                               post_body, self.headers)
         return resp, body
 
     def list_images(self, params=None):
@@ -107,37 +107,35 @@
     def set_image_metadata(self, image_id, meta):
         """Sets the metadata for an image"""
         post_body = json.dumps({'metadata': meta})
-        resp, body = self.put('images/%s/metadata' %
-                                      str(image_id), post_body, self.headers)
+        resp, body = self.put('images/%s/metadata' % str(image_id),
+                              post_body, self.headers)
         body = json.loads(body)
         return resp, body['metadata']
 
     def update_image_metadata(self, image_id, meta):
         """Updates the metadata for an image"""
         post_body = json.dumps({'metadata': meta})
-        resp, body = self.post('images/%s/metadata' %
-                                      str(image_id), post_body, self.headers)
+        resp, body = self.post('images/%s/metadata' % str(image_id),
+                               post_body, self.headers)
         body = json.loads(body)
         return resp, body['metadata']
 
     def get_image_metadata_item(self, image_id, key):
         """Returns the value for a specific image metadata key"""
-        resp, body = self.get("images/%s/metadata/%s" %
-                                     (str(image_id), key))
+        resp, body = self.get("images/%s/metadata/%s" % (str(image_id), key))
         body = json.loads(body)
         return resp, body['meta']
 
     def set_image_metadata_item(self, image_id, key, meta):
         """Sets the value for a specific image metadata key"""
         post_body = json.dumps({'meta': meta})
-        resp, body = self.put('images/%s/metadata/%s' %
-                                     (str(image_id), key), post_body,
-                                     self.headers)
+        resp, body = self.put('images/%s/metadata/%s' % (str(image_id), key),
+                              post_body, self.headers)
         body = json.loads(body)
         return resp, body['meta']
 
     def delete_image_metadata_item(self, image_id, key):
         """Deletes a single image metadata key/value pair"""
         resp, body = self.delete("images/%s/metadata/%s" %
-                                     (str(image_id), key))
+                                 (str(image_id), key))
         return resp, body
diff --git a/tempest/services/nova/json/keypairs_client.py b/tempest/services/nova/json/keypairs_client.py
index 1ccc65a..ce80de8 100644
--- a/tempest/services/nova/json/keypairs_client.py
+++ b/tempest/services/nova/json/keypairs_client.py
@@ -30,7 +30,7 @@
             post_body['keypair']['public_key'] = pub_key
         post_body = json.dumps(post_body)
         resp, body = self.post("os-keypairs",
-                                headers=self.headers, body=post_body)
+                               headers=self.headers, body=post_body)
         body = json.loads(body)
         return resp, body['keypair']
 
diff --git a/tempest/services/nova/json/security_groups_client.py b/tempest/services/nova/json/security_groups_client.py
index 1f93fd4..9d482be 100644
--- a/tempest/services/nova/json/security_groups_client.py
+++ b/tempest/services/nova/json/security_groups_client.py
@@ -42,18 +42,16 @@
             'description': description,
         }
         post_body = json.dumps({'security_group': post_body})
-        resp, body = self.post('os-security-groups',
-                                        post_body, self.headers)
+        resp, body = self.post('os-security-groups', post_body, self.headers)
         body = json.loads(body)
         return resp, body['security_group']
 
     def delete_security_group(self, security_group_id):
         """Deletes the provided Security Group"""
-        return self.delete('os-security-groups/%s'
-                                   % str(security_group_id))
+        return self.delete('os-security-groups/%s' % str(security_group_id))
 
     def create_security_group_rule(self, parent_group_id, ip_proto, from_port,
-                                      to_port, **kwargs):
+                                   to_port, **kwargs):
         """
         Creating a new security group rules.
         parent_group_id :ID of Security group
@@ -80,5 +78,4 @@
 
     def delete_security_group_rule(self, group_rule_id):
         """Deletes the provided Security Group rule"""
-        return self.delete('os-security-group-rules/%s'
-                                      % str(group_rule_id))
+        return self.delete('os-security-group-rules/%s' % str(group_rule_id))
diff --git a/tempest/services/nova/json/servers_client.py b/tempest/services/nova/json/servers_client.py
index 8773738..a18ebd2 100644
--- a/tempest/services/nova/json/servers_client.py
+++ b/tempest/services/nova/json/servers_client.py
@@ -40,10 +40,10 @@
         }
 
         for option in ['personality', 'adminPass', 'key_name',
-                        'security_groups', 'networks', 'user_data',
-                        'availability_zone', 'accessIPv4', 'accessIPv6',
-                        'min_count', 'max_count', ('metadata', 'meta'),
-                        ('OS-DCF:diskConfig', 'disk_config')]:
+                       'security_groups', 'networks', 'user_data',
+                       'availability_zone', 'accessIPv4', 'accessIPv6',
+                       'min_count', 'max_count', ('metadata', 'meta'),
+                       ('OS-DCF:diskConfig', 'disk_config')]:
             if isinstance(option, tuple):
                 post_param = option[0]
                 key = option[1]
@@ -86,7 +86,7 @@
 
         post_body = json.dumps({'server': post_body})
         resp, body = self.put("servers/%s" % str(server_id),
-                                     post_body, self.headers)
+                              post_body, self.headers)
         body = json.loads(body)
         return resp, body['server']
 
@@ -180,7 +180,7 @@
     def list_addresses_by_network(self, server_id, network_id):
         """Lists all addresses of a specific network type for a server"""
         resp, body = self.get("servers/%s/ips/%s" %
-                                    (str(server_id), network_id))
+                              (str(server_id), network_id))
         body = json.loads(body)
         return resp, body
 
@@ -194,7 +194,7 @@
 
         post_body = json.dumps(post_body)
         return self.post('servers/%s/action' % str(server_id),
-                                post_body, self.headers)
+                         post_body, self.headers)
 
     def reboot(self, server_id, reboot_type):
         """Reboots a server"""
@@ -206,7 +206,7 @@
 
         post_body = json.dumps(post_body)
         return self.post('servers/%s/action' % str(server_id),
-                                post_body, self.headers)
+                         post_body, self.headers)
 
     def rebuild(self, server_id, image_ref, name=None, meta=None,
                 personality=None, adminPass=None, disk_config=None):
@@ -231,9 +231,8 @@
             post_body['OS-DCF:diskConfig'] = disk_config
 
         post_body = json.dumps({'rebuild': post_body})
-        resp, body = self.post('servers/%s/action' %
-                                      str(server_id), post_body,
-                                      self.headers)
+        resp, body = self.post('servers/%s/action' % str(server_id),
+                               post_body, self.headers)
         body = json.loads(body)
         return resp, body['server']
 
@@ -249,8 +248,8 @@
             post_body['resize']['OS-DCF:diskConfig'] = disk_config
 
         post_body = json.dumps(post_body)
-        resp, body = self.post('servers/%s/action' %
-                                      str(server_id), post_body, self.headers)
+        resp, body = self.post('servers/%s/action' % str(server_id),
+                               post_body, self.headers)
         return resp, body
 
     def confirm_resize(self, server_id):
@@ -260,8 +259,8 @@
         }
 
         post_body = json.dumps(post_body)
-        resp, body = self.post('servers/%s/action' %
-                                      str(server_id), post_body, self.headers)
+        resp, body = self.post('servers/%s/action' % str(server_id),
+                               post_body, self.headers)
         return resp, body
 
     def revert_resize(self, server_id):
@@ -271,8 +270,8 @@
         }
 
         post_body = json.dumps(post_body)
-        resp, body = self.post('servers/%s/action' %
-                                      str(server_id), post_body, self.headers)
+        resp, body = self.post('servers/%s/action' % str(server_id),
+                               post_body, self.headers)
         return resp, body
 
     def create_image(self, server_id, image_name):
@@ -284,8 +283,8 @@
         }
 
         post_body = json.dumps(post_body)
-        resp, body = self.post('servers/%s/action' %
-                                      str(server_id), post_body, self.headers)
+        resp, body = self.post('servers/%s/action' % str(server_id),
+                               post_body, self.headers)
         return resp, body
 
     def list_server_metadata(self, server_id):
@@ -295,35 +294,33 @@
 
     def set_server_metadata(self, server_id, meta):
         post_body = json.dumps({'metadata': meta})
-        resp, body = self.put('servers/%s/metadata' %
-                                     str(server_id), post_body, self.headers)
+        resp, body = self.put('servers/%s/metadata' % str(server_id),
+                              post_body, self.headers)
         body = json.loads(body)
         return resp, body['metadata']
 
     def update_server_metadata(self, server_id, meta):
         post_body = json.dumps({'metadata': meta})
-        resp, body = self.post('servers/%s/metadata' %
-                                     str(server_id), post_body, self.headers)
+        resp, body = self.post('servers/%s/metadata' % str(server_id),
+                               post_body, self.headers)
         body = json.loads(body)
         return resp, body['metadata']
 
     def get_server_metadata_item(self, server_id, key):
-        resp, body = self.get("servers/%s/metadata/%s" %
-                                    (str(server_id), key))
+        resp, body = self.get("servers/%s/metadata/%s" % (str(server_id), key))
         body = json.loads(body)
         return resp, body['meta']
 
     def set_server_metadata_item(self, server_id, key, meta):
         post_body = json.dumps({'meta': meta})
-        resp, body = self.put('servers/%s/metadata/%s' %
-                                    (str(server_id), key),
-                                    post_body, self.headers)
+        resp, body = self.put('servers/%s/metadata/%s' % (str(server_id), key),
+                              post_body, self.headers)
         body = json.loads(body)
         return resp, body['meta']
 
     def delete_server_metadata_item(self, server_id, key):
         resp, body = self.delete("servers/%s/metadata/%s" %
-                                    (str(server_id), key))
+                                 (str(server_id), key))
         return resp, body
 
     def stop(self, server_id):
@@ -363,7 +360,7 @@
         }
         post_body = json.dumps(post_body)
         return self.post('servers/%s/action' % server_id,
-                                post_body, self.headers)
+                         post_body, self.headers)
 
     def remove_security_group(self, server_id, security_group_name):
         """Removes a security group from the server"""
@@ -374,4 +371,4 @@
         }
         post_body = json.dumps(post_body)
         return self.post('servers/%s/action' % server_id,
-                                post_body, self.headers)
+                         post_body, self.headers)
diff --git a/tempest/services/nova/xml/servers_client.py b/tempest/services/nova/xml/servers_client.py
index 27eb10b..9df53da 100644
--- a/tempest/services/nova/xml/servers_client.py
+++ b/tempest/services/nova/xml/servers_client.py
@@ -241,8 +241,9 @@
 
     def list_addresses_by_network(self, server_id, network_id):
         """Lists all addresses of a specific network type for a server"""
-        resp, body = self.get("servers/%s/ips/%s" %
-                                    (str(server_id), network_id), self.headers)
+        resp, body = self.get("servers/%s/ips/%s" % (str(server_id),
+                                                     network_id),
+                              self.headers)
         network = self._parse_network(etree.fromstring(body))
 
         return resp, network
diff --git a/tempest/services/volume/xml/volumes_client.py b/tempest/services/volume/xml/volumes_client.py
index 8bb8bff..d05e85b 100644
--- a/tempest/services/volume/xml/volumes_client.py
+++ b/tempest/services/volume/xml/volumes_client.py
@@ -96,9 +96,7 @@
         :param display_name: Optional Volume Name.
         :param metadata: An optional dictionary of values for metadata.
         """
-        volume = Element("volume",
-                          xmlns=XMLNS_11,
-                          size=size)
+        volume = Element("volume", xmlns=XMLNS_11, size=size)
         if display_name:
             volume.add_attr('display_name', display_name)
 
diff --git a/tempest/tests/compute/admin/test_flavors.py b/tempest/tests/compute/admin/test_flavors.py
index 9c38ff4..dc9248d 100644
--- a/tempest/tests/compute/admin/test_flavors.py
+++ b/tempest/tests/compute/admin/test_flavors.py
@@ -140,7 +140,7 @@
 
 
 class FlavorsAdminTestJSON(base.BaseComputeAdminTestJSON,
-                            FlavorsAdminTestBase):
+                           FlavorsAdminTestBase):
 
     @classmethod
     def setUpClass(cls):
diff --git a/tempest/tests/compute/test_authorization.py b/tempest/tests/compute/test_authorization.py
index b9d1051..3f2feec 100644
--- a/tempest/tests/compute/test_authorization.py
+++ b/tempest/tests/compute/test_authorization.py
@@ -179,7 +179,7 @@
     def test_create_server_with_unauthorized_image(self):
         """Server creation with another user's image should fail"""
         self.alt_client.create_server('test', self.image['id'],
-                                         self.flavor_ref)
+                                      self.flavor_ref)
 
     @raises(exceptions.BadRequest)
     @attr(type='negative')
@@ -193,7 +193,7 @@
             # Change the base URL to impersonate another user
             self.alt_client.base_url = self.client.base_url
             self.alt_client.create_server('test', self.image['id'],
-                                                    self.flavor_ref)
+                                          self.flavor_ref)
         finally:
             # Reset the base_url...
             self.alt_client.base_url = saved_base_url
@@ -337,8 +337,7 @@
     def test_set_metadata_of_alt_account_server_fails(self):
         """ A set metadata for another user's server should fail """
         req_metadata = {'meta1': 'data1', 'meta2': 'data2'}
-        self.alt_client.set_server_metadata(self.server['id'],
-                                              req_metadata)
+        self.alt_client.set_server_metadata(self.server['id'], req_metadata)
 
     @raises(exceptions.NotFound)
     @attr(type='negative')
@@ -346,18 +345,17 @@
         """ A set metadata for another user's image should fail """
         req_metadata = {'meta1': 'value1', 'meta2': 'value2'}
         self.alt_images_client.set_image_metadata(self.image['id'],
-                                                    req_metadata)
+                                                  req_metadata)
 
     @attr(type='negative')
     def test_get_metadata_of_alt_account_server_fails(self):
         """ A get metadata for another user's server should fail """
         req_metadata = {'meta1': 'data1'}
-        self.client.set_server_metadata(self.server['id'],
-                                              req_metadata)
+        self.client.set_server_metadata(self.server['id'], req_metadata)
         try:
             resp, meta = \
             self.alt_client.get_server_metadata_item(self.server['id'],
-                                                        'meta1')
+                                                     'meta1')
         except exceptions.NotFound:
             pass
         finally:
@@ -373,7 +371,7 @@
         try:
             resp, meta = \
             self.alt_images_client.get_image_metadata_item(self.image['id'],
-                                                              'meta1')
+                                                           'meta1')
         except exceptions.NotFound:
             pass
         finally:
@@ -384,8 +382,7 @@
     def test_delete_metadata_of_alt_account_server_fails(self):
         """ A delete metadata for another user's server should fail """
         req_metadata = {'meta1': 'data1'}
-        self.client.set_server_metadata(self.server['id'],
-                                              req_metadata)
+        self.client.set_server_metadata(self.server['id'], req_metadata)
         try:
             resp, body = \
             self.alt_client.delete_server_metadata_item(self.server['id'],
@@ -411,7 +408,7 @@
         finally:
             resp, body = \
             self.images_client.delete_image_metadata_item(self.image['id'],
-                                                            'meta1')
+                                                          'meta1')
 
     @raises(exceptions.NotFound)
     @attr(type='negative')
@@ -420,4 +417,4 @@
         A Get Console Output for another user's server should fail
         """
         self.alt_console_outputs_client.get_console_output(self.server['id'],
-                                                                    10)
+                                                           10)
diff --git a/tempest/tests/compute/test_console_output.py b/tempest/tests/compute/test_console_output.py
index 4503017..b08dcc2 100644
--- a/tempest/tests/compute/test_console_output.py
+++ b/tempest/tests/compute/test_console_output.py
@@ -78,11 +78,11 @@
         try:
             resp, output = self.servers_client.reboot(self.server_id, 'SOFT')
             self.servers_client.wait_for_server_status(self.server_id,
-                                                        'REBOOT')
+                                                       'REBOOT')
             resp, server = self.servers_client.get_server(self.server_id)
             if (server['status'] == 'REBOOT'):
                 resp, output = self.client.get_console_output(self.server_id,
-                                                                10)
+                                                              10)
                 self.assertEqual(200, resp.status)
                 self.assertNotEqual(output, None)
                 lines = len(output.split('\n'))
@@ -91,4 +91,4 @@
                 self.fail("Could not capture instance in Reboot status")
         finally:
             self.servers_client.wait_for_server_status(self.server_id,
-                                                        'ACTIVE')
+                                                       'ACTIVE')
diff --git a/tempest/tests/compute/test_floating_ips_actions.py b/tempest/tests/compute/test_floating_ips_actions.py
index 2b01bca..7d30eeb 100644
--- a/tempest/tests/compute/test_floating_ips_actions.py
+++ b/tempest/tests/compute/test_floating_ips_actions.py
@@ -89,8 +89,8 @@
         #Creating the floating IP that is to be deleted in this method
         resp, floating_ip_body = self.client.create_floating_ip()
         #Storing the details of floating IP before deleting it
-        resp, floating_ip_details = \
-                self.client.get_floating_ip_details(floating_ip_body['id'])
+        cli_resp = self.client.get_floating_ip_details(floating_ip_body['id'])
+        resp, floating_ip_details = cli_resp
         #Deleting the floating IP from the project
         resp, body = self.client.delete_floating_ip(floating_ip_body['id'])
         self.assertEqual(202, resp.status)
@@ -171,8 +171,8 @@
         """
         #Create server so as to use for Multiple association
         resp, body = self.servers_client.create_server('floating-server2',
-                                                        self.image_ref,
-                                                        self.flavor_ref)
+                                                       self.image_ref,
+                                                       self.flavor_ref)
         self.servers_client.wait_for_server_status(body['id'], 'ACTIVE')
         self.new_server_id = body['id']
 
@@ -222,8 +222,7 @@
                       ' with out passing floating IP  should raise BadRequest')
 
 
-class FloatingIPsTestJSON(base.BaseComputeTestJSON,
-                            FloatingIPsTestBase):
+class FloatingIPsTestJSON(base.BaseComputeTestJSON, FloatingIPsTestBase):
     @classmethod
     def setUpClass(cls):
         super(FloatingIPsTestJSON, cls).setUpClass()
@@ -235,8 +234,7 @@
         super(FloatingIPsTestJSON, cls).tearDownClass()
 
 
-class FloatingIPsTestXML(base.BaseComputeTestXML,
-                            FloatingIPsTestBase):
+class FloatingIPsTestXML(base.BaseComputeTestXML, FloatingIPsTestBase):
     @classmethod
     def setUpClass(cls):
         super(FloatingIPsTestXML, cls).setUpClass()
diff --git a/tempest/tests/compute/test_image_metadata.py b/tempest/tests/compute/test_image_metadata.py
index 1de277a..1ac7de7 100644
--- a/tempest/tests/compute/test_image_metadata.py
+++ b/tempest/tests/compute/test_image_metadata.py
@@ -134,8 +134,7 @@
     def test_get_nonexistant_image_metadata_item(self):
         """Negative test: Get on nonexistant image should not happen"""
         try:
-            resp, metadata = self.client.get_image_metadata_item(999,
-                                                                    'key2')
+            resp, metadata = self.client.get_image_metadata_item(999, 'key2')
         except exceptions.NotFound:
             pass
         else:
@@ -158,8 +157,7 @@
         nonexistant image"""
         meta = {'key1': 'alt'}
         try:
-            resp, body = self.client.set_image_metadata_item(999,
-                                                             'key1', meta)
+            resp, body = self.client.set_image_metadata_item(999, 'key1', meta)
             resp, metadata = self.client.list_image_metadata(999)
         except exceptions.NotFound:
             pass
@@ -171,8 +169,7 @@
         """Negative test: Shouldnt be able to delete metadata
                           item from nonexistant image"""
         try:
-            resp, body = self.client.delete_image_metadata_item(999,
-                                                                 'key1')
+            resp, body = self.client.delete_image_metadata_item(999, 'key1')
             resp, metadata = self.client.list_image_metadata(999)
         except exceptions.NotFound:
             pass
diff --git a/tempest/tests/compute/test_images.py b/tempest/tests/compute/test_images.py
index 9101f14..5937811 100644
--- a/tempest/tests/compute/test_images.py
+++ b/tempest/tests/compute/test_images.py
@@ -120,8 +120,8 @@
             if (resp['status'] is not None):
                 image_id = parse_image_id(resp['location'])
                 resp, _ = self.client.delete_image(image_id)
-                self.fail("An image should not be created"
-                            " with invalid server id")
+                self.fail("An image should not be created "
+                          "with invalid server id")
 
     @attr(type='negative')
     @unittest.skipUnless(compute.MULTI_USER, 'Second user not configured')
@@ -282,8 +282,8 @@
             pass
 
         else:
-            self.fail("DELETE image request should rasie NotFound exception"
-                        "when requested with invalid image")
+            self.fail("DELETE image request should rasie NotFound exception "
+                      "when requested with invalid image")
 
     @attr(type='negative')
     def test_delete_non_existent_image(self):
diff --git a/tempest/tests/compute/test_keypairs.py b/tempest/tests/compute/test_keypairs.py
index 2426182..95520b5 100644
--- a/tempest/tests/compute/test_keypairs.py
+++ b/tempest/tests/compute/test_keypairs.py
@@ -94,8 +94,8 @@
             self.assertTrue(public_key is not None,
                             "Field public_key is empty or not found.")
         except:
-            self.fail("GET keypair details requested by keypair name"
-                        " has failed")
+            self.fail("GET keypair details requested by keypair name "
+                      "has failed")
         finally:
             resp, _ = self.client.delete_keypair(k_name)
             self.assertEqual(202, resp.status)
diff --git a/tempest/tests/compute/test_security_groups.py b/tempest/tests/compute/test_security_groups.py
index 14e8ad0..81e84ce 100644
--- a/tempest/tests/compute/test_security_groups.py
+++ b/tempest/tests/compute/test_security_groups.py
@@ -49,9 +49,9 @@
             missing_sgs =\
             [sg for sg in security_group_list if sg not in fetched_list]
             self.assertFalse(missing_sgs,
-                             "Failed to find Security Group %s in fetched list"
-                             % ', '.join(m_group['name']
-                                            for m_group in missing_sgs))
+                             "Failed to find Security Group %s in fetched "
+                             "list" % ', '.join(m_group['name']
+                                                for m_group in missing_sgs))
         finally:
             #Delete all the Security Groups created in this method
             for securitygroup in security_group_list:
@@ -252,7 +252,7 @@
             pass
         else:
             self.fail('Should not be able to delete a Security Group'
-                        'with out passing ID')
+                      'with out passing ID')
 
     def test_server_security_groups(self):
         """
diff --git a/tempest/tests/compute/test_server_personality.py b/tempest/tests/compute/test_server_personality.py
index e204130..a570aec 100644
--- a/tempest/tests/compute/test_server_personality.py
+++ b/tempest/tests/compute/test_server_personality.py
@@ -57,8 +57,8 @@
             name = rand_name('server')
             file_contents = 'This is a test file.'
 
-            resp, max_file_limit = self.user_client.\
-                    get_personality_file_limit()
+            cli_resp = self.user_client.get_personality_file_limit()
+            resp, max_file_limit = cli_resp
             self.assertEqual(200, resp.status)
 
             personality = []
@@ -83,7 +83,7 @@
 
 
 class ServerPersonalityTestXML(base.BaseComputeTestXML,
-                                ServerPersonalityTestBase):
+                               ServerPersonalityTestBase):
     @classmethod
     def setUpClass(cls):
         cls._interface = "xml"
diff --git a/tempest/tests/compute/test_servers_negative.py b/tempest/tests/compute/test_servers_negative.py
index 3d16ce4..fb88d1e 100644
--- a/tempest/tests/compute/test_servers_negative.py
+++ b/tempest/tests/compute/test_servers_negative.py
@@ -58,9 +58,9 @@
 
         try:
             resp, server = self.client.create_server('test',
-                                                      self.image_ref,
-                                                      self.flavor_ref,
-                                                      personality=personality)
+                                                     self.image_ref,
+                                                     self.flavor_ref,
+                                                     personality=personality)
         except exceptions.BadRequest:
             pass
         else:
diff --git a/tempest/tests/compute/test_volumes_list.py b/tempest/tests/compute/test_volumes_list.py
index 3f03996..2c09add 100644
--- a/tempest/tests/compute/test_volumes_list.py
+++ b/tempest/tests/compute/test_volumes_list.py
@@ -37,13 +37,14 @@
         resp, fetched_list = self.client.list_volumes()
         self.assertEqual(200, resp.status)
         # Now check if all the Volumes created in setup are in fetched list
-        missing_volumes = \
-                [v for v in self.volume_list if v not in fetched_list]
+        missing_volumes = [
+            v for v in self.volume_list if v not in fetched_list
+        ]
 
         self.assertFalse(missing_volumes,
-                         "Failed to find volume %s in fetched list"
-                         % ', '.join(m_vol['displayName']
-                                        for m_vol in missing_volumes))
+                         "Failed to find volume %s in fetched list" %
+                         ', '.join(m_vol['displayName']
+                                   for m_vol in missing_volumes))
 
     def test_volume_list_with_details(self):
         """Should return the list of Volumes with details"""
@@ -51,13 +52,14 @@
         resp, fetched_list = self.client.list_volumes_with_detail()
         self.assertEqual(200, resp.status)
         #Now check if all the Volumes created in setup are in fetched list
-        missing_volumes = \
-                [v for v in self.volume_list if v not in fetched_list]
+        missing_volumes = [
+            v for v in self.volume_list if v not in fetched_list
+        ]
 
         self.assertFalse(missing_volumes,
-                         "Failed to find volume %s in fetched list"
-                         % ', '.join(m_vol['displayName']
-                                        for m_vol in missing_volumes))
+                         "Failed to find volume %s in fetched list" %
+                         ', '.join(m_vol['displayName']
+                                   for m_vol in missing_volumes))
 
 
 class VolumesTestXML(base.BaseComputeTestXML, VolumesTestBase):
@@ -77,8 +79,7 @@
                 resp, volume = cls.client.create_volume(size=1,
                                                         display_name=v_name,
                                                         metadata=metadata)
-                cls.client.wait_for_volume_status(volume['id'],
-                                                   'available')
+                cls.client.wait_for_volume_status(volume['id'], 'available')
                 resp, volume = cls.client.get_volume(volume['id'])
                 cls.volume_list.append(volume)
                 cls.volume_id_list.append(volume['id'])
@@ -124,8 +125,7 @@
                 resp, volume = cls.client.create_volume(size=1,
                                                         display_name=v_name,
                                                         metadata=metadata)
-                cls.client.wait_for_volume_status(volume['id'],
-                                                   'available')
+                cls.client.wait_for_volume_status(volume['id'], 'available')
                 resp, volume = cls.client.get_volume(volume['id'])
                 cls.volume_list.append(volume)
                 cls.volume_id_list.append(volume['id'])
diff --git a/tempest/tests/compute/test_volumes_negative.py b/tempest/tests/compute/test_volumes_negative.py
index 5c93f07..fa14640 100644
--- a/tempest/tests/compute/test_volumes_negative.py
+++ b/tempest/tests/compute/test_volumes_negative.py
@@ -138,7 +138,7 @@
 
 
 class VolumesNegativeTestXML(base.BaseComputeTestXML,
-                                VolumesNegativeTestBase):
+                             VolumesNegativeTestBase):
     @classmethod
     def setUpClass(cls):
         cls._interface = "xml"
@@ -147,7 +147,7 @@
 
 
 class VolumesNegativeTestJSON(base.BaseComputeTestJSON,
-                                VolumesNegativeTestBase):
+                              VolumesNegativeTestBase):
     @classmethod
     def setUpClass(cls):
         cls._interface = "json"
diff --git a/tempest/tests/identity/admin/test_roles.py b/tempest/tests/identity/admin/test_roles.py
index 063efed..637cee5 100644
--- a/tempest/tests/identity/admin/test_roles.py
+++ b/tempest/tests/identity/admin/test_roles.py
@@ -273,7 +273,7 @@
 
 
 class UserRolesTestXML(RolesTestXML,
-                        UserRolesTestBase):
+                       UserRolesTestBase):
 
     @classmethod
     def setUpClass(cls):
diff --git a/tempest/tests/identity/admin/test_tenants.py b/tempest/tests/identity/admin/test_tenants.py
index 00f37f2..1b4ec18 100644
--- a/tempest/tests/identity/admin/test_tenants.py
+++ b/tempest/tests/identity/admin/test_tenants.py
@@ -261,8 +261,7 @@
         TenantsTestBase.setUpClass(cls)
 
 
-class TenantsTestXML(base.BaseIdentityAdminTestXML,
-                      TenantsTestBase):
+class TenantsTestXML(base.BaseIdentityAdminTestXML, TenantsTestBase):
 
     @classmethod
     def setUpClass(cls):
diff --git a/tempest/tests/identity/admin/test_users.py b/tempest/tests/identity/admin/test_users.py
index 43255dd..a724ce9 100644
--- a/tempest/tests/identity/admin/test_users.py
+++ b/tempest/tests/identity/admin/test_users.py
@@ -118,8 +118,8 @@
         # Delete the token from database
         self.client.delete_token(token)
         self.assertRaises(exceptions.Unauthorized, self.client.create_user,
-                            self.alt_user, self.alt_password,
-                            self.data.tenant['id'], self.alt_email)
+                          self.alt_user, self.alt_password,
+                          self.data.tenant['id'], self.alt_email)
 
         # Unset the token to allow further tests to generate a new token
         self.client.clear_auth()
@@ -230,7 +230,7 @@
         self.data.setup_test_user()
         resp, users = self.client.get_users()
         self.assertIn(self.data.test_user, [u['name'] for u in users],
-                        "Could not find %s" % self.data.test_user)
+                      "Could not find %s" % self.data.test_user)
 
     @attr(type='negative')
     def test_get_users_by_unauthorized_user(self):
@@ -272,8 +272,8 @@
         missing_users =\
             [user for user in user_ids if user not in fetched_user_ids]
         self.assertEqual(0, len(missing_users),
-                             "Failed to find user %s in fetched list"
-                             % ', '.join(m_user for m_user in missing_users))
+                         "Failed to find user %s in fetched list" %
+                         ', '.join(m_user for m_user in missing_users))
 
     @attr(type='positive')
     def test_list_users_with_roles_for_tenant(self):
@@ -304,8 +304,8 @@
         missing_users =\
             [user for user in user_ids if user not in fetched_user_ids]
         self.assertEqual(0, len(missing_users),
-                             "Failed to find user %s in fetched list"
-                             % ', '.join(m_user for m_user in missing_users))
+                         "Failed to find user %s in fetched list" %
+                         ', '.join(m_user for m_user in missing_users))
 
     @attr(type='negative')
     def test_list_users_with_invalid_tenant(self):
@@ -330,7 +330,7 @@
                 fail.append(invalid)
         if len(fail) != 0:
             self.fail('Should raise Not Found when list users with invalid'
-                          'tenant ids %s' % fail)
+                      'tenant ids %s' % fail)
 
 
 class UsersTestJSON(base.BaseIdentityAdminTestJSON,
@@ -340,8 +340,7 @@
         super(UsersTestJSON, cls).setUpClass()
 
 
-class UsersTestXML(base.BaseIdentityAdminTestXML,
-                    UsersTestBase):
+class UsersTestXML(base.BaseIdentityAdminTestXML, UsersTestBase):
     @classmethod
     def setUpClass(cls):
         super(UsersTestXML, cls).setUpClass()
diff --git a/tempest/tests/volume/base.py b/tempest/tests/volume/base.py
index 5b38dea..6af4bbf 100644
--- a/tempest/tests/volume/base.py
+++ b/tempest/tests/volume/base.py
@@ -57,7 +57,7 @@
         cls.volumes = {}
 
         skip_msg = ("%s skipped as Cinder endpoint is not available" %
-                                                            cls.__name__)
+                    cls.__name__)
         try:
             cls.volumes_client.keystone_auth(cls.os.username,
                                              cls.os.password,
diff --git a/tempest/tests/volume/test_volumes_actions.py b/tempest/tests/volume/test_volumes_actions.py
index 2b6028e..f76235d 100644
--- a/tempest/tests/volume/test_volumes_actions.py
+++ b/tempest/tests/volume/test_volumes_actions.py
@@ -70,8 +70,8 @@
         """Verify that a volume's attachment information is retrieved"""
         mountpoint = '/dev/vdc'
         resp, body = self.client.attach_volume(self.volume['id'],
-                                                   self.server['id'],
-                                                   mountpoint)
+                                               self.server['id'],
+                                               mountpoint)
         self.client.wait_for_volume_status(self.volume['id'], 'in-use')
         self.assertEqual(202, resp.status)
         try:
diff --git a/tempest/tests/volume/test_volumes_list.py b/tempest/tests/volume/test_volumes_list.py
index 6c6dac2..e9bafaf 100644
--- a/tempest/tests/volume/test_volumes_list.py
+++ b/tempest/tests/volume/test_volumes_list.py
@@ -41,9 +41,9 @@
         # Now check if all the volumes created in setup are in fetched list
         missing_vols = [v for v in self.volume_list if v not in fetched_list]
         self.assertFalse(missing_vols,
-                         "Failed to find volume %s in fetched list"
-                         % ', '.join(m_vol['display_name']
-                                        for m_vol in missing_vols))
+                         "Failed to find volume %s in fetched list" %
+                         ', '.join(m_vol['display_name']
+                                   for m_vol in missing_vols))
 
     @attr(type='smoke')
     def test_volume_list_with_details(self):
@@ -54,9 +54,9 @@
         # Verify that all the volumes are returned
         missing_vols = [v for v in self.volume_list if v not in fetched_list]
         self.assertFalse(missing_vols,
-                         "Failed to find volume %s in fetched list"
-                         % ', '.join(m_vol['display_name']
-                                        for m_vol in missing_vols))
+                         "Failed to find volume %s in fetched list" %
+                         ', '.join(m_vol['display_name']
+                                   for m_vol in missing_vols))
 
 
 class VolumeListTestXML(base.BaseVolumeTestXML, VolumesListTestBase):
@@ -76,8 +76,7 @@
                 resp, volume = cls.client.create_volume(size=1,
                                                         display_name=v_name,
                                                         metadata=metadata)
-                cls.client.wait_for_volume_status(volume['id'],
-                                                   'available')
+                cls.client.wait_for_volume_status(volume['id'], 'available')
                 resp, volume = cls.client.get_volume(volume['id'])
                 cls.volume_list.append(volume)
                 cls.volume_id_list.append(volume['id'])
@@ -123,8 +122,7 @@
                 resp, volume = cls.client.create_volume(size=1,
                                                         display_name=v_name,
                                                         metadata=metadata)
-                cls.client.wait_for_volume_status(volume['id'],
-                                                   'available')
+                cls.client.wait_for_volume_status(volume['id'], 'available')
                 resp, volume = cls.client.get_volume(volume['id'])
                 cls.volume_list.append(volume)
                 cls.volume_id_list.append(volume['id'])
diff --git a/tox.ini b/tox.ini
index fe340c1..e9a82a8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -15,4 +15,4 @@
 
 [testenv:pep8]
 deps = pep8==1.3.3
-commands = pep8 --ignore=E121,E122,E123,E124,E125,E126,E127 --repeat --show-source --exclude=.venv,.tox,dist,doc,openstack,kong .
+commands = pep8 --ignore=E121,E122,E123,E124,E125,E126 --repeat --show-source --exclude=.venv,.tox,dist,doc,openstack,kong .