diff --git a/devstack-vm-gate-wrap.sh b/devstack-vm-gate-wrap.sh
index 493c9d1a..a09c6583 100755
--- a/devstack-vm-gate-wrap.sh
+++ b/devstack-vm-gate-wrap.sh
@@ -352,6 +352,9 @@ export DEVSTACK_CINDER_SECURE_DELETE=${DEVSTACK_CINDER_SECURE_DELETE:-0}
 # Only applicable to master branch
 export DEVSTACK_GATE_QUANTUM=${DEVSTACK_GATE_QUANTUM:-0}
 
+# Set to 1 to run nova in cells mode instead of the default mode
+export DEVSTACK_GATE_CELLS=${DEVSTACK_GATE_CELLS:-0}
+
 # Set to 1 to run grenade.
 export DEVSTACK_GATE_GRENADE=${DEVSTACK_GATE_GRENADE:-0}
 
diff --git a/devstack-vm-gate.sh b/devstack-vm-gate.sh
index 8fbe6c7f..ac0a335a 100755
--- a/devstack-vm-gate.sh
+++ b/devstack-vm-gate.sh
@@ -62,6 +62,9 @@ function setup_localrc() {
         else
             MY_ENABLED_SERVICES=$MY_ENABLED_SERVICES,n-net
         fi
+        if [ "$DEVSTACK_GATE_CELLS" -eq "1" ]; then
+            MY_ENABLED_SERVICES=$MY_ENABLED_SERVICES,n-cell
+        fi
     else # master
         MY_ENABLED_SERVICES=$MY_ENABLED_SERVICES,s-proxy,s-account,s-container,s-object,cinder,c-api,c-vol,c-sch,n-cond,heat,h-api,h-api-cfn,h-api-cw,h-eng,ceilometer-acompute,ceilometer-acentral,ceilometer-collector,ceilometer-api
         if [ "$DEVSTACK_GATE_QUANTUM" -eq "1" ]; then
@@ -71,6 +74,9 @@ function setup_localrc() {
         else
             MY_ENABLED_SERVICES=$MY_ENABLED_SERVICES,n-net
         fi
+        if [ "$DEVSTACK_GATE_CELLS" -eq "1" ]; then
+            MY_ENABLED_SERVICES=$MY_ENABLED_SERVICES,n-cell
+        fi
         # When uncommented this will download and register the most recent successfully built
         # ubuntu-vm-heat-cfntools image from jenkins.tripleo.org
         # echo "IMAGE_URLS+=,\"http://jenkins.tripleo.org:8080/job/autobuilt-images/elements=ubuntu%20vm%20heat-cfntools/lastSuccessfulBuild/artifact/ubuntu-vm-heat-cfntools.qcow2\"" >>localrc