diff --git a/_modules/runtest/tempest_sections/base_section.py b/_modules/runtest/tempest_sections/base_section.py
index 867386f..5e2ea3a 100644
--- a/_modules/runtest/tempest_sections/base_section.py
+++ b/_modules/runtest/tempest_sections/base_section.py
@@ -47,22 +47,22 @@
     def authenticated_openstack_module_call(self, target, module, *args, **kwargs):
         """Calls specified openstack module from admin keystone user.
         """
-        auth_profile = {}
-        ks = conditions.BaseRule(field='keystone.server.enabled', op='eq', val=True)
-        auth_profile['connection_password'] = self.get_item_when_condition_match(
-            'keystone.server.admin_password', ks)
-        auth_profile['connection_user'] = self.get_item_when_condition_match(
-            'keystone.server.admin_name', ks)
-        auth_profile['connection_tenant'] = self.get_item_when_condition_match(
-            'keystone.server.admin_tenant', ks)
-        auth_profile['connection_region_name'] = self.get_item_when_condition_match(
-            'keystone.server.region', ks)
-        address = self.get_item_when_condition_match(
-            'keystone.server.bind.public_address', ks)
-        port = self.get_item_when_condition_match('keystone.server.bind.public_port', ks)
-        auth_profile['connection_auth_url'] = "http://{}:{}/v2.0".format(address, port)
+        if 'profile' not in kwargs:
+            auth_profile = {}
+            ks = conditions.BaseRule(field='keystone.server.enabled', op='eq', val=True)
+            auth_profile['connection_password'] = self.get_item_when_condition_match(
+                'keystone.server.admin_password', ks)
+            auth_profile['connection_user'] = self.get_item_when_condition_match(
+                'keystone.server.admin_name', ks)
+            auth_profile['connection_tenant'] = self.get_item_when_condition_match(
+                'keystone.server.admin_tenant', ks)
+            auth_profile['connection_region_name'] = self.get_item_when_condition_match(
+                'keystone.server.region', ks)
+            address = self.get_item_when_condition_match(
+                'keystone.server.bind.public_address', ks)
+            port = self.get_item_when_condition_match('keystone.server.bind.public_port', ks)
+            auth_profile['connection_auth_url'] = "http://{}:{}/v2.0".format(address, port)
+            kwargs.update(auth_profile)
 
-        kwargs.update(auth_profile)
-
-        return self.salt_client.cmd(target, 'neutronng.list_networks', timeout=5,
+        return self.salt_client.cmd(target, module, timeout=5,
                                     gather_job_timeout=15, arg=args, kwarg=kwargs)
diff --git a/metadata/service/tempest/init.yml b/metadata/service/tempest/init.yml
index 7a23466..20a92b9 100644
--- a/metadata/service/tempest/init.yml
+++ b/metadata/service/tempest/init.yml
@@ -19,6 +19,7 @@
     tempest:
       enabled: true
       test_target: ${_param:tempest_test_target}
+      keystone_profile_admin: admin_identity
       heat_plugin:
         skip_scenario_test_list: ${_param:runtest_heat_plugin_skip_scenario_test_list}
         skip_functional_test_list: ${_param:runtest_heat_plugin_skip_functional_test_list}
