diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 52ef80814..9b18525ee 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -81,6 +81,7 @@ if is_service_enabled odl-compute; then
             create_nova_conf_neutron
         fi
         bind_opendaylight_controller
+        sudo ovs-vsctl --may-exist add-br $OVS_BR
         wait_for_active_bridge $OVS_BR $ODL_RETRY_SLEEP_INTERVAL $ODL_BOOT_WAIT
 
         # L3 needs to be configured only for netvirt-ovsdb - in netvirt-vpnservice L3 is configured
diff --git a/tools/configure_for_func_testing.sh b/tools/configure_for_func_testing.sh
index adcb3d348..c22466718 100755
--- a/tools/configure_for_func_testing.sh
+++ b/tools/configure_for_func_testing.sh
@@ -188,9 +188,8 @@ function _install_opendaylight {
     # openstack service provider isn't needed, only ODL neutron northbound
     # is necessary for functional test
     ODL_NETVIRT_KARAF_FEATURE=odl-neutron-service,odl-restconf-all,odl-aaa-authn,odl-dlux-core,odl-mdsal-apidocs,odl-neutron-logger
-    if [[ "$VENV" =~ "fullstack" ]]; then
-        # TODO: in future switch to new netvirt
-        ODL_NETVIRT_KARAF_FEATURE=odl-neutron-service,odl-restconf-all,odl-aaa-authn,odl-dlux-core,odl-mdsal-apidocs,odl-ovsdb-openstack,odl-neutron-logger
+    if [[ "$VENV" =~ "dsvm-fullstack" ]]; then
+        export ODL_NETVIRT_KARAF_FEATURE=odl-neutron-service,odl-restconf-all,odl-aaa-authn,odl-dlux-core,odl-mdsal-apidocs,odl-netvirt-openstack,odl-neutron-logger
     fi
     ODL_BOOT_WAIT_URL=controller/nb/v2/neutron/networks
     source $NETWORKING_ODL_DIR/devstack/settings.odl