diff --git a/tests/run.yml b/tests/run.yml
index 8ef045a174..f57447b753 100644
--- a/tests/run.yml
+++ b/tests/run.yml
@@ -248,15 +248,6 @@
             executable: /bin/bash
             chdir: "{{ kolla_ansible_src_dir }}"
           when: scenario == "mariadb"
-
-        - name: Run reconfigure.sh script
-          script:
-            cmd: reconfigure.sh
-            executable: /bin/bash
-            chdir: "{{ kolla_ansible_src_dir }}"
-          environment:
-            ACTION: "{{ scenario }}"
-          when: not is_upgrade
       when: scenario != "bifrost"
 
 # NOTE(yoctozepto): each host checks itself
@@ -416,3 +407,39 @@
         cmd: tests/check-logs.sh
         executable: /bin/bash
         chdir: "{{ kolla_ansible_src_dir }}"
+
+- hosts: primary
+  any_errors_fatal: true
+  tasks:
+    - name: Run reconfigure.sh script
+      script:
+        cmd: reconfigure.sh
+        executable: /bin/bash
+        chdir: "{{ kolla_ansible_src_dir }}"
+      environment:
+        ACTION: "{{ scenario }}"
+      when:
+        - not is_upgrade
+        - scenario != "bifrost"
+
+# NOTE(yoctozepto): each host checks itself
+- hosts: all
+  any_errors_fatal: true
+  tasks:
+    - name: Run check-failure.sh script
+      shell:
+        cmd: tests/check-failure.sh
+        executable: /bin/bash
+        chdir: "{{ kolla_ansible_src_dir }}"
+
+    - name: Run check-config.sh script
+      shell:
+        cmd: tests/check-config.sh
+        executable: /bin/bash
+        chdir: "{{ kolla_ansible_src_dir }}"
+
+    - name: Run check-logs.sh script
+      shell:
+        cmd: tests/check-logs.sh
+        executable: /bin/bash
+        chdir: "{{ kolla_ansible_src_dir }}"