diff --git a/doc/source/install/common_configure.rst b/doc/source/install/common_configure.rst
index cc6baece6..b689e642e 100644
--- a/doc/source/install/common_configure.rst
+++ b/doc/source/install/common_configure.rst
@@ -26,7 +26,7 @@
 
         [keystone_authtoken]
         ...
-        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/watcher/api/hooks.py b/watcher/api/hooks.py
index 8147e3968..6a398ab3f 100644
--- a/watcher/api/hooks.py
+++ b/watcher/api/hooks.py
@@ -63,7 +63,7 @@ class ContextHook(hooks.PecanHook):
         auth_url = headers.get('X-Auth-Url')
         if auth_url is None:
             importutils.import_module('keystonemiddleware.auth_token')
-            auth_url = cfg.CONF.keystone_authtoken.auth_uri
+            auth_url = cfg.CONF.keystone_authtoken.www_authenticate_uri
 
         state.request.context = context.make_context(
             auth_token=auth_token,
diff --git a/watcher/tests/api/test_hooks.py b/watcher/tests/api/test_hooks.py
index 34df0cbca..6e73700b6 100644
--- a/watcher/tests/api/test_hooks.py
+++ b/watcher/tests/api/test_hooks.py
@@ -222,7 +222,7 @@ class TestContextHook(base.FunctionalTest):
             user_id=headers['X-User-Id'],
             domain_id=headers['X-User-Domain-Id'],
             domain_name=headers['X-User-Domain-Name'],
-            auth_url=cfg.CONF.keystone_authtoken.auth_uri,
+            auth_url=cfg.CONF.keystone_authtoken.www_authenticate_uri,
             project=headers['X-Project-Name'],
             project_id=headers['X-Project-Id'],
             show_deleted=None,
@@ -243,7 +243,7 @@ class TestContextHook(base.FunctionalTest):
             user_id=headers['X-User-Id'],
             domain_id=headers['X-User-Domain-Id'],
             domain_name=headers['X-User-Domain-Name'],
-            auth_url=cfg.CONF.keystone_authtoken.auth_uri,
+            auth_url=cfg.CONF.keystone_authtoken.www_authenticate_uri,
             project=headers['X-Project-Name'],
             project_id=headers['X-Project-Id'],
             show_deleted=None,
@@ -265,7 +265,7 @@ class TestContextHook(base.FunctionalTest):
             user_id=headers['X-User-Id'],
             domain_id=headers['X-User-Domain-Id'],
             domain_name=headers['X-User-Domain-Name'],
-            auth_url=cfg.CONF.keystone_authtoken.auth_uri,
+            auth_url=cfg.CONF.keystone_authtoken.www_authenticate_uri,
             project=headers['X-Project-Name'],
             project_id=headers['X-Project-Id'],
             show_deleted=None,
diff --git a/watcher/tests/base.py b/watcher/tests/base.py
index fc5708107..200484266 100644
--- a/watcher/tests/base.py
+++ b/watcher/tests/base.py
@@ -60,7 +60,8 @@ class TestCase(BaseTestCase):
 
         cfg.CONF.set_override("auth_type", "admin_token",
                               group='keystone_authtoken')
-        cfg.CONF.set_override("auth_uri", "http://127.0.0.1/identity",
+        cfg.CONF.set_override("www_authenticate_uri",
+                              "http://127.0.0.1/identity",
                               group='keystone_authtoken')
 
         app_config_path = os.path.join(os.path.dirname(__file__), 'config.py')