diff --git a/zaza/openstack/charm_tests/tempest/setup.py b/zaza/openstack/charm_tests/tempest/setup.py
index b22ccb7..7ae0ba3 100644
--- a/zaza/openstack/charm_tests/tempest/setup.py
+++ b/zaza/openstack/charm_tests/tempest/setup.py
@@ -276,7 +276,8 @@ def get_tempest_context(workspace_path):
             ctxt_func(ctxt, keystone_session)
     add_environment_var_config(ctxt, ctxt['enabled_services'])
     add_auth_config(ctxt)
-    add_octavia_config(ctxt)
+    if 'octavia' in ctxt['enabled_services']:
+        add_octavia_config(ctxt)
     return ctxt