diff --git a/devstack-vm-gate.sh b/devstack-vm-gate.sh
index 021710b2..81e5135a 100755
--- a/devstack-vm-gate.sh
+++ b/devstack-vm-gate.sh
@@ -23,12 +23,18 @@ set -o errexit
 
 cd $DEST/devstack
 
-ENABLED_SERVICES=g-api,g-reg,key,n-api,n-crt,n-obj,n-cpu,n-net,n-sch,cinder,c-api,c-vol,c-sch,horizon,mysql,rabbit
+ENABLED_SERVICES=g-api,g-reg,key,n-api,n-crt,n-obj,n-cpu,n-net,n-sch,horizon,mysql,rabbit
 
 if [ "$DEVSTACK_GATE_TEMPEST" -eq "1" ]; then
     ENABLED_SERVICES=$ENABLED_SERVICES,tempest
 fi
 
+if [ "$BRANCH" != "stable/diablo" ] && [ "$BRANCH" != "stable/essex" ]; then
+    ENABLED_SERVICES=$ENABLED_SERVICES,cinder,c-api,c-vol,c-sch
+else
+    ENABLED_SERVICES=$ENABLED_SERVICES,n-vol
+fi
+
 cat <<EOF >localrc
 ACTIVE_TIMEOUT=60
 BOOT_TIMEOUT=90