diff --git a/lld/test/COFF/start-lib.ll b/lld/test/COFF/start-lib.ll
--- a/lld/test/COFF/start-lib.ll
+++ b/lld/test/COFF/start-lib.ll
@@ -23,7 +23,7 @@
 ; RUN:     %t.bc -start-lib %t1.bc -end-lib %t2.bc
 ; RUN: FileCheck --check-prefix=TEST2 %s < %t2.thinlto.map
 ; TEST2-NOT: Name: foo
-; TEST2: bar
+; TEST2: {{[[:<:]]bar}}
 ; TEST2-NOT: Name: foo
 ;
 ; RUN: lld-link -out:%t3.exe -entry:main -opt:noref -lldmap:%t3.map \
@@ -32,8 +32,8 @@
 ; RUN: lld-link -out:%t3.exe -entry:main -opt:noref -lldmap:%t3.thinlto.map \
 ; RUN:     %t.bc -start-lib %t1.bc %t2.bc
 ; RUN: FileCheck --check-prefix=TEST3 %s < %t3.thinlto.map
-; TEST3-NOT: foo
-; TEST3-NOT: bar
+; TEST3-NOT: {{[[:<:]]foo}}
+; TEST3-NOT: {{[[:<:]]bar}}
 
 target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-pc-windows-msvc"
diff --git a/lld/test/ELF/assignment-archive.s b/lld/test/ELF/assignment-archive.s
--- a/lld/test/ELF/assignment-archive.s
+++ b/lld/test/ELF/assignment-archive.s
@@ -7,6 +7,7 @@
 # RUN: echo "SECTIONS { foo = 1; }" > %t1.script
 # RUN: ld.lld -o %t1.exe --script %t1.script %tar.a %t.o
 # RUN: llvm-readobj --symbols %t1.exe | FileCheck %s
+# CHECK:     Symbols [
 # CHECK-NOT: bar
 # CHECK:     foo
 # CHECK-NOT: bar
diff --git a/lld/test/ELF/lto/linker-script-symbols-assign.ll b/lld/test/ELF/lto/linker-script-symbols-assign.ll
--- a/lld/test/ELF/lto/linker-script-symbols-assign.ll
+++ b/lld/test/ELF/lto/linker-script-symbols-assign.ll
@@ -5,6 +5,7 @@
 ; RUN: ld.lld %t.o -o %t2 --script %t.script -save-temps
 ; RUN: llvm-readobj --symbols %t2.lto.o | FileCheck %s
 
+; CHECK: Symbols [
 ; CHECK-NOT: bar
 ; CHECK-NOT: foo
 
diff --git a/lld/test/ELF/undefined-glob.s b/lld/test/ELF/undefined-glob.s
--- a/lld/test/ELF/undefined-glob.s
+++ b/lld/test/ELF/undefined-glob.s
@@ -16,6 +16,7 @@
 # RUN: ld.lld -o %t.exe %t.o %t.a
 # RUN: llvm-readobj --symbols %t.exe | FileCheck --check-prefix=NO-OPT %s
 
+# NO-OPT: Symbols [
 # NO-OPT-NOT: foo
 # NO-OPT-NOT: bar
 
diff --git a/llvm/test/tools/llvm-objcopy/ELF/only-section-strip-undefined.test b/llvm/test/tools/llvm-objcopy/ELF/only-section-strip-undefined.test
--- a/llvm/test/tools/llvm-objcopy/ELF/only-section-strip-undefined.test
+++ b/llvm/test/tools/llvm-objcopy/ELF/only-section-strip-undefined.test
@@ -3,12 +3,14 @@
 
 # RUN: yaml2obj --docnum=1 %s -o %t.o
 # RUN: llvm-objcopy -j .other.section %t.o %t2.o
-# RUN: llvm-readobj --symbols %t2.o | FileCheck %s --implicit-check-not=bar
+# RUN: llvm-readobj --symbols %t2.o | FileCheck %s --check-prefix=NOBAR
+
+# NOBAR-NOT: {{Name:.*bar}}
 
 # RUN: llvm-objcopy -j .text -j .rela.text1 %t.o %t2.o
 # RUN: llvm-readobj --symbols %t2.o | FileCheck %s --check-prefix=BAR
 
-# BAR: bar
+# BAR: {{Name:.*bar}}
 
 --- !ELF
 FileHeader:
@@ -43,7 +45,7 @@
 
 # RUN: yaml2obj --docnum=2 %s -o %t.o
 # RUN: llvm-objcopy -j .keep_me %t.o %t2.o
-# RUN: llvm-readobj --symbols %t2.o | FileCheck %s --implicit-check-not=bar
+# RUN: llvm-readobj --symbols %t2.o | FileCheck %s --check-prefix=NOBAR
 
 --- !ELF
 FileHeader:
diff --git a/llvm/test/tools/llvm-objcopy/ELF/tail-merged-string-tables.test b/llvm/test/tools/llvm-objcopy/ELF/tail-merged-string-tables.test
--- a/llvm/test/tools/llvm-objcopy/ELF/tail-merged-string-tables.test
+++ b/llvm/test/tools/llvm-objcopy/ELF/tail-merged-string-tables.test
@@ -5,12 +5,15 @@
 # RUN: yaml2obj %s -o %t.o
 ## Sanity check that the strings have been pooled.
 # RUN: llvm-readobj %t.o --string-dump .strtab --string-dump .shstrtab \
-# RUN:   | FileCheck %s --check-prefix=VALIDATE --implicit-check-not=bar --implicit-check-not=.blag
+# RUN:   | FileCheck %s --check-prefix=VALIDATE
 
 # VALIDATE: String dump of section '.strtab':
-# VALIDATE: bazfoobar
+# VALIDATE-NEXT: bazfoobar
+# VALIDATE-EMPTY
 # VALIDATE: String dump of section '.shstrtab':
+# VALIDATE-NOT: .blag
 # VALIDATE: .blam.blah.blag
+# VALIDATE-NOT: .blag
 
 ## Case 1: Basic copy.
 # RUN: llvm-objcopy %t.o %t.copy