diff --git a/compiler-rt/test/fuzzer/exit_on_src_pos.test b/compiler-rt/test/fuzzer/exit_on_src_pos.test
index 9aaf035fc7c837..541e0c4c6e4248 100644
--- a/compiler-rt/test/fuzzer/exit_on_src_pos.test
+++ b/compiler-rt/test/fuzzer/exit_on_src_pos.test
@@ -5,7 +5,7 @@
 # in expansion of %t cause the compiler to overwrite .lib and .exp files.
 
 # Test does not complete on Armv7 Thumb build bot
-UNSUPPORTED: target={{.*thumb.*}}
+UNSUPPORTED: target=thumb{{.*}}
 
 RUN: %cpp_compiler -O0 %S/SimpleTest.cpp -o %t-SimpleTest.exe -mllvm -use-unknown-locations=Disable
 RUN: %cpp_compiler -O0 %S/ShrinkControlFlowTest.cpp -o %t-ShrinkControlFlowTest.exe
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Linux/soft_rss_limit_mb_test.cpp b/compiler-rt/test/sanitizer_common/TestCases/Linux/soft_rss_limit_mb_test.cpp
index b5c749d478072c..6edfe762a05b7e 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Linux/soft_rss_limit_mb_test.cpp
+++ b/compiler-rt/test/sanitizer_common/TestCases/Linux/soft_rss_limit_mb_test.cpp
@@ -14,7 +14,7 @@
 // XFAIL: ubsan
 
 // THUMB starts background thead only for Asan.
-// XFAIL: target={{.*thumb.*}} && !asan
+// XFAIL: target=thumb{{.*}} && !asan
 
 // https://github.com/google/sanitizers/issues/981
 // UNSUPPORTED: android-26
diff --git a/compiler-rt/test/sanitizer_common/TestCases/compress_stack_depot.cpp b/compiler-rt/test/sanitizer_common/TestCases/compress_stack_depot.cpp
index be1a1d1e43a534..7ad0ff08df33da 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/compress_stack_depot.cpp
+++ b/compiler-rt/test/sanitizer_common/TestCases/compress_stack_depot.cpp
@@ -12,7 +12,7 @@
 // UNSUPPORTED: target=s390x{{.*}}
 
 // Similar to D114934, something is broken with background thread on THUMB and Asan.
-// XFAIL: target={{.*thumb.*}} && asan
+// XFAIL: target=thumb{{.*}} && asan
 
 #include <sanitizer/common_interface_defs.h>
 
diff --git a/compiler-rt/test/sanitizer_common/TestCases/hard_rss_limit_mb_test.cpp b/compiler-rt/test/sanitizer_common/TestCases/hard_rss_limit_mb_test.cpp
index 26831ab55916ba..4eb2247b1d38ff 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/hard_rss_limit_mb_test.cpp
+++ b/compiler-rt/test/sanitizer_common/TestCases/hard_rss_limit_mb_test.cpp
@@ -15,7 +15,7 @@
 // UNSUPPORTED: target={{.*(freebsd|solaris).*}}, darwin
 
 // THUMB starts background thead only for Asan.
-// XFAIL: target={{.*thumb.*}} && !asan
+// XFAIL: target=thumb{{.*}} && !asan
 
 #include <string.h>
 #include <stdio.h>
diff --git a/compiler-rt/test/sanitizer_common/TestCases/sanitizer_coverage_trace_pc_guard-dso.cpp b/compiler-rt/test/sanitizer_common/TestCases/sanitizer_coverage_trace_pc_guard-dso.cpp
index 9805fbd44eebd2..e27d552f3c3184 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/sanitizer_coverage_trace_pc_guard-dso.cpp
+++ b/compiler-rt/test/sanitizer_common/TestCases/sanitizer_coverage_trace_pc_guard-dso.cpp
@@ -1,7 +1,7 @@
 // Tests trace pc guard coverage collection.
 
 // REQUIRES: has_sancovcc
-// UNSUPPORTED: ubsan,target={{(powerpc64|s390x).*}},target={{.*thumb.*}}
+// UNSUPPORTED: ubsan,target={{(powerpc64|s390x|thumb).*}}
 // XFAIL: tsan,darwin
 // XFAIL: android && asan
 
diff --git a/compiler-rt/test/sanitizer_common/TestCases/sanitizer_coverage_trace_pc_guard.cpp b/compiler-rt/test/sanitizer_common/TestCases/sanitizer_coverage_trace_pc_guard.cpp
index c72f8bb88cb2ba..ed817961c688cc 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/sanitizer_coverage_trace_pc_guard.cpp
+++ b/compiler-rt/test/sanitizer_common/TestCases/sanitizer_coverage_trace_pc_guard.cpp
@@ -1,7 +1,7 @@
 // Tests trace pc guard coverage collection.
 
 // REQUIRES: has_sancovcc
-// UNSUPPORTED: ubsan,i386-darwin,target={{(powerpc64|s390x).*}},target={{.*thumb.*}}
+// UNSUPPORTED: ubsan,i386-darwin,target={{(powerpc64|s390x|thumb).*}}
 // XFAIL: tsan
 // XFAIL: android && asan
 
diff --git a/compiler-rt/test/ubsan/TestCases/Misc/Linux/diag-stacktrace.cpp b/compiler-rt/test/ubsan/TestCases/Misc/Linux/diag-stacktrace.cpp
index 9a3824c46ed7f7..8b7cb6ade35ac5 100644
--- a/compiler-rt/test/ubsan/TestCases/Misc/Linux/diag-stacktrace.cpp
+++ b/compiler-rt/test/ubsan/TestCases/Misc/Linux/diag-stacktrace.cpp
@@ -1,5 +1,5 @@
 /// Fast unwinder does not work with Thumb code
-// UNSUPPORTED: target={{.*thumb.*}}
+// UNSUPPORTED: target=thumb{{.*}}
 // UNSUPPORTED: android
 
 // RUN: %clangxx -fsanitize=return %gmlt -O2 -fno-omit-frame-pointer -fasynchronous-unwind-tables %s -o %t