diff --git a/clang/test/Driver/lld-repro.c b/clang/test/Driver/lld-repro.c
index 1333f68d911eea..9fc37d98cef6c6 100644
--- a/clang/test/Driver/lld-repro.c
+++ b/clang/test/Driver/lld-repro.c
@@ -1,5 +1,5 @@
 // REQUIRES: lld
-// UNSUPPORTED: ps4, ps5
+// UNSUPPORTED: target={{.*-ps(4|5)}}
 
 // RUN: echo "-nostartfiles -nostdlib -fuse-ld=lld -gen-reproducer=error -fcrash-diagnostics-dir=%t" \
 // RUN:   | sed -e 's/\\/\\\\/g' > %t.rsp
diff --git a/clang/test/Driver/nostdincxx.cpp b/clang/test/Driver/nostdincxx.cpp
index e27bee8dc61337..11fd59fab2c297 100644
--- a/clang/test/Driver/nostdincxx.cpp
+++ b/clang/test/Driver/nostdincxx.cpp
@@ -6,4 +6,4 @@
 #include <vector>
 
 // MSVC, PS4, PS5 have C++ headers in the same directory as C headers.
-// UNSUPPORTED: ms-sdk, ps4, ps5
+// UNSUPPORTED: ms-sdk, target={{.*-ps(4|5)}}
diff --git a/clang/test/Preprocessor/lang-std.cpp b/clang/test/Preprocessor/lang-std.cpp
index e8260147f40ee7..86aeb9ad45d51b 100644
--- a/clang/test/Preprocessor/lang-std.cpp
+++ b/clang/test/Preprocessor/lang-std.cpp
@@ -1,4 +1,4 @@
-// UNSUPPORTED: ps4, ps5
+// UNSUPPORTED: target={{.*-ps(4|5)}}
 /// Test default standards.
 /// PS4/PS5 default to gnu++14.