diff --git a/tempest/common/rest_client.py b/tempest/common/rest_client.py
index 325d56b..276696e 100644
--- a/tempest/common/rest_client.py
+++ b/tempest/common/rest_client.py
@@ -93,7 +93,8 @@
             management_url = service_url + tenant_id
             return token, management_url
         elif resp.status == 401:
-            raise exceptions.AuthenticationFailure(user=user, password=api_key)
+            raise exceptions.AuthenticationFailure(user=user,
+                                                   password=password)
 
     def post(self, url, body, headers):
         return self.request('POST', url, headers, body)
diff --git a/tempest/tests/test_images.py b/tempest/tests/test_images.py
index c422708..8217d2a 100644
--- a/tempest/tests/test_images.py
+++ b/tempest/tests/test_images.py
@@ -7,8 +7,8 @@
 
 
 def _parse_image_id(image_ref):
-    temp = image_ref.rsplit('/')
-    return temp[6]
+    temp = image_ref.rsplit('images/')
+    return temp[1]
 
 
 class ImagesTest(unittest.TestCase):