diff --git "a/\173\173 cookiecutter._env_name \175\175/features/runtest/runtest.yml" "b/\173\173 cookiecutter._env_name \175\175/features/runtest/runtest.yml"
index c861cfb..bc7f90d 100644
--- "a/\173\173 cookiecutter._env_name \175\175/features/runtest/runtest.yml"
+++ "b/\173\173 cookiecutter._env_name \175\175/features/runtest/runtest.yml"
@@ -1,9 +1,9 @@
 classes:
 - service.runtest.tempest
-{%- if default_context.manila_enabled == 'True' %}
+{%- if default_context.get('manila_enabled', 'False') == 'True' %}
 - service.runtest.tempest.services.manila.glance
 {%- endif %}
-{%- if default_context.barbican_enabled == 'True' %}
+{%- if default_context.get('barbican_enabled', 'False') == 'True' and default_context.get('barbican_integration_enabled', 'False') == 'True' %}
 - service.runtest.tempest.barbican
 {%- endif %}
 parameters:
diff --git "a/\173\173 cookiecutter._env_name \175\175/features/runtest/runtest_cfg.yml" "b/\173\173 cookiecutter._env_name \175\175/features/runtest/runtest_cfg.yml"
index 95e8040..48fa06d 100644
--- "a/\173\173 cookiecutter._env_name \175\175/features/runtest/runtest_cfg.yml"
+++ "b/\173\173 cookiecutter._env_name \175\175/features/runtest/runtest_cfg.yml"
@@ -1,9 +1,9 @@
 classes:
 - service.runtest.tempest
-{%- if default_context.manila_enabled == 'True' %}
+{%- if default_context.get('manila_enabled', 'False') == 'True' %}
 - service.runtest.tempest.services.manila.glance
 {%- endif %}
-{%- if default_context.barbican_enabled == 'True' %}
+{%- if default_context.get('barbican_enabled', 'False') == 'True' and default_context.get('barbican_integration_enabled', 'False') == 'True' %}
 - service.runtest.tempest.barbican
 {%- endif %}
 parameters: