diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 18f46382..1dfba810 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -160,12 +160,6 @@ function configure_tricircle_nova_apigw {
 
         init_common_tricircle_conf $TRICIRCLE_NOVA_APIGW_CONF
 
-        iniset $NEUTRON_CONF client admin_username admin
-        iniset $NEUTRON_CONF client admin_password $ADMIN_PASSWORD
-        iniset $NEUTRON_CONF client admin_tenant demo
-        iniset $NEUTRON_CONF client auto_refresh_endpoint True
-        iniset $NEUTRON_CONF client top_pod_name $REGION_NAME
-
         setup_colorized_logging $TRICIRCLE_NOVA_APIGW_CONF DEFAULT tenant_name
 
         if is_service_enabled keystone; then
diff --git a/tricircle/tempestplugin/post_test_hook.sh b/tricircle/tempestplugin/post_test_hook.sh
index b646accd..56293b81 100755
--- a/tricircle/tempestplugin/post_test_hook.sh
+++ b/tricircle/tempestplugin/post_test_hook.sh
@@ -21,7 +21,7 @@ export TRICIRCLE_TEMPEST_PLUGIN_DIR=$TRICIRCLE_DIR/tricircle/tempestplugin
 export TEMPEST_DIR=$DEST/tempest
 
 # use admin role to create Tricircle top Pod and Pod1
-source $DEVSTACK_DIR/admin-openrc.sh
+source $BASE/new/devstack/openrc admin admin
 
 token=$(openstack token issue | awk 'NR==5 {print $4}')
 echo $token
@@ -40,7 +40,7 @@ cd $TEMPEST_DIR
 if [ -d .testrepository ]; then
   sudo rm -r .testrepository
 fi
-testr init
+# sudo -H -u jenkins testr init
 
 # Run the Compute Tempest tests
 # cd $TRICIRCLE_TEMPEST_PLUGIN_DIR
diff --git a/tricircle/tempestplugin/tempest_volume.sh b/tricircle/tempestplugin/tempest_volume.sh
index 717a9790..bd3aebe5 100755
--- a/tricircle/tempestplugin/tempest_volume.sh
+++ b/tricircle/tempestplugin/tempest_volume.sh
@@ -25,6 +25,15 @@ cd $TEMPEST_DIR
 # Import functions needed for the below workaround
 source $DEST/devstack/functions
 
+# add account information to configuration
+source $BASE/new/devstack/openrc admin admin
+env | grep OS_
+iniset $TEMPEST_CONF auth admin_username admin
+iniset $TEMPEST_CONF auth admin_project_name admin
+iniset $TEMPEST_CONF auth admin_password $OS_PASSWORD
+iniset $TEMPEST_CONF identity uri $OS_AUTH_URL
+iniset $TEMPEST_CONF identity-feature-enabled api_v3 false
+
 # change the configruation to test Tricircle Cinder-APIGW
 iniset $TEMPEST_CONF volume region RegionOne
 iniset $TEMPEST_CONF volume catalog_type volumev2