diff --git a/manifests/provision.pp b/manifests/provision.pp
index f0d68d511..38f5f1b5e 100644
--- a/manifests/provision.pp
+++ b/manifests/provision.pp
@@ -84,7 +84,7 @@ class openstack_integration::provision (
   }
 
   if $glance {
-    $image_path = "/tmp/openstack/image/cirros-0.5.1-x86_64-disk-${image_format}.img"
+    $image_path = "/tmp/openstack/image/cirros-0.6.2-x86_64-disk-${image_format}.img"
 
     glance_image { 'cirros':
       ensure           => present,
diff --git a/manifests/tempest.pp b/manifests/tempest.pp
index 02ab20924..eb4824393 100644
--- a/manifests/tempest.pp
+++ b/manifests/tempest.pp
@@ -328,7 +328,7 @@ class openstack_integration::tempest (
     image_alt_ssh_user                 => 'cirros',
     # TODO(emilien) optimization by 1/ using Hiera to configure Glance image source
     # and 2/ if running in the gate, use /home/jenkins/cache/files/ cirros image.
-    img_file                           => "/tmp/openstack/image/cirros-0.5.1-x86_64-disk-${image_format}.img",
+    img_file                           => "/tmp/openstack/image/cirros-0.6.2-x86_64-disk-${image_format}.img",
     img_disk_format                    => $image_format,
     compute_build_interval             => 10,
     ca_certificates_file               => $::openstack_integration::params::ca_bundle_cert_path,
diff --git a/run_tests.sh b/run_tests.sh
index 34788fc1e..7b86de31a 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -42,8 +42,8 @@ else
     fi
 fi
 # Cirros Image directory
-export IMG_DIR=${IMG_DIR:-'/tmp/openstack/image'}
-
+export IMG_DIR=${IMG_DIR:-/tmp/openstack/image}
+export CIRROS_VERSION=${CIRROS_VERSION:-0.6.2}
 
 # if we're running the tests we don't need to write out the facts to facter
 # so we can disable it.
@@ -128,17 +128,17 @@ if [[ ! -e $IMG_DIR ]]; then
     mkdir -p $IMG_DIR
 fi
 
-if [ -f ~/cache/files/cirros-0.5.1-x86_64-disk.img ]; then
+if [ -f ~/cache/files/cirros-${CIRROS_VERSION}-x86_64-disk.img ]; then
     # Create a symlink for tempest.
-    if ! [ -h /tmp/openstack/image/cirros-0.5.1-x86_64-disk.img ] ; then
-        ln -s ~/cache/files/cirros-0.5.1-x86_64-disk.img $IMG_DIR
+    if ! [ -h /tmp/openstack/image/cirros-${CIRROS_VERSION}-x86_64-disk.img ] ; then
+        ln -s ~/cache/files/cirros-${CIRROS_VERSION}-x86_64-disk.img $IMG_DIR
     fi
 else
-    wget http://download.cirros-cloud.net/0.5.1/cirros-0.5.1-x86_64-disk.img -P $IMG_DIR
+    wget http://download.cirros-cloud.net/${CIRROS_VERSION}/cirros-${CIRROS_VERSION}-x86_64-disk.img -P $IMG_DIR
 fi
-ln -s $IMG_DIR/cirros-0.5.1-x86_64-disk.img $IMG_DIR/cirros-0.5.1-x86_64-disk-qcow2.img
+ln -s $IMG_DIR/cirros-${CIRROS_VERSION}-x86_64-disk.img $IMG_DIR/cirros-${CIRROS_VERSION}-x86_64-disk-qcow2.img
 # NOTE(tkajinam): Prepare raw format image
-qemu-img convert -f qcow2 -O raw $IMG_DIR/cirros-0.5.1-x86_64-disk.img $IMG_DIR/cirros-0.5.1-x86_64-disk-raw.img
+qemu-img convert -f qcow2 -O raw $IMG_DIR/cirros-${CIRROS_VERSION}-x86_64-disk.img $IMG_DIR/cirros-${CIRROS_VERSION}-x86_64-disk-raw.img
 
 install_puppet
 PUPPET_FULL_PATH=$(which puppet)