diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 49c719e71..0ed9320b3 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -30,14 +30,15 @@ function neutron_vpnaas_configure_common {
 }
 
 function neutron_vpnaas_configure_agent {
-    cp $NEUTRON_VPNAAS_DIR/etc/vpn_agent.ini $Q_VPN_CONF_FILE
+    local conf_file=${1:-$Q_VPN_CONF_FILE}
+    cp $NEUTRON_VPNAAS_DIR/etc/vpn_agent.ini $conf_file
     if [[ "$IPSEC_PACKAGE" == "strongswan" ]]; then
-        iniset_multiline $Q_VPN_CONF_FILE vpnagent vpn_device_driver neutron_vpnaas.services.vpn.device_drivers.strongswan_ipsec.StrongSwanDriver
+        iniset_multiline $conf_file vpnagent vpn_device_driver neutron_vpnaas.services.vpn.device_drivers.strongswan_ipsec.StrongSwanDriver
         if is_fedora; then
-            iniset $Q_VPN_CONF_FILE strongswan default_config_area /usr/share/strongswan/templates/config/strongswan.d
+            iniset $conf_file strongswan default_config_area /usr/share/strongswan/templates/config/strongswan.d
         fi
     else
-        iniset_multiline $Q_VPN_CONF_FILE vpnagent vpn_device_driver $NEUTRON_VPNAAS_DEVICE_DRIVER
+        iniset_multiline $conf_file vpnagent vpn_device_driver $NEUTRON_VPNAAS_DEVICE_DRIVER
     fi
 }
 
diff --git a/tools/configure_for_vpn_func_testing.sh b/tools/configure_for_vpn_func_testing.sh
index daacaba83..70a37a8f2 100755
--- a/tools/configure_for_vpn_func_testing.sh
+++ b/tools/configure_for_vpn_func_testing.sh
@@ -21,6 +21,8 @@ PROJECT_NAME=${PROJECT_NAME:-neutron-vpnaas}
 REPO_BASE=${GATE_DEST:-$(cd $(dirname "$BASH_SOURCE")/../.. && pwd)}
 
 source $REPO_BASE/neutron/tools/configure_for_func_testing.sh
+source $REPO_BASE/neutron-vpnaas/devstack/settings
+source $NEUTRON_VPNAAS_DIR/devstack/plugin.sh
 
 
 function _install_vpn_package {
@@ -32,23 +34,14 @@ function _install_vpn_package {
     fi
 
     echo_summary "Installing $IPSEC_PACKAGE"
-    neutron_vpn_install_agent_packages
+    neutron_agent_vpnaas_install_agent_packages
 }
 
 
 function _configure_vpn_ini_file {
     echo_summary "Configuring VPN ini file"
-
     local temp_ini=$(mktemp)
-    cp $REPO_BASE/$PROJECT_NAME/etc/vpn_agent.ini $temp_ini
-    if [ "$IPSEC_PACKAGE" == "strongswan" ]; then
-        iniset_multiline $temp_ini vpnagent vpn_device_driver neutron_vpnaas.services.vpn.device_drivers.strongswan_ipsec.StrongSwanDriver
-        if is_fedora; then
-            iniset $temp_ini strongswan default_config_area /usr/share/strongswan/templates/config/strongswan.d
-        fi
-    else
-        iniset_multiline $temp_ini vpnagent vpn_device_driver neutron_vpnaas.services.vpn.device_drivers.ipsec.OpenSwanDriver
-    fi
+    neutron_vpnaas_configure_agent $temp_ini
     sudo install -d -o $STACK_USER /etc/neutron/
     sudo install -m 644 -o $STACK_USER $temp_ini $Q_VPN_CONF_FILE
 }