diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index 3cfcc5b94de8c1ae40f68785bd1d32f3eec70d9f..37b04d183c2ab700f994cee7a66cd8b6ecff273a 100644
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -5764,8 +5764,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"