diff --git a/inventory_examples/physical_inventory.yaml b/inventory_examples/physical_inventory.yaml
index c87e92a..766a858 100644
--- a/inventory_examples/physical_inventory.yaml
+++ b/inventory_examples/physical_inventory.yaml
@@ -93,3 +93,7 @@
           role: single_mgm
         enp2s0f1:
           role: bond0_ab_dvr_vlan_ctl_prv_floating
+
+default_context:
+    manila_enabled: 'False'
+    barbican_enabled: 'False'
diff --git a/inventory_examples/reduced_footprint_with_cfg01.yaml b/inventory_examples/reduced_footprint_with_cfg01.yaml
index 290e515..9ec6432 100644
--- a/inventory_examples/reduced_footprint_with_cfg01.yaml
+++ b/inventory_examples/reduced_footprint_with_cfg01.yaml
@@ -4,6 +4,7 @@
       roles:
       - infra_config
       - linux_system_codename_xenial
+      - features_runtest
       classes:
       - system.openssh.client.lab
       interfaces:
@@ -165,3 +166,7 @@
         ens4:
           role: single_ctl
           single_address: ${_param:openstack_dns_node02_address}
+
+default_context:
+    manila_enabled: 'False'
+    barbican_enabled: 'False'
diff --git a/inventory_examples/vcp_os_sl_inventory.yaml b/inventory_examples/vcp_os_sl_inventory.yaml
index de95d4c..3936092 100644
--- a/inventory_examples/vcp_os_sl_inventory.yaml
+++ b/inventory_examples/vcp_os_sl_inventory.yaml
@@ -207,3 +207,7 @@
       interfaces:
         ens3:
           role: single_ctl
+
+default_context:
+    manila_enabled: 'False'
+    barbican_enabled: 'False'
diff --git a/tests/test_yaml_templates.py b/tests/test_yaml_templates.py
index 07dd570..92fd870 100644
--- a/tests/test_yaml_templates.py
+++ b/tests/test_yaml_templates.py
@@ -39,7 +39,11 @@
                         }
                     }
                 }
-            }
+            },
+            'default_context': {
+                'manila_enabled': 'False',
+                'barbican_enabled': 'False',
+            },
         }
         yield node, "test_env-interface-" + interface_role
 
@@ -56,7 +60,11 @@
                     ],
                     'interfaces': {}
                 }
-            }
+            },
+            'default_context': {
+                'manila_enabled': 'False',
+                'barbican_enabled': 'False',
+            },
         }
         yield node, "test_env-role-" + node_role
 
diff --git "a/\173\043 roles \043\175/features_runtest" "b/\173\043 roles \043\175/features_runtest"
new file mode 100644
index 0000000..501bb87
--- /dev/null
+++ "b/\173\043 roles \043\175/features_runtest"
@@ -0,0 +1,9 @@
+{#-
+parameters:
+  reclass:
+    storage:
+      node:
+        <reclass_storage_node_name>:
+          classes:
+#}
+          - environment.{{ cookiecutter._env_name }}.features.runtest.runtest
\ No newline at end of file
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"
new file mode 100644
index 0000000..c59a61c
--- /dev/null
+++ "b/\173\173 cookiecutter._env_name \175\175/features/runtest/runtest.yml"
@@ -0,0 +1,25 @@
+classes:
+- service.runtest.tempest
+{%- if default_context.get('manila_enabled', 'False') == 'True' %}
+- service.runtest.tempest.services.manila.glance
+{%- endif %}
+{%- if default_context.get('barbican_enabled', 'False') == 'True' %}
+- service.runtest.tempest.barbican
+{%- endif %}
+parameters:
+  _param:
+    image_host: http://cz8133.bud.mirantis.net:8099
+    glance_image_cirros_location: ${_param:image_host}/cirros-0.3.5-x86_64-disk.img
+    glance_image_fedora_location: ${_param:image_host}/Fedora-Cloud-Base-27-1.6.x86_64.qcow2
+    glance_image_manila_location: ${_param:image_host}/manila-service-image-master.qcow2
+    tempest_test_target: gtw01*
+    runtest_tempest_cfg_dir: /tmp/test
+    runtest_tempest_cfg_name: tempest.conf
+  runtest:
+    tempest:
+      DEFAULT:
+        log_file: tempest.log
+      cfg_dir: ${_param:runtest_tempest_cfg_dir}
+      cfg_name: ${_param:runtest_tempest_cfg_name}
+      put_keystone_rc_enabled: True
+      put_local_image_file_enabled: False
\ No newline at end of file