diff --git a/defaults/main.yml b/defaults/main.yml
index 766af2a9..101bd430 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -187,6 +187,10 @@ tempest_images:
     checksum: "sha256:e137062a4dfbb4c225971b67781bc52183d14517170e16a3841d16f962ae7470"
     format: "qcow2"
     name: "cirros"
+  - url: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img"
+    checksum: "sha256:e137062a4dfbb4c225971b67781bc52183d14517170e16a3841d16f962ae7470"
+    format: "qcow2"
+    name: "cirros"
 
 # The location where images are downloaded to
 tempest_image_dir: "/opt/cache/files"
diff --git a/tasks/tempest_resources.yml b/tasks/tempest_resources.yml
index b4500120..25f707f6 100644
--- a/tasks/tempest_resources.yml
+++ b/tasks/tempest_resources.yml
@@ -65,11 +65,12 @@
   delay: 15
   when: tempest_service_available_glance | bool
 
-# This fact is used in tempest.conf.j2; we set an empty string if it doesn't get
+# These facts are used in tempest.conf.j2; we set an empty string if it is not
 # set above to ensure the template will parse correctly.
-- name: Store tempest image id
+- name: Store first tempest image id
   set_fact:
-    tempest_glance_image_id: "{{ tempest_service_available_glance | ternary(tempest_image_create['results'][0]['id'], '') }}"
+    tempest_glance_image_id_1: "{{ tempest_service_available_glance | ternary(tempest_image_create['results'][0]['id'], '') }}"
+    tempest_glance_image_id_2: "{{ tempest_service_available_glance | ternary(tempest_image_create['results'][1]['id'], '') }}"
 
 - name: Ensure tempest tenants
   keystone:
diff --git a/templates/tempest.conf.j2 b/templates/tempest.conf.j2
index 36fd689d..2c5193be 100644
--- a/templates/tempest.conf.j2
+++ b/templates/tempest.conf.j2
@@ -22,8 +22,8 @@ endpoint_type = internalURL
 
 
 [compute]
-image_ref = {{ tempest_glance_image_id }}
-image_ref_alt = {{ tempest_glance_image_id }}
+image_ref = {{ tempest_glance_image_id_1 }}
+image_ref_alt = {{ tempest_glance_image_id_2 }}
 flavor_ref = 201
 flavor_ref_alt = 202
 fixed_network_name = private
@@ -97,7 +97,7 @@ floating_network_name = public
 
 [network-feature-enabled]
 ipv6 = false
-api_extensions = agent,allowed-address-pairs,binding,dhcp_agent_scheduler,ext-gw-mode,external-net,extra_dhcp_opt,extra_dhcp_optagent,extraroute,l3_agent_scheduler,metering,provider,quotas,router,security-group,service-type
+api_extensions = agent,allowed-address-pairs,binding,dhcp_agent_scheduler,ext-gw-mode,external-net,extra_dhcp_opt,extra_dhcp_optagent,extraroute,l3_agent_scheduler,metering,provider,quotas,router,security-group,service-type,subnet_allocation
 
 
 [object-storage]