diff --git a/playbooks/baremetal-full-overcloud-validate.yml b/playbooks/baremetal-full-overcloud-validate.yml
index 686d548f1..5e5970016 100644
--- a/playbooks/baremetal-full-overcloud-validate.yml
+++ b/playbooks/baremetal-full-overcloud-validate.yml
@@ -44,6 +44,7 @@
       vars:
         tempest_install_method: distro
         tempest_cloud_name: 'overcloud'
+      when: use_os_tempest | default(true)
   environment:
     # Disable ssl waarnings
     CURL_CA_BUNDLE: ""
diff --git a/playbooks/multinode-standalone-upgrade.yml b/playbooks/multinode-standalone-upgrade.yml
index 119d8c9b2..7c00d9965 100644
--- a/playbooks/multinode-standalone-upgrade.yml
+++ b/playbooks/multinode-standalone-upgrade.yml
@@ -106,6 +106,7 @@
     tempest_cidr: '192.168.24.0/24'
   tasks:
     - include_tasks: tasks/tempest.yml
+      when: use_os_tempest | default(true)
   environment:
     # Disable ssl warnings
     CURL_CA_BUNDLE: ""
diff --git a/playbooks/multinode-standalone.yml b/playbooks/multinode-standalone.yml
index 57f9c2931..0e8944057 100644
--- a/playbooks/multinode-standalone.yml
+++ b/playbooks/multinode-standalone.yml
@@ -68,6 +68,7 @@
     - include_tasks: tasks/tempest.yml
       when: job is undefined or (job is defined and
             job.featureset is defined and job.featureset != '056')
+            and use_os_tempest | default(true)
   environment:
     # Disable ssl warnings
     CURL_CA_BUNDLE: ""
diff --git a/playbooks/multinode-validate.yml b/playbooks/multinode-validate.yml
index 55fa413ed..f82e4b52c 100644
--- a/playbooks/multinode-validate.yml
+++ b/playbooks/multinode-validate.yml
@@ -30,6 +30,7 @@
     tempest_cidr: '192.168.24.0/24'
   tasks:
     - include_tasks: tasks/tempest.yml
+      when: use_os_tempest | default(true)
   environment:
     # Disable ssl waarnings
     CURL_CA_BUNDLE: ""
diff --git a/playbooks/quickstart-extras-standalone.yml b/playbooks/quickstart-extras-standalone.yml
index 406d70841..00b1c91d7 100644
--- a/playbooks/quickstart-extras-standalone.yml
+++ b/playbooks/quickstart-extras-standalone.yml
@@ -58,6 +58,7 @@
     tempest_cloud_name: 'standalone'
   tasks:
     - include_tasks: tasks/tempest.yml
+      when: use_os_tempest | default(true)
   environment:
     # Disable ssl warnings
     CURL_CA_BUNDLE: ""
diff --git a/playbooks/quickstart-extras-validate.yml b/playbooks/quickstart-extras-validate.yml
index d0c7e20b0..8ad1d2d4f 100644
--- a/playbooks/quickstart-extras-validate.yml
+++ b/playbooks/quickstart-extras-validate.yml
@@ -25,6 +25,7 @@
       vars:
         tempest_install_method: distro
         tempest_cloud_name: 'overcloud'
+      when: use_os_tempest | default(true)
   environment:
     # Disable ssl waarnings
     CURL_CA_BUNDLE: ""