diff --git a/devstack-vm-gate.sh b/devstack-vm-gate.sh
index d2cb161..51285c9 100755
--- a/devstack-vm-gate.sh
+++ b/devstack-vm-gate.sh
@@ -33,7 +33,7 @@ function setup_localrc() {
         rm -f localrc
     fi
 
-    DEFAULT_ENABLED_SERVICES=g-api,g-reg,key,n-api,n-crt,n-obj,n-cpu,n-sch,horizon,mysql,rabbit,sysstat,dstat,pidstat
+    DEFAULT_ENABLED_SERVICES=g-api,g-reg,key,n-api,n-crt,n-obj,n-cpu,horizon,mysql,rabbit,sysstat,dstat,pidstat
     DEFAULT_ENABLED_SERVICES+=,s-proxy,s-account,s-container,s-object,cinder,c-api,c-vol,c-sch,n-cond
 
     # Allow optional injection of ENABLED_SERVICES from the calling context
@@ -51,6 +51,7 @@ function setup_localrc() {
     SKIP_EXERCISES=boot_from_volume,bundle,client-env,euca
 
     if [ "$LOCALRC_BRANCH" == "stable/grizzly" ]; then
+        MY_ENABLED_SERVICES=$MY_ENABLED_SERVICES,n-sch
         SKIP_EXERCISES=${SKIP_EXERCISES},swift,client-args
         if [ "$DEVSTACK_GATE_NEUTRON" -eq "1" ]; then
             MY_ENABLED_SERVICES=$MY_ENABLED_SERVICES,quantum,q-svc,q-agt,q-dhcp,q-l3,q-meta
@@ -63,7 +64,7 @@ function setup_localrc() {
             MY_ENABLED_SERVICES=$MY_ENABLED_SERVICES,n-cell
         fi
     elif [ "$LOCALRC_BRANCH" == "stable/havana" ]; then
-        MY_ENABLED_SERVICES+=,c-bak
+        MY_ENABLED_SERVICES+=,c-bak,n-sch
         # we don't want to enable services for grenade that don't have upgrade support
         # otherwise they can break grenade, especially when they are projects like
         # ceilometer which inject code in other projects
@@ -90,6 +91,11 @@ function setup_localrc() {
             MY_ENABLED_SERVICES+=,heat,h-api,h-api-cfn,h-api-cw,h-eng
             MY_ENABLED_SERVICES+=,ceilometer-acompute,ceilometer-acentral,ceilometer-collector,ceilometer-api,ceilometer-alarm-notifier,ceilometer-alarm-evaluator,ceilometer-anotification
         fi
+        if [ "SCHEDULER_TYPE" -eq "1" ]; then
+            MY_ENABLED_SERVICES+=gantt
+        else
+            MY_ENABLED_SERVICES+=n-sch
+        fi
         if [ "$DEVSTACK_GATE_NEUTRON" -eq "1" ]; then
             MY_ENABLED_SERVICES=$MY_ENABLED_SERVICES,quantum,q-svc,q-agt,q-dhcp,q-l3,q-meta,q-lbaas,q-vpn,q-fwaas,q-metering
             echo "Q_USE_DEBUG_COMMAND=True" >>localrc
@@ -153,6 +159,9 @@ CINDER_PERIODIC_INTERVAL=10
 export OS_NO_CACHE=True
 EOF
 
+    if [ "SCHEDULER_TYPE" -eq "1" ]; then
+        echo "SCHEDULER=gantt.scheduler.filter_scheduler.FilterScheduler >>localrc
+    fi
     if [ "$DEVSTACK_CINDER_SECURE_DELETE" -eq "0" ]; then
         echo "CINDER_SECURE_DELETE=False" >>localrc
     fi