diff --git a/tempest/tests/test_list_servers.py b/tempest/tests/test_list_servers.py
index 8917f48..a39069e 100644
--- a/tempest/tests/test_list_servers.py
+++ b/tempest/tests/test_list_servers.py
@@ -25,18 +25,15 @@
         images_client = cls.os.images_client
         resp, images = images_client.list_images()
 
-        if any([image for image in images
-                if image['id'] == cls.image_ref_alt]):
+        if cls.image_ref != cls.image_ref_alt and \
+            any([image for image in images
+                 if image['id'] == cls.image_ref_alt]):
             cls.multiple_images = True
         else:
             cls.image_ref_alt = cls.image_ref
 
         # Do some sanity checks here. If one of the images does
-        # not exist, or image_ref and image_ref_alt are the same,
-        # fail early since the tests won't work...
-        if cls.image_ref != cls.image_ref_alt:
-            cls.image_ref_alt_different = True
-
+        # not exist, fail early since the tests won't work...
         try:
             cls.images_client.get_image(cls.image_ref)
         except exceptions.NotFound:
diff --git a/tempest/tests/utils.py b/tempest/tests/utils.py
index 67fcfdd..8adaa51 100644
--- a/tempest/tests/utils.py
+++ b/tempest/tests/utils.py
@@ -62,7 +62,7 @@
                                "or False") % attr
 
     def __call__(self, func):
-        def _skipper(*args, **kwargs):
+        def _skipper(*args, **kw):
             """Wrapped skipper function."""
             testobj = args[0]
             if not getattr(testobj, self.attr, False):