diff --git a/README.md b/README.md
index ac5f7208..d917ca03 100644
--- a/README.md
+++ b/README.md
@@ -21,12 +21,14 @@ change to the following projects must pass the devstack gate test:
     glance
     keystone
     horizon
+    quantum
     python-novaclient
     python-keystoneclient
+    python-quantumclient
     devstack
     devstack-gate
 
-Obviously we test nova, glance, keystone, horizon and their clients
+Obviously we test nova, glance, keystone, horizon, quantum and their clients
 because they all work closely together to form an OpenStack
 system. Changes to devstack itself are also required to pass this test
 so that we can be assured that devstack is always able to produce a
diff --git a/devstack-vm-gate-wrap.sh b/devstack-vm-gate-wrap.sh
index d15e9b40..f7a950f8 100755
--- a/devstack-vm-gate-wrap.sh
+++ b/devstack-vm-gate-wrap.sh
@@ -19,7 +19,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-PROJECTS="openstack-dev/devstack openstack/nova openstack/glance openstack/keystone openstack/python-novaclient openstack/python-keystoneclient openstack/python-quantumclient openstack/python-glanceclient openstack/python-openstackclient openstack/horizon openstack/tempest openstack/cinder openstack/python-cinderclient openstack/swift openstack/python-swiftclient"
+PROJECTS="openstack-dev/devstack openstack/nova openstack/glance openstack/keystone openstack/python-novaclient openstack/python-keystoneclient openstack/python-quantumclient openstack/python-glanceclient openstack/python-openstackclient openstack/horizon openstack/quantum openstack/tempest openstack/cinder openstack/python-cinderclient openstack/swift openstack/python-swiftclient"
 
 # Set to 1 to run the Tempest test suite
 export DEVSTACK_GATE_TEMPEST=${DEVSTACK_GATE_TEMPEST:-0}
@@ -27,6 +27,9 @@ 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 to 1 to run quantum instead of nova network
+export DEVSTACK_GATE_QUANTUM=${DEVSTACK_GATE_QUANTUM:-0}
+
 # Set the virtualization driver to: libvirt, openvz
 export DEVSTACK_GATE_VIRT_DRIVER=${DEVSTACK_GATE_VIRT_DRIVER:-libvirt}
 
@@ -247,7 +250,7 @@ if [[ $ZUUL_PROJECT == "openstack/tempest" ]]; then
 fi
 
 # Run the test
-$GATE_SCRIPT_DIR/devstack-vm-gate.sh
+$GATE_SCRIPT_DIR/devstack-vm-gate.sh $GERRIT_BRANCH
 RETVAL=$?
 
 cleanup_host &> $WORKSPACE/logs/devstack-gate-cleanup-host.txt
diff --git a/devstack-vm-gate.sh b/devstack-vm-gate.sh
index 882a0c02..3e05fad5 100755
--- a/devstack-vm-gate.sh
+++ b/devstack-vm-gate.sh
@@ -23,7 +23,9 @@ 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,horizon,mysql,rabbit
+rm -f localrc
+
+ENABLED_SERVICES=g-api,g-reg,key,n-api,n-crt,n-obj,n-cpu,n-sch,horizon,mysql,rabbit
 
 if [ "$DEVSTACK_GATE_TEMPEST" -eq "1" ]; then
     ENABLED_SERVICES=$ENABLED_SERVICES,tempest
@@ -37,19 +39,27 @@ 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
+    if [ "$DEVSTACK_GATE_QUANTUM" -eq "1" ]; then
+	ENABLED_SERVICES=$ENABLED_SERVICES,quantum,q-svc,q-agt,q-dhcp,q-l3
+	cat <<EOF >>localrc
+Q_USE_NAMESPACE=False
+LIBVIRT_FIREWALL_DRIVER=nova.virt.firewall.NoopFirewallDriver
+EOF
+    else
+	ENABLED_SERVICES=$ENABLED_SERVICES,n-net
+    fi
     ENABLED_SERVICES=$ENABLED_SERVICES,swift
 else
     ENABLED_SERVICES=$ENABLED_SERVICES,n-vol
     SKIP_EXERCISES=$SKIP_EXERCISES,swift
 fi
 
-cat <<EOF >localrc
+cat <<EOF >>localrc
 ACTIVE_TIMEOUT=60
 BOOT_TIMEOUT=90
 ASSOCIATE_TIMEOUT=60
diff --git a/devstack-vm-update-image.py b/devstack-vm-update-image.py
index 28a9d2c0..bd39e73e 100755
--- a/devstack-vm-update-image.py
+++ b/devstack-vm-update-image.py
@@ -53,6 +53,7 @@ PROJECTS = ['openstack/nova',
             'openstack/python-cinderclient',
             'openstack/swift',
             'openstack/tempest',
+            'openstack/quantum',
             'openstack/python-glanceclient',
             'openstack/python-keystoneclient',
             'openstack/python-novaclient',