diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 00165b68..d465fce3 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -113,7 +113,7 @@ function configure_masakari {
 
     # Set os_privileged_user credentials (used for connecting nova service)
     iniset $MASAKARI_CONF DEFAULT os_privileged_user_name nova
-    iniset $MASAKARI_CONF DEFAULT os_privileged_user_auth_url "${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_AUTH_HOST}/identity_admin"
+    iniset $MASAKARI_CONF DEFAULT os_privileged_user_auth_url "${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_AUTH_HOST}/identity"
     iniset $MASAKARI_CONF DEFAULT os_privileged_user_password "$SERVICE_PASSWORD"
     iniset $MASAKARI_CONF DEFAULT os_privileged_user_tenant "$SERVICE_PROJECT_NAME"
     iniset $MASAKARI_CONF DEFAULT graceful_shutdown_timeout "$SERVICE_GRACEFUL_SHUTDOWN_TIMEOUT"
diff --git a/masakari/tests/unit/compute/test_nova.py b/masakari/tests/unit/compute/test_nova.py
index cd17ed86..171a7869 100644
--- a/masakari/tests/unit/compute/test_nova.py
+++ b/masakari/tests/unit/compute/test_nova.py
@@ -40,7 +40,7 @@ class NovaClientTestCase(test.TestCase):
         self.override_config('os_privileged_user_name', 'adminuser')
         self.override_config('os_privileged_user_password', 'strongpassword')
         self.override_config('os_privileged_user_auth_url',
-                             'http://keystonehost/identity_admin')
+                             'http://keystonehost/identity')
 
     @mock.patch('novaclient.api_versions.APIVersion')
     @mock.patch('novaclient.client.Client')
@@ -50,7 +50,7 @@ class NovaClientTestCase(test.TestCase):
                                         p_client, p_api_version):
         nova.novaclient(self.ctx)
         p_plugin_loader.return_value.load_from_options.assert_called_once_with(
-            auth_url='http://keystonehost/identity_admin',
+            auth_url='http://keystonehost/identity',
             password='strongpassword', project_name=None, username='adminuser'
         )
         p_client.assert_called_once_with(
@@ -67,7 +67,7 @@ class NovaClientTestCase(test.TestCase):
                                          p_client, p_api_version):
         nova.novaclient(self.ctx)
         p_plugin_loader.return_value.load_from_options.assert_called_once_with(
-            auth_url='http://keystonehost/identity_admin',
+            auth_url='http://keystonehost/identity',
             password='strongpassword', project_name=None, username='adminuser'
         )
         p_client.assert_called_once_with(
@@ -86,7 +86,7 @@ class NovaClientTestCase(test.TestCase):
                                                          p_api_version):
         nova.novaclient(self.ctx)
         p_plugin_loader.return_value.load_from_options.assert_called_once_with(
-            auth_url='http://keystonehost/identity_admin',
+            auth_url='http://keystonehost/identity',
             password='strongpassword', project_name=None, username='adminuser'
         )
         p_client.assert_called_once_with(
@@ -104,7 +104,7 @@ class NovaClientTestCase(test.TestCase):
         self.override_config('os_region_name', 'farfaraway')
         nova.novaclient(self.ctx)
         p_plugin_loader.return_value.load_from_options.assert_called_once_with(
-            auth_url='http://keystonehost/identity_admin',
+            auth_url='http://keystonehost/identity',
             password='strongpassword', project_name=None, username='adminuser'
         )
         p_client.assert_called_once_with(