diff --git a/roles/common/vars/main.yaml b/roles/common/vars/main.yaml
index 44edcd186..64a0778a5 100644
--- a/roles/common/vars/main.yaml
+++ b/roles/common/vars/main.yaml
@@ -5,6 +5,12 @@ tripleo_quickstart_dir: "{{ ansible_user_dir }}/{{ zuul.projects['git.openstack.
 vxlan_vars: "-e toci_vxlan_networking='false' -e vxlan_networking='false'"
 extra_vars: ""
 job_featureset_file: "{{ tripleo_quickstart_dir }}/config/general_config/featureset{{ featureset }}.yml"
+skip_tags_list: >-
+  {% if environment_type == 'baremetal' -%}
+  tripleo-validations
+  {%- else -%}
+  tripleo-validations,teardown-all
+  {%- endif -%}
 
 featureset_conf: >-
   {% if common_featureset is defined -%}
diff --git a/roles/run-test/templates/toci_quickstart.sh.j2 b/roles/run-test/templates/toci_quickstart.sh.j2
index 26aa9da63..c4ce9a3f0 100755
--- a/roles/run-test/templates/toci_quickstart.sh.j2
+++ b/roles/run-test/templates/toci_quickstart.sh.j2
@@ -17,7 +17,7 @@ export DEFAULT_ARGS="--extra-vars local_working_dir=$LOCAL_WORKING_DIR \
     --inventory $LOCAL_WORKING_DIR/hosts \
     --extra-vars tripleo_root={{ tripleo_root }} \
     --extra-vars working_dir=$WORKING_DIR \
-    --skip-tags "tripleo-validations,teardown-all" \
+    --skip-tags "{{ skip_tags_list }}" \
 "
 
 # --install-deps arguments installs deps and then quits, no other arguments are
diff --git a/toci-quickstart/config/testenv/baremetal_hosts b/toci-quickstart/config/testenv/baremetal_hosts
new file mode 100644
index 000000000..e69de29bb