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,12 @@
 
 # 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 --implicit-check-not=barrr
 
 # 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: barrr
 
 --- !ELF
 FileHeader:
@@ -23,18 +23,18 @@
     Type:        SHT_RELA
     Relocations:
       - Offset:  0x0000000000000001
-        Symbol:  bar
+        Symbol:  barrr
         Type:    R_X86_64_32
   - Name:        .rela.text2
     Type:        SHT_RELA
     Relocations:
       - Offset:  0x0000000000000001
-        Symbol:  bar
+        Symbol:  barrr
         Type:    R_X86_64_32
   - Name:        .other.section
     Type:        SHT_PROGBITS
 Symbols:
-  - Name:    bar
+  - Name:    barrr
     Binding: STB_GLOBAL
 ...
 
@@ -43,7 +43,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 --implicit-check-not=barrr
 
 --- !ELF
 FileHeader:
@@ -55,6 +55,6 @@
   - Name: .keep_me
     Type: SHT_PROGBITS
 Symbols:
-  - Name:    bar
+  - Name:    barrr
     Binding: STB_GLOBAL
 ...
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,10 +5,10 @@
 # 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 --implicit-check-not=barrr --implicit-check-not=.blag
 
 # VALIDATE: String dump of section '.strtab':
-# VALIDATE: bazfoobar
+# VALIDATE: bazfoobarrr
 # VALIDATE: String dump of section '.shstrtab':
 # VALIDATE: .blam.blah.blag
 
@@ -21,9 +21,9 @@
 # COPY:   Name: .blah.blag (
 # COPY:   Name: .blag (
 # COPY: Symbols [
-# COPY:   Name: bar (
-# COPY:   Name: foobar (
-# COPY:   Name: bazfoobar (
+# COPY:   Name: barrr (
+# COPY:   Name: foobarrr (
+# COPY:   Name: bazfoobarrr (
 
 ## Case 2: Rename section.
 # RUN: llvm-objcopy %t.o %t.rename-section --rename-section .blah.blag=.blob.blab
@@ -36,14 +36,14 @@
 # RENAME-SECTION:   Name: .blag (
 
 ## Case 3: Rename symbol.
-# RUN: llvm-objcopy %t.o %t.rename-symbol --redefine-sym foobar=raboof
+# RUN: llvm-objcopy %t.o %t.rename-symbol --redefine-sym foobarrr=raboof
 # RUN: llvm-readobj --symbols %t.rename-symbol \
 # RUN:   | FileCheck %s --check-prefix=RENAME-SYMBOL
 
 # RENAME-SYMBOL: Symbols [
-# RENAME-SYMBOL:   Name: bar (
+# RENAME-SYMBOL:   Name: barrr (
 # RENAME-SYMBOL:   Name: raboof (
-# RENAME-SYMBOL:   Name: bazfoobar (
+# RENAME-SYMBOL:   Name: bazfoobarrr (
 
 ## Case 4: Remove section.
 # RUN: llvm-objcopy %t.o %t.remove-section -R .blah.blag
@@ -55,13 +55,13 @@
 # REMOVE-SECTION:   Name: .blag (
 
 ## Case 5: Remove symbol.
-# RUN: llvm-objcopy %t.o %t.remove-symbol -N foobar
+# RUN: llvm-objcopy %t.o %t.remove-symbol -N foobarrr
 # RUN: llvm-readobj --symbols %t.remove-symbol \
-# RUN:   | FileCheck %s --check-prefix=REMOVE-SYMBOL --implicit-check-not foobar
+# RUN:   | FileCheck %s --check-prefix=REMOVE-SYMBOL --implicit-check-not foobarrr
 
 # REMOVE-SYMBOL: Symbols [
-# REMOVE-SYMBOL:   Name: bar (
-# REMOVE-SYMBOL:   Name: bazfoobar (
+# REMOVE-SYMBOL:   Name: barrr (
+# REMOVE-SYMBOL:   Name: bazfoobarrr (
 
 --- !ELF
 FileHeader:
@@ -77,6 +77,6 @@
   - Name: .blag
     Type: SHT_PROGBITS
 Symbols:
-  - Name: bar
-  - Name: foobar
-  - Name: bazfoobar
+  - Name: barrr
+  - Name: foobarrr
+  - Name: bazfoobarrr