diff --git a/devstack-vm-gate-wrap.sh b/devstack-vm-gate-wrap.sh
index d830438e..a5488ec7 100755
--- a/devstack-vm-gate-wrap.sh
+++ b/devstack-vm-gate-wrap.sh
@@ -24,6 +24,9 @@ PROJECTS="openstack-dev/devstack openstack/nova openstack/glance openstack/keyst
 # Set to 1 to run the Tempest test suite
 export DEVSTACK_GATE_TEMPEST=${DEVSTACK_GATE_TEMPEST:-0}
 
+# Set to 1 to run cinder instead of nova volume
+export DEVSTACK_GATE_CINDER=${DEVSTACK_GATE_CINDER:-1}
+
 # Set the virtualization driver to: libvirt, openvz
 export DEVSTACK_GATE_VIRT_DRIVER=${DEVSTACK_GATE_VIRT_DRIVER:-libvirt}
 
diff --git a/devstack-vm-gate.sh b/devstack-vm-gate.sh
index bb8e1f66..cf7bb312 100755
--- a/devstack-vm-gate.sh
+++ b/devstack-vm-gate.sh
@@ -33,13 +33,20 @@ if [ "$ZUUL_BRANCH" == "stable/diablo" ]; then
     export DEVSTACK_GATE_TEMPEST=0
 fi
 
-if [ "$ZUUL_BRANCH" != "stable/diablo" ] && 
-   [ "$ZUUL_BRANCH" != "stable/essex" ]; then
-    ENABLED_SERVICES=$ENABLED_SERVICES,cinder,c-api,c-vol,c-sch,swift
-    SKIP_EXERCISES=boot_from_volume,client-env
+SKIP_EXERCISES=boot_from_volume,client-env
+
+if [ "$GERRIT_BRANCH" != "stable/diablo" ] && 
+   [ "$GERRIT_BRANCH" != "stable/essex" ]; then
+
+    if [ "$DEVSTACK_GATE_CINDER" -eq "1" ]; then
+	ENABLED_SERVICES=$ENABLED_SERVICES,cinder,c-api,c-vol,c-sch
+    else
+	ENABLED_SERVICES=$ENABLED_SERVICES,n-vol
+    fi
+    ENABLED_SERVICES=$ENABLED_SERVICES,swift
 else
     ENABLED_SERVICES=$ENABLED_SERVICES,n-vol
-    SKIP_EXERCISES=boot_from_volume,client-env,swift
+    SKIP_EXERCISES=$SKIP_EXERCISES,swift
 fi
 
 cat <<EOF >localrc