diff --git a/stress/test_server_actions.py b/stress/test_server_actions.py
index 5ba03e1..58350ac 100644
--- a/stress/test_server_actions.py
+++ b/stress/test_server_actions.py
@@ -103,9 +103,9 @@
         """
         # don't run reboot verification if target machine has been
         # deleted or is going to be deleted
+        target_id = self._target['id']
         if (self._target['id'] not in self._state.get_instances().keys() or
-            self._state.get_instances()[self._target['id']][1] ==
-            'TERMINATING'):
+            self._state.get_instances()[target_id][1] == 'TERMINATING'):
             self._logger.debug('machine %s is deleted or TERMINATING' %
                                self._target['id'])
             return True
diff --git a/stress/test_servers.py b/stress/test_servers.py
index 1a4b830..113e5cb 100644
--- a/stress/test_servers.py
+++ b/stress/test_servers.py
@@ -118,9 +118,9 @@
         """
         # don't run create verification
         # if target machine has been deleted or is going to be deleted
+        target_id = self._target['id']
         if (self._target['id'] not in self._state.get_instances().keys() or
-            self._state.get_instances()[self._target['id']][1] ==
-            'TERMINATING'):
+            self._state.get_instances()[target_id][1] == 'TERMINATING'):
             self._logger.info('machine %s is deleted or TERMINATING' %
                               self._target['id'])
             return True
@@ -299,9 +299,9 @@
         """
         # don't run update verification
         # if target machine has been deleted or is going to be deleted
+        target_id = self._target['id']
         if (not self._target['id'] in self._state.get_instances().keys() or
-            self._state.get_instances()[self._target['id']][1] ==
-            'TERMINATING'):
+            self._state.get_instances()[target_id][1] == 'TERMINATING'):
             return False
 
         response, body = \
diff --git a/tempest/common/rest_client.py b/tempest/common/rest_client.py
index ee972bf..71f887f 100644
--- a/tempest/common/rest_client.py
+++ b/tempest/common/rest_client.py
@@ -138,8 +138,8 @@
                     tenant_id = auth_data['token']['tenant']['id']
                     break
 
-                elif ep["type"] == service and ep['name'] == 'cinder' \
-                    and service == 'volume':
+                elif (ep["type"] == service and ep['name'] == 'cinder' and
+                      service == 'volume'):
                     mgmt_url = ep['endpoints'][self.region][self.endpoint_url]
                     tenant_id = auth_data['token']['tenant']['id']
                     break