diff --git a/etc/tempest.conf.sample b/etc/tempest.conf.sample
index be05015..226fa30 100644
--- a/etc/tempest.conf.sample
+++ b/etc/tempest.conf.sample
@@ -73,6 +73,20 @@
 # This section contains configuration options used when executing tests
 # against the OpenStack Images API
 
+# The type of endpoint for an Image API service. Unless you have a
+# custom Keystone service catalog implementation, you probably want to leave
+# this value as "image"
+catalog_type = image
+
+# The version of the OpenStack Images API to use
+api_version = 1
+
+# This is the main host address of the Image API
+host = 127.0.0.1
+
+# Port that the Image API is running on
+port = 9292
+
 # This should be the username of a user WITHOUT administrative privileges
 username = {$USERNAME}
 # The above non-administrative user's password
diff --git a/etc/tempest.conf.tpl b/etc/tempest.conf.tpl
index 6710fd2..fcd6424 100644
--- a/etc/tempest.conf.tpl
+++ b/etc/tempest.conf.tpl
@@ -73,6 +73,20 @@
 # This section contains configuration options used when executing tests
 # against the OpenStack Images API
 
+# The type of endpoint for an Image API service. Unless you have a
+# custom Keystone service catalog implementation, you probably want to leave
+# this value as "image"
+catalog_type = %IMAGE_CATALOG_TYPE%
+
+# The version of the OpenStack Images API to use
+api_version = %IMAGE_API_VERSION%
+
+# This is the main host address of the Image API
+host = %IMAGE_HOST%
+
+# Port that the Image API is running on
+port = %IMAGE_PORT%
+
 # This should be the username of a user WITHOUT administrative privileges
 username = %USERNAME%
 # The above non-administrative user's password
diff --git a/tempest/services/image/service.py b/tempest/services/image/service.py
index 901e497..9cfe502 100644
--- a/tempest/services/image/service.py
+++ b/tempest/services/image/service.py
@@ -50,7 +50,8 @@
             }
             self._client = client.Client(config.images.host,
                                          config.images.port,
-                                         creds=creds)
+                                         creds=creds,
+                                         configure_via_auth=False)
         else:
             raise NotImplementedError