diff --git a/doc/source/install/common/controller-node-common-configuration.rst b/doc/source/install/common/controller-node-common-configuration.rst
index 877c2442d4..733371678e 100644
--- a/doc/source/install/common/controller-node-common-configuration.rst
+++ b/doc/source/install/common/controller-node-common-configuration.rst
@@ -46,7 +46,7 @@
         [keystone_authtoken]
         ...
         memcached_servers = controller:11211
-        auth_uri = http://controller:5000
+        www_authenticate_uri = http://controller:5000
         auth_url = http://controller:35357
         auth_type = password
         project_domain_name = Default
diff --git a/doc/source/install/common/dhss-true-mode-configuration.rst b/doc/source/install/common/dhss-true-mode-configuration.rst
index 23b9da5972..2ea4552150 100644
--- a/doc/source/install/common/dhss-true-mode-configuration.rst
+++ b/doc/source/install/common/dhss-true-mode-configuration.rst
@@ -27,7 +27,7 @@ Configure components
         [neutron]
         ...
         url = http://controller:9696
-        auth_uri = http://controller:5000
+        www_authenticate_uri = http://controller:5000
         auth_url = http://controller:35357
         memcached_servers = controller:11211
         auth_type = password
@@ -40,7 +40,7 @@ Configure components
 
         [nova]
         ...
-        auth_uri = http://controller:5000
+        www_authenticate_uri = http://controller:5000
         auth_url = http://controller:35357
         memcached_servers = controller:11211
         auth_type = password
@@ -53,7 +53,7 @@ Configure components
 
         [cinder]
         ...
-        auth_uri = http://controller:5000
+        www_authenticate_uri = http://controller:5000
         auth_url = http://controller:35357
         memcached_servers = controller:11211
         auth_type = password
diff --git a/doc/source/install/common/share-node-common-configuration.rst b/doc/source/install/common/share-node-common-configuration.rst
index 2d0c838a06..3df498703a 100644
--- a/doc/source/install/common/share-node-common-configuration.rst
+++ b/doc/source/install/common/share-node-common-configuration.rst
@@ -43,7 +43,7 @@
         [keystone_authtoken]
         ...
         memcached_servers = controller:11211
-        auth_uri = http://controller:5000
+        www_authenticate_uri = http://controller:5000
         auth_url = http://controller:35357
         auth_type = password
         project_domain_name = Default
diff --git a/manila/tests/integrated/api/client.py b/manila/tests/integrated/api/client.py
index 6ae994642b..d7fee8e6e4 100644
--- a/manila/tests/integrated/api/client.py
+++ b/manila/tests/integrated/api/client.py
@@ -71,12 +71,12 @@ class TestOpenStackClient(object):
 
     """
 
-    def __init__(self, auth_user, auth_key, auth_uri):
+    def __init__(self, auth_user, auth_key, www_authenticate_uri):
         super(TestOpenStackClient, self).__init__()
         self.auth_result = None
         self.auth_user = auth_user
         self.auth_key = auth_key
-        self.auth_uri = auth_uri
+        self.www_authenticate_uri = www_authenticate_uri
         # default project_id
         self.project_id = 'openstack'
 
@@ -114,16 +114,17 @@ class TestOpenStackClient(object):
         if self.auth_result:
             return self.auth_result
 
-        auth_uri = self.auth_uri
+        www_authenticate_uri = self.www_authenticate_uri
         headers = {'X-Auth-User': self.auth_user,
                    'X-Auth-Key': self.auth_key,
                    'X-Auth-Project-Id': self.project_id}
-        response = self.request(auth_uri,
+        response = self.request(www_authenticate_uri,
                                 headers=headers)
 
         http_status = response.status
-        LOG.debug("%(auth_uri)s => code %(http_status)s.",
-                  {"auth_uri": auth_uri, "http_status": http_status})
+        LOG.debug("%(www_authenticate_uri)s => code %(http_status)s.",
+                  {"www_authenticate_uri": www_authenticate_uri,
+                   "http_status": http_status})
 
         if http_status == 401:
             raise OpenStackApiAuthenticationException(response=response)