diff --git a/compiler-rt/test/profile/Posix/gcov-dlopen.c b/compiler-rt/test/profile/Posix/gcov-dlopen.c
index 0212979e87ff..86b4550139cf 100644
--- a/compiler-rt/test/profile/Posix/gcov-dlopen.c
+++ b/compiler-rt/test/profile/Posix/gcov-dlopen.c
@@ -1,5 +1,5 @@
 /// atexit(3) not supported in dlopen(3)ed+dlclose(3)d DSO
-// XFAIL: netbsd
+// XFAIL: target={{.*netbsd.*}}
 
 // RUN: mkdir -p %t.d && cd %t.d
 
diff --git a/compiler-rt/test/profile/instrprof-gcov-multithread_fork.test b/compiler-rt/test/profile/instrprof-gcov-multithread_fork.test
index f5ecb1e8dffe..e416a3077b19 100644
--- a/compiler-rt/test/profile/instrprof-gcov-multithread_fork.test
+++ b/compiler-rt/test/profile/instrprof-gcov-multithread_fork.test
@@ -1,4 +1,4 @@
-UNSUPPORTED: windows
+UNSUPPORTED: target={{.*windows.*}}
 
 RUN: mkdir -p %t.d
 RUN: cd %t.d
diff --git a/compiler-rt/test/profile/instrprof-icall-promo.test b/compiler-rt/test/profile/instrprof-icall-promo.test
index 2519b5cd119c..77efb0989618 100644
--- a/compiler-rt/test/profile/instrprof-icall-promo.test
+++ b/compiler-rt/test/profile/instrprof-icall-promo.test
@@ -13,7 +13,7 @@ RUN: llvm-profdata merge -o %t-icall2.profdata %t-icall2.profraw
 RUN: %clangxx_profuse=%t-icall2.profdata -O2 -Rpass=pgo-icall-prom  -c -o %t.2.use.o  %S/Inputs/instrprof-icall-promo_2.cpp 2>&1 | FileCheck %s
 
 FIXME: Relies on vtable layout
-XFAIL: msvc
+XFAIL: target={{.*msvc.*}}
 
 
 # CHECK: Promote indirect call to
diff --git a/compiler-rt/test/profile/instrprof-merge-entry-cover.c b/compiler-rt/test/profile/instrprof-merge-entry-cover.c
index e8800d9b6ad2..da479e80d57e 100644
--- a/compiler-rt/test/profile/instrprof-merge-entry-cover.c
+++ b/compiler-rt/test/profile/instrprof-merge-entry-cover.c
@@ -3,7 +3,7 @@
 // RUN: llvm-profdata show --all-functions --counts %t.profraw  | FileCheck %s
 
 // FIXME: llvm-profdata exits with "Malformed instrumentation profile data"
-// XFAIL: msvc
+// XFAIL: target={{.*msvc.*}}
 
 #include "profile_test.h"
 #include <stdint.h>
diff --git a/compiler-rt/test/profile/instrprof-merge-match.test b/compiler-rt/test/profile/instrprof-merge-match.test
index 5448af15893d..88ec6a9e9323 100644
--- a/compiler-rt/test/profile/instrprof-merge-match.test
+++ b/compiler-rt/test/profile/instrprof-merge-match.test
@@ -4,4 +4,4 @@
 // RUN: %run %t
 
 rpath isn't supported on Windows.
-UNSUPPORTED: windows
+UNSUPPORTED: target={{.*windows.*}}
diff --git a/compiler-rt/test/profile/instrprof-merge.c b/compiler-rt/test/profile/instrprof-merge.c
index 4c9e4b277b79..d121b696bb65 100644
--- a/compiler-rt/test/profile/instrprof-merge.c
+++ b/compiler-rt/test/profile/instrprof-merge.c
@@ -3,7 +3,7 @@
 // RUN: llvm-profdata show --all-functions --counts %t.profraw  | FileCheck %s
 
 // FIXME: llvm-profdata exits with "Malformed instrumentation profile data"
-// XFAIL: msvc
+// XFAIL: target={{.*msvc.*}}
 
 #include <stdint.h>
 #include <stdio.h>
diff --git a/compiler-rt/test/profile/instrprof-merging.cpp b/compiler-rt/test/profile/instrprof-merging.cpp
index 89528e814586..6212feb19c2a 100644
--- a/compiler-rt/test/profile/instrprof-merging.cpp
+++ b/compiler-rt/test/profile/instrprof-merging.cpp
@@ -1,4 +1,4 @@
-// UNSUPPORTED: windows
+// UNSUPPORTED: target={{.*windows.*}}
 // 1) Compile shared code into different object files and into an executable.
 
 // RUN: %clangxx_profgen -std=c++14 -fcoverage-mapping %s -c -o %t.v1.o \
diff --git a/compiler-rt/test/profile/instrprof-order-file.test b/compiler-rt/test/profile/instrprof-order-file.test
index 09e77d7f6e90..e7f5681f7e10 100644
--- a/compiler-rt/test/profile/instrprof-order-file.test
+++ b/compiler-rt/test/profile/instrprof-order-file.test
@@ -1,4 +1,4 @@
-// UNSUPPORTED: windows
+// UNSUPPORTED: target={{.*windows.*}}
 // REQUIRES: darwin
 // RUN: rm -rf %t.dir && mkdir -p %t.dir
 // RUN: cd %t.dir
diff --git a/compiler-rt/test/profile/instrprof-set-dir-mode.c b/compiler-rt/test/profile/instrprof-set-dir-mode.c
index 07c714724b88..e6735513d0f4 100644
--- a/compiler-rt/test/profile/instrprof-set-dir-mode.c
+++ b/compiler-rt/test/profile/instrprof-set-dir-mode.c
@@ -1,4 +1,4 @@
-// UNSUPPORTED: windows
+// UNSUPPORTED: target={{.*windows.*}}
 // RUN: %clang_pgogen -o %t.bin %s -DTESTPATH=\"%t.dir\"
 // RUN: rm -rf %t.dir
 // RUN: %run %t.bin
diff --git a/compiler-rt/test/profile/instrprof-without-libc.c b/compiler-rt/test/profile/instrprof-without-libc.c
index d6df73614dde..b7f7a1e9c688 100644
--- a/compiler-rt/test/profile/instrprof-without-libc.c
+++ b/compiler-rt/test/profile/instrprof-without-libc.c
@@ -7,7 +7,7 @@
 
 // This usage of llvm-nm assumes executables have symbol tables. They do not in
 // an MSVC environment, so we can't make this test portable.
-// UNSUPPORTED: msvc
+// UNSUPPORTED: target={{.*msvc.*}}
 
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/compiler-rt/test/profile/instrprof-write-buffer-internal.c b/compiler-rt/test/profile/instrprof-write-buffer-internal.c
index 253eb9c7340c..7b96c6d91c33 100644
--- a/compiler-rt/test/profile/instrprof-write-buffer-internal.c
+++ b/compiler-rt/test/profile/instrprof-write-buffer-internal.c
@@ -1,4 +1,4 @@
-// UNSUPPORTED: windows
+// UNSUPPORTED: target={{.*windows.*}}
 // The sanitizer-windows bot is saying:
 // instrprof-write-buffer-internal.c.tmp.buf.profraw: Invalid instrumentation profile data (file header is corrupt)