diff --git a/zaza/openstack/charm_tests/tempest/setup.py b/zaza/openstack/charm_tests/tempest/setup.py
index eaa855a..23308af 100644
--- a/zaza/openstack/charm_tests/tempest/setup.py
+++ b/zaza/openstack/charm_tests/tempest/setup.py
@@ -169,7 +169,7 @@ def add_keystone_config(ctxt, keystone_session):
 
 
 def get_service_list(keystone_session):
-    """Add keystone config to context.
+    """Retrieve list of services from keystone.
 
     :param keystone_session: keystoneauth1.session.Session object
     :type: keystoneauth1.session.Session
diff --git a/zaza/openstack/charm_tests/tempest/templates/tempest_v2.j2 b/zaza/openstack/charm_tests/tempest/templates/tempest_v2.j2
index b4f2dfc..f5505ad 100644
--- a/zaza/openstack/charm_tests/tempest/templates/tempest_v2.j2
+++ b/zaza/openstack/charm_tests/tempest/templates/tempest_v2.j2
@@ -45,8 +45,10 @@ api_v2 = true
 api_v3 = false
 {% endif %}
 
+{% if 'glance' in enabled_services %}
 [image]
 http_image = http://{{ test_swift_ip }}:80/swift/v1/images/cirros-0.3.4-x86_64-uec.tar.gz
+{% endif %}
 
 {% if 'neutron' in enabled_services %}
 [network]
diff --git a/zaza/openstack/charm_tests/tempest/templates/tempest_v3.j2 b/zaza/openstack/charm_tests/tempest/templates/tempest_v3.j2
index dc7d8db..0ed401a 100644
--- a/zaza/openstack/charm_tests/tempest/templates/tempest_v3.j2
+++ b/zaza/openstack/charm_tests/tempest/templates/tempest_v3.j2
@@ -47,8 +47,10 @@ api_v2 = false
 api_v3 = true
 {% endif %}
 
+{% if 'glance' in enabled_services %}
 [image]
 http_image = http://{{ test_swift_ip }}:80/swift/v1/images/cirros-0.3.4-x86_64-uec.tar.gz
+{% endif %}
 
 {% if 'neutron' in enabled_services %}
 [network]
@@ -98,4 +100,5 @@ storage_protocol = ceph
 catalog_type = {{ catalog_type }}
 
 [volume-feature-enabled]
+backup = false
 {% endif %}