diff --git a/roles/validate-tempest/defaults/main.yml b/roles/validate-tempest/defaults/main.yml
index 06071d180..5a70ea616 100644
--- a/roles/validate-tempest/defaults/main.yml
+++ b/roles/validate-tempest/defaults/main.yml
@@ -39,7 +39,9 @@ tempest_version: "{{ tempest_version_dict[release] }}"
 tempestmail_config: config.yaml
 tempestmail_log_server: http://logs.openstack.org
 tempest_track_resources: true
-tempest_test_image_path: http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img
+tempest_test_image_version: 0.3.5
+tempest_test_image_name: cirros-{{ tempest_test_image_version }}-x86_64-disk.img
+tempest_test_image_path: http://download.cirros-cloud.net/{{ tempest_test_image_version }}/{{ tempest_test_image_name }}
 # A dict containing values to be removed from tempest.conf
 tempest_conf_removal:
   network-feature-enabled.api_extensions: dvr
diff --git a/roles/validate-tempest/templates/configure-tempest.sh.j2 b/roles/validate-tempest/templates/configure-tempest.sh.j2
index 370a7b52f..eb87ad5c5 100644
--- a/roles/validate-tempest/templates/configure-tempest.sh.j2
+++ b/roles/validate-tempest/templates/configure-tempest.sh.j2
@@ -183,6 +183,7 @@ ${TEMPESTCONF} --out etc/tempest.conf \
   {% endfor %}
   {% endif %}
   compute-feature-enabled.console_output true \
+  scenario.img_file {{ tempest_test_image_name }} \
   orchestration.stack_owner_role Member
 
 ### --stop_docs