diff --git a/devstack/settings b/devstack/settings
index 976317cd5ca..b452f883145 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -1,3 +1 @@
 L2_AGENT_EXTENSIONS=${L2_AGENT_EXTENSIONS:-}
-
-enable_service q-qos
diff --git a/neutron/tests/contrib/gate_hook.sh b/neutron/tests/contrib/gate_hook.sh
index e5e28668ae3..d92247b853c 100644
--- a/neutron/tests/contrib/gate_hook.sh
+++ b/neutron/tests/contrib/gate_hook.sh
@@ -35,6 +35,7 @@ EOF
     export DEVSTACK_LOCAL_CONFIG+="
 enable_plugin neutron-vpnaas git://git.openstack.org/openstack/neutron-vpnaas
 enable_plugin neutron git://git.openstack.org/openstack/neutron
+enable_service q-qos
 "
 
     $BASE/new/devstack-gate/devstack-vm-gate.sh