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 356ed0f..c861cfb 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,10 @@
 classes:
 - service.runtest.tempest
-{% if defaut_context is defined %}
-{%- if default_context.get('barbican_enabled', 'False') == 'True' %}
-- service.runtest.tempest.barbican
+{%- if default_context.manila_enabled == 'True' %}
+- service.runtest.tempest.services.manila.glance
 {%- endif %}
+{%- if default_context.barbican_enabled == 'True' %}
+- service.runtest.tempest.barbican
 {%- endif %}
 parameters:
   _param:
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 a81b670..95e8040 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,13 +1,11 @@
 classes:
 - service.runtest.tempest
-{% if defaut_context is defined %}
-{%- if default_context.get('manila_enabled', 'False') == 'True' %}
+{%- if default_context.manila_enabled == 'True' %}
 - service.runtest.tempest.services.manila.glance
 {%- endif %}
-{%- if default_context.get('barbican_enabled', 'False') == 'True' %}
+{%- if default_context.barbican_enabled == 'True' %}
 - service.runtest.tempest.barbican
 {%- endif %}
-{%- endif %}
 parameters:
   _param:
     image_host: http://cz8133.bud.mirantis.net:8099