Index: test/elf/dynamic-undef.test
===================================================================
--- test/elf/dynamic-undef.test
+++ test/elf/dynamic-undef.test
@@ -26,9 +26,9 @@
 RUN: --use-shlib-undefines --no-allow-shlib-undefined  2> %t2
 RUN: llvm-readobj -symbols %t.useundefines | FileCheck -check-prefix=SHLIB-UNDEF-SYMBOLS %s
 
-EXEC: Undefined symbol: {{[+-_A-Za-z0-9.\\/:]+}}shared.so-x86-64: puts
-SHLIB: Undefined symbol: {{[+-_A-Za-z0-9.\\/:]+}}shared.so-x86-64: puts
-EXEC-NOT: Undefined symbol: {{[+-_A-Za-z0-9.\\/:]+}}shared.so-x86-64: weakfoo
-SHLIB-NOT: Undefined symbol: {{[+-_A-Za-z0-9.\\/:]+}}shared.so-x86-64: weakfoo
+EXEC: Undefined symbol: {{.+[\\/]}}shared.so-x86-64: puts
+SHLIB: Undefined symbol: {{.+[\\/]}}shared.so-x86-64: puts
+EXEC-NOT: Undefined symbol: {{.+[\\/]}}shared.so-x86-64: weakfoo
+SHLIB-NOT: Undefined symbol: {{.+[\\/]}}shared.so-x86-64: weakfoo
 SHLIB-NOUNDEF-NOT: Name: puts
 SHLIB-UNDEF-SYMBOLS: Name: puts
Index: test/elf/filenotfound.test
===================================================================
--- test/elf/filenotfound.test
+++ test/elf/filenotfound.test
@@ -1,3 +1,3 @@
 # Check that a file that cannot be found results in a proper error message
 RUN: not lld -flavor gnu -target x86_64 %p/Inputs/nofile.o 2>&1 | FileCheck %s
-#CHECK: lld: cannot find file {{[+-_A-Za-z0-9.\\/:]+}}nofile.o
+#CHECK: lld: cannot find file {{.+[\\/]}}nofile.o