diff --git a/devstack-vm-gate-wrap.sh b/devstack-vm-gate-wrap.sh
index 6af2c7b1..444d26db 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"
+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"
 
 # Set to 1 to run the Tempest test suite
 export DEVSTACK_GATE_TEMPEST=${DEVSTACK_GATE_TEMPEST:-0}
@@ -108,7 +108,7 @@ function setup_host {
     # Make sure headers for the currently running kernel are installed:
     sudo apt-get install -y --force-yes linux-headers-`uname -r`
 
-    # Hpcloud provides no swap, but does have a partition mounted at /mnt 
+    # Hpcloud provides no swap, but does have a partition mounted at /mnt
     # we can use:
     if [ `cat /proc/meminfo | grep SwapTotal | awk '{ print $2; }'` -eq 0 ] && [ -b /dev/vdb ]; then
       sudo umount /dev/vdb
diff --git a/devstack-vm-gate.sh b/devstack-vm-gate.sh
index 231ef701..021710b2 100755
--- a/devstack-vm-gate.sh
+++ b/devstack-vm-gate.sh
@@ -23,7 +23,7 @@ set -o errexit
 
 cd $DEST/devstack
 
-ENABLED_SERVICES=g-api,g-reg,key,n-api,n-crt,n-obj,n-cpu,n-net,n-vol,n-sch,horizon,mysql,rabbit
+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
 
 if [ "$DEVSTACK_GATE_TEMPEST" -eq "1" ]; then
     ENABLED_SERVICES=$ENABLED_SERVICES,tempest
diff --git a/devstack-vm-update-image.py b/devstack-vm-update-image.py
index 73607c35..e86b4702 100755
--- a/devstack-vm-update-image.py
+++ b/devstack-vm-update-image.py
@@ -40,6 +40,9 @@ PROJECTS = ['openstack/nova',
             'openstack/glance',
             'openstack/keystone',
             'openstack/horizon',
+            'openstack/cinder',
+            'openstack/python-cinderclient',
+            'openstack/tempest',
             'openstack/python-glanceclient',
             'openstack/python-keystoneclient',
             'openstack/python-novaclient',