diff --git a/devstack/lib/vmware_dvs b/devstack/lib/vmware_dvs
index 86314b8896..87317a31c0 100644
--- a/devstack/lib/vmware_dvs
+++ b/devstack/lib/vmware_dvs
@@ -19,6 +19,11 @@
 # Neutron VMware DVS plugin
 # -------------------------
 
+# Settings previously defined in devstack:lib/neutron-legacy
+NEUTRON_CONF_DIR=/etc/neutron
+export NEUTRON_TEST_CONFIG_FILE=${NEUTRON_TEST_CONFIG_FILE:-"$NEUTRON_CONF_DIR/debug.ini"}
+Q_DHCP_CONF_FILE=$NEUTRON_CONF_DIR/dhcp_agent.ini
+
 # Save trace setting
 DVS_XTRACE=$(set +o | grep xtrace)
 set +o xtrace
diff --git a/devstack/lib/vmware_nsx b/devstack/lib/vmware_nsx
index d8d5b32c21..7b445cb644 100644
--- a/devstack/lib/vmware_nsx
+++ b/devstack/lib/vmware_nsx
@@ -20,6 +20,12 @@
 # Neutron VMware NSX plugin
 # -------------------------
 
+# Settings previously defined in devstack:lib/neutron-legacy
+NEUTRON_CONF_DIR=/etc/neutron
+export NEUTRON_TEST_CONFIG_FILE=${NEUTRON_TEST_CONFIG_FILE:-"$NEUTRON_CONF_DIR/debug.ini"}
+Q_DHCP_CONF_FILE=$NEUTRON_CONF_DIR/dhcp_agent.ini
+Q_META_DATA_IP=${Q_META_DATA_IP:-$SERVICE_HOST}
+
 # Save trace setting
 NSX_XTRACE=$(set +o | grep xtrace)
 set +o xtrace
diff --git a/devstack/lib/vmware_nsx_v3 b/devstack/lib/vmware_nsx_v3
index 5d415403a3..dedba0e1d9 100644
--- a/devstack/lib/vmware_nsx_v3
+++ b/devstack/lib/vmware_nsx_v3
@@ -20,7 +20,10 @@
 # Neutron VMware NSX plugin
 # -------------------------
 
-# Settings
+# Settings previously defined in devstack:lib/neutron-legacy
+NEUTRON_CONF_DIR=/etc/neutron
+export NEUTRON_TEST_CONFIG_FILE=${NEUTRON_TEST_CONFIG_FILE:-"$NEUTRON_CONF_DIR/debug.ini"}
+Q_DHCP_CONF_FILE=$NEUTRON_CONF_DIR/dhcp_agent.ini
 
 # The interface which has connectivity to the NSX Gateway uplink
 NSX_GATEWAY_NETWORK_INTERFACE=${NSX_GATEWAY_NETWORK_INTERFACE:-}