diff --git a/neutron/tests/contrib/gate_hook.sh b/neutron/tests/contrib/gate_hook.sh
index 820879e0ed6..91cfa36398d 100644
--- a/neutron/tests/contrib/gate_hook.sh
+++ b/neutron/tests/contrib/gate_hook.sh
@@ -85,7 +85,10 @@ case $VENV in
     ;;
 
 "api"|"api-pecan"|"full-ovsfw"|"full-pecan"|"dsvm-scenario-ovs"|"dsvm-scenario-linuxbridge")
-    load_rc_hook api_${FLAVOR}_extensions
+    load_rc_hook api_all_extensions
+    if [ "${FLAVOR}" = "dvrskip" ]; then
+        load_rc_hook disable_dvr_tests
+    fi
     load_conf_hook quotas
     load_rc_hook dns
     load_rc_hook qos
diff --git a/neutron/tests/contrib/hooks/api_dvrskip_extensions b/neutron/tests/contrib/hooks/api_dvrskip_extensions
deleted file mode 100644
index 4ae6bcea295..00000000000
--- a/neutron/tests/contrib/hooks/api_dvrskip_extensions
+++ /dev/null
@@ -1 +0,0 @@
-NETWORK_API_EXTENSIONS="address-scope,agent,allowed-address-pairs,auto-allocated-topology,availability_zone,binding,default-subnetpools,dhcp_agent_scheduler,dns-integration,ext-gw-mode,external-net,extra_dhcp_opt,extraroute,flavors,l3-flavors,l3-ha,l3_agent_scheduler,metering,multi-provider,net-mtu,network-ip-availability,network_availability_zone,pagination,port-security,project-id,provider,qos,quotas,rbac-policies,router,router_availability_zone,security-group,service-type,sorting,standard-attr-description,standard-attr-revisions,standard-attr-timestamp,subnet_allocation,tag,tag-ext,trunk,trunk-details"
diff --git a/neutron/tests/contrib/hooks/disable_dvr_tests b/neutron/tests/contrib/hooks/disable_dvr_tests
new file mode 100644
index 00000000000..4bde66ad9cf
--- /dev/null
+++ b/neutron/tests/contrib/hooks/disable_dvr_tests
@@ -0,0 +1 @@
+DISABLE_NETWORK_API_EXTENSIONS="dvr"