diff --git a/devstack/settings b/devstack/settings
index 13f437f82f..d7e86f8f99 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -27,24 +27,6 @@ enable_service q-l3
 enable_service q-meta
 enable_service neutron
 
-# Disable horizon
-disable_service horizon
-
-# Disable swift
-disable_service s-account
-disable_service s-container
-disable_service s-object
-disable_service s-proxy
-
-# Disable ceilometer
-disable_service ceilometer-acentral
-disable_service ceilometer-acompute
-disable_service ceilometer-alarm-evaluator
-disable_service ceilometer-alarm-notifier
-disable_service ceilometer-anotification
-disable_service ceilometer-api
-disable_service ceilometer-collector
-
 # Enable Magnum services
 enable_service magnum-api
 enable_service magnum-cond
diff --git a/magnum/tests/contrib/gate_hook.sh b/magnum/tests/contrib/gate_hook.sh
index db2b2bae44..e1b857a0b4 100755
--- a/magnum/tests/contrib/gate_hook.sh
+++ b/magnum/tests/contrib/gate_hook.sh
@@ -21,6 +21,18 @@ special=$2
 export PROJECTS="openstack/barbican $PROJECTS"
 export DEVSTACK_LOCAL_CONFIG="enable_plugin heat git://git.openstack.org/openstack/heat"
 
+export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service horizon"
+export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service s-account"
+export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service s-container"
+export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service s-object"
+export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service s-proxy"
+export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-acentral"
+export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-acompute"
+export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-alarm-evaluator"
+export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-alarm-notifier"
+export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-api"
+export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-collector"
+
 if [ "$coe" = "mesos" ]; then
     echo "MAGNUM_GUEST_IMAGE_URL=https://fedorapeople.org/groups/magnum/ubuntu-mesos-latest.qcow2" >> $BASE/new/devstack/localrc
 elif [ "$coe" = "k8s-coreos" ]; then