diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index 50b76a5381f338b6b01b69c2594c8e33f97d82b3..2f8cd1674a15079a775d74f361047bf2f3853d5e 100644
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -5550,8 +5550,8 @@ test_141() {
         for ls in /proc/fs/lustre/ldlm/namespaces/MGC*/lru_size; do
                 echo "clear" > $ls
         done
-        cleanup || error "failed to cleanup"
-        setup || error "failed to setup"
+        FAIL_ON_ERROR=true cleanup
+        FAIL_ON_ERROR=true setup
 }
 run_test 141 "umount should not race with any mgc requeue thread"