diff --git a/llvm/test/Object/archive-big-malformed-first-member.test b/llvm/test/Object/archive-big-malformed-first-member.test
--- a/llvm/test/Object/archive-big-malformed-first-member.test
+++ b/llvm/test/Object/archive-big-malformed-first-member.test
@@ -1,7 +1,8 @@
-# Test reading an empty archive with first member's offset is not zero.
+## Test reading an empty archive with first member's offset is not zero.
 # RUN: echo    "<bigaf>" > %t.a
 # RUN: echo -n "0                   0                   0                   128                 0                   0                   " >> %t.a
-# RUN: not llvm-ar tv %t.a 2>&1 | grep 'truncated or malformed archive'
+# RUN: not llvm-ar tv %t.a 2>&1 | FileCheck %s
 # RUN: echo    "<bigaf>" > %t.a
 # RUN: echo -n "0                   0                   0                   28                  0                   0                   " >> %t.a
-# RUN: not llvm-ar tv %t.a 2>&1 | grep 'truncated or malformed archive'
+# RUN: not llvm-ar tv %t.a 2>&1 | FileCheck %s
+# CHECK: truncated or malformed archive
diff --git a/llvm/test/Object/archive-big-read-empty-with-freelist.test b/llvm/test/Object/archive-big-read-empty-with-freelist.test
--- a/llvm/test/Object/archive-big-read-empty-with-freelist.test
+++ b/llvm/test/Object/archive-big-read-empty-with-freelist.test
@@ -1,3 +1,2 @@
-# Test reading an empty archive with free list in it.
-# RUN: llvm-ar tv %p/Inputs/aix-empty-big-archive-with-freelist.a 2>&1 \
-# RUN:   | not grep 'truncated or malformed archive'
+## Test reading an empty archive with free list in it, should exit normally.
+# RUN: llvm-ar tv %p/Inputs/aix-empty-big-archive-with-freelist.a 2>&1