diff --git a/tests/pre.yml b/tests/pre.yml
index 297bef9c2e..c5a1ebf174 100644
--- a/tests/pre.yml
+++ b/tests/pre.yml
@@ -1,5 +1,6 @@
 ---
 - hosts: all
+  any_errors_fatal: true
   vars:
     logs_dir: "/tmp/logs"
   tasks:
diff --git a/tests/run.yml b/tests/run.yml
index bf027f2915..8af8157636 100644
--- a/tests/run.yml
+++ b/tests/run.yml
@@ -1,5 +1,6 @@
 ---
 - hosts: all
+  any_errors_fatal: true
   tasks:
     # NOTE(yoctozepto): ensure we pick up fact changes from pre
     - name: Refresh facts
@@ -28,6 +29,7 @@
         ceph_storetype: "{{ hostvars[inventory_hostname].get('ceph_osd_storetype') }}"
 
 - hosts: primary
+  any_errors_fatal: true
   tasks:
     - name: detect whether need build images
       set_fact:
@@ -259,6 +261,7 @@
 
 # NOTE(yoctozepto): each host checks itself
 - hosts: all
+  any_errors_fatal: true
   tasks:
     - name: Pre-upgrade sanity checks
       block:
@@ -284,6 +287,7 @@
       when: is_upgrade
 
 - hosts: primary
+  any_errors_fatal: true
   tasks:
     # Upgrade: update config.
     - block:
@@ -393,6 +397,7 @@
 
 # NOTE(yoctozepto): each host checks itself
 - hosts: all
+  any_errors_fatal: true
   tasks:
     - name: Run check-failure.sh script
       shell: