diff --git a/manifests/provision.pp b/manifests/provision.pp
index afd86fbff..3b796802d 100644
--- a/manifests/provision.pp
+++ b/manifests/provision.pp
@@ -62,14 +62,14 @@ class openstack_integration::provision {
     container_format => 'bare',
     disk_format      => 'qcow2',
     is_public        => 'yes',
-    source           => '/tmp/openstack/image/cirros-0.3.5-x86_64-disk.img'
+    source           => '/tmp/openstack/image/cirros-0.4.0-x86_64-disk.img'
   }
   glance_image { 'cirros_alt':
     ensure           => present,
     container_format => 'bare',
     disk_format      => 'qcow2',
     is_public        => 'yes',
-    source           => '/tmp/openstack/image/cirros-0.3.5-x86_64-disk.img'
+    source           => '/tmp/openstack/image/cirros-0.4.0-x86_64-disk.img'
   }
   Keystone_user_role['admin@openstack'] -> Glance_image<||>
 }
diff --git a/manifests/tempest.pp b/manifests/tempest.pp
index 61f9170e7..5487080e0 100644
--- a/manifests/tempest.pp
+++ b/manifests/tempest.pp
@@ -248,7 +248,7 @@ class openstack_integration::tempest (
     db_flavor_ref            => '42',
     image_ssh_user           => 'cirros',
     image_alt_ssh_user       => 'cirros',
-    img_file                 => 'cirros-0.3.5-x86_64-disk.img',
+    img_file                 => 'cirros-0.4.0-x86_64-disk.img',
     compute_build_interval   => 10,
     ca_certificates_file     => $::openstack_integration::params::ca_bundle_cert_path,
     manage_tests_packages    => true,
diff --git a/run_tests.sh b/run_tests.sh
index 0ae38728a..c5d9ff96a 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -144,11 +144,11 @@ if [[ ! -e $IMG_DIR ]]; then
     mkdir -p $IMG_DIR
 fi
 
-if [ -f ~/cache/files/cirros-0.3.5-x86_64-disk.img ]; then
+if [ -f ~/cache/files/cirros-0.4.0-x86_64-disk.img ]; then
     # Create a symlink for tempest.
-    ln -s ~/cache/files/cirros-0.3.5-x86_64-disk.img $IMG_DIR
+    ln -s ~/cache/files/cirros-0.4.0-x86_64-disk.img $IMG_DIR
 else
-    wget http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img -P $IMG_DIR
+    wget http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-x86_64-disk.img -P $IMG_DIR
 fi
 
 install_puppet