diff --git a/compiler-rt/test/builtins/Unit/clear_cache_test.c b/compiler-rt/test/builtins/Unit/clear_cache_test.c
index 5235ba7d9a42c..560e4ccb535a6 100644
--- a/compiler-rt/test/builtins/Unit/clear_cache_test.c
+++ b/compiler-rt/test/builtins/Unit/clear_cache_test.c
@@ -1,5 +1,5 @@
 // REQUIRES: native-run
-// UNSUPPORTED: arm, aarch64
+// UNSUPPORTED: target={{(arm|aarch64).*}}
 // RUN: %clang_builtins %s %librt -o %t && %run %t
 // REQUIRES: librt_has_clear_cache
 
diff --git a/compiler-rt/test/builtins/Unit/divxc3_test.c b/compiler-rt/test/builtins/Unit/divxc3_test.c
index 3fa64cf1bdafa..d97e72a5c013a 100644
--- a/compiler-rt/test/builtins/Unit/divxc3_test.c
+++ b/compiler-rt/test/builtins/Unit/divxc3_test.c
@@ -1,8 +1,8 @@
 // RUN: %clang_builtins %s %librt -lm -o %t && %run %t
 // REQUIRES: librt_has_divxc3
 // REQUIRES: x86-target-arch
-// UNSUPPORTED: powerpc64
-// UNSUPPORTED: mips
+// UNSUPPORTED: target=powerpc64{{.*}}
+// UNSUPPORTED: target=mips{{.*}}
 // REQUIRES: c99-complex
 
 #if !_ARCH_PPC
diff --git a/compiler-rt/test/builtins/Unit/fixunstfti_test.c b/compiler-rt/test/builtins/Unit/fixunstfti_test.c
index 9f2ae42a1e254..2812b282667f5 100644
--- a/compiler-rt/test/builtins/Unit/fixunstfti_test.c
+++ b/compiler-rt/test/builtins/Unit/fixunstfti_test.c
@@ -1,6 +1,6 @@
 // RUN: %clang_builtins %s %librt -o %t && %run %t
 // REQUIRES: librt_has_fixunstfti
-// UNSUPPORTED: mips
+// UNSUPPORTED: target=mips{{.*}}
 
 #include <stdio.h>
 
diff --git a/compiler-rt/test/builtins/Unit/mulxc3_test.c b/compiler-rt/test/builtins/Unit/mulxc3_test.c
index 77e567bb793e6..b07f11f6d27fe 100644
--- a/compiler-rt/test/builtins/Unit/mulxc3_test.c
+++ b/compiler-rt/test/builtins/Unit/mulxc3_test.c
@@ -1,8 +1,8 @@
 // RUN: %clang_builtins %s %librt -lm -o %t && %run %t
 // REQUIRES: librt_has_mulxc3
-// UNSUPPORTED: powerpc64
+// UNSUPPORTED: target=powerpc64{{.*}}
 // REQUIRES: x86-target-arch
-// UNSUPPORTED: mips
+// UNSUPPORTED: target=mips{{.*}}
 // REQUIRES: c99-complex
 
 #if !_ARCH_PPC
diff --git a/compiler-rt/test/builtins/Unit/powixf2_test.c b/compiler-rt/test/builtins/Unit/powixf2_test.c
index 856012ab32dbb..ec9bc04db4b2b 100644
--- a/compiler-rt/test/builtins/Unit/powixf2_test.c
+++ b/compiler-rt/test/builtins/Unit/powixf2_test.c
@@ -1,6 +1,6 @@
 // RUN: %clang_builtins %s %librt -o %t && %run %t
 // REQUIRES: librt_has_powixf2
-// UNSUPPORTED: powerpc64
+// UNSUPPORTED: target=powerpc64{{.*}}
 // REQUIRES: x86-target-arch
 
 #if !_ARCH_PPC