diff --git a/run_tests.sh b/run_tests.sh
index 2a256d156..ff8e747ea 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -156,11 +156,32 @@ $SUDO yum -y install puppet \
                      openstack-selinux \
                      policycoreutils \
                      rubygems \
+                     wget \
                      "@Development Tools"
 
 # Don't assume pip is installed
 which pip || $SUDO easy_install pip
 
+# Try to use pre-cached cirros images, if available, otherwise download them
+rm -rf /tmp/cirros
+mkdir /tmp/cirros
+
+if [ -f ~/cache/files/cirros-0.3.4-x86_64-uec.tar.gz ]; then
+    tar -xzvf ~/cache/files/cirros-0.3.4-x86_64-uec.tar.gz -C /tmp/cirros/
+else
+    echo "No pre-cached uec archive found, downloading..."
+    wget --tries=10 http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-uec.tar.gz -P /tmp/cirros/
+    tar -xzvf /tmp/cirros/cirros-0.3.4-x86_64-uec.tar.gz -C /tmp/cirros/
+fi
+if [ -f ~/cache/files/cirros-0.3.4-x86_64-disk.img ]; then
+    cp -p ~/cache/files/cirros-0.3.4-x86_64-disk.img /tmp/cirros/
+else
+    echo "No pre-cached disk image found, downloading..."
+    wget --tries=10 http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img -P /tmp/cirros/
+fi
+echo "Using pre-cached images:"
+find /tmp/cirros -type f -printf "%m %n %u %g %s  %t" -exec md5sum \{\} \;
+
 # TO-DO: Packstack should handle Hiera and Puppet configuration, so that it works
 # no matter the environment
 $SUDO su -c 'cat > /etc/puppet/puppet.conf <<EOF
diff --git a/tests/scenario001.sh b/tests/scenario001.sh
index b514e27bd..078a4d7a8 100755
--- a/tests/scenario001.sh
+++ b/tests/scenario001.sh
@@ -27,6 +27,9 @@ $SUDO packstack --allinone \
           --os-horizon-ssl=y \
           --amqp-enable-ssl=y \
           --glance-backend=file \
+          --provision-uec-kernel-url="/tmp/cirros/cirros-0.3.4-x86_64-vmlinuz" \
+          --provision-uec-ramdisk-url="/tmp/cirros/cirros-0.3.4-x86_64-initrd" \
+          --provision-uec-disk-url="/tmp/cirros/cirros-0.3.4-x86_64-disk.img" \
           --provision-demo=y \
           --provision-tempest=y \
           --run-tempest=y \
diff --git a/tests/scenario002.sh b/tests/scenario002.sh
index 6dc02ea87..9e63d704e 100755
--- a/tests/scenario002.sh
+++ b/tests/scenario002.sh
@@ -28,6 +28,9 @@ $SUDO packstack --allinone \
           --glance-backend=swift \
           --os-sahara-install=y \
           --os-trove-install=y \
+          --provision-uec-kernel-url="/tmp/cirros/cirros-0.3.4-x86_64-vmlinuz" \
+          --provision-uec-ramdisk-url="/tmp/cirros/cirros-0.3.4-x86_64-initrd" \
+          --provision-uec-disk-url="/tmp/cirros/cirros-0.3.4-x86_64-disk.img" \
           --provision-demo=y \
           --provision-tempest=y \
           --run-tempest=y \
diff --git a/tests/scenario003.sh b/tests/scenario003.sh
index bf7e22d4a..1ca6b1143 100644
--- a/tests/scenario003.sh
+++ b/tests/scenario003.sh
@@ -24,6 +24,9 @@ $SUDO packstack --allinone \
           --os-horizon-install=n \
           --glance-backend=file \
           --os-heat-install=y \
+          --provision-uec-kernel-url="/tmp/cirros/cirros-0.3.4-x86_64-vmlinuz" \
+          --provision-uec-ramdisk-url="/tmp/cirros/cirros-0.3.4-x86_64-initrd" \
+          --provision-uec-disk-url="/tmp/cirros/cirros-0.3.4-x86_64-disk.img" \
           --provision-demo=y \
           --provision-tempest=y \
           --run-tempest=y \