diff --git a/playbooks/roles/tripleo/overcloud/defaults/main.yml b/playbooks/roles/tripleo/overcloud/defaults/main.yml
index 7189cd498..d1d355926 100644
--- a/playbooks/roles/tripleo/overcloud/defaults/main.yml
+++ b/playbooks/roles/tripleo/overcloud/defaults/main.yml
@@ -43,6 +43,6 @@ deploy_args: >-
 
 step_deploy_overcloud: true
 step_validate_overcloud: true
-prepare_tempest: true
+prepare_tempest: false
 test_tempest: false
 test_ping: true
diff --git a/playbooks/roles/tripleo/overcloud/templates/overcloud-validate.sh.j2 b/playbooks/roles/tripleo/overcloud/templates/overcloud-validate.sh.j2
index 5c3856449..b907c5d86 100644
--- a/playbooks/roles/tripleo/overcloud/templates/overcloud-validate.sh.j2
+++ b/playbooks/roles/tripleo/overcloud/templates/overcloud-validate.sh.j2
@@ -3,14 +3,24 @@
 
 set -eux
 
-{% if test_ping|bool %}
+TEST_PING={% if test_ping|bool %}1{% else %}0{% endif %}
+
+PREPARE_TEMPEST={% if prepare_tempest|bool %}1{% else %}0{% endif %}
+
+TEST_TEMPEST={% if test_tempest|bool %}1{% else %}0{% endif %}
+
+
+if [ ${TEST_PING} == "1" ]; then
 {% include 'tripleo-pingtest.sh.j2' %}
-{% endif %}
 
-{% if prepare_tempest|bool %}
+fi
+
+if [ ${PREPARE_TEMPEST} == "1" ]; then
 {% include 'configure-tempest.sh.j2' %}
-{% endif %}
 
-{% if test_tempest|bool %}
+fi
+
+if [ ${TEST_TEMPEST} == "1" ]; then
 {% include 'run-tempest.sh.j2' %}
-{% endif %}
+
+fi