diff --git a/llvm/test/ExecutionEngine/MCJIT/2005-12-02-TailCallBug.ll b/llvm/test/ExecutionEngine/MCJIT/2005-12-02-TailCallBug.ll
index 7082e9a0f1280f..9a9e0580738a88 100644
--- a/llvm/test/ExecutionEngine/MCJIT/2005-12-02-TailCallBug.ll
+++ b/llvm/test/ExecutionEngine/MCJIT/2005-12-02-TailCallBug.ll
@@ -1,7 +1,7 @@
 ; PR672
 ; RUN: %lli -jit-kind=mcjit %s
 ; RUN: %lli %s
-; XFAIL: i686 && windows
+; XFAIL: target={{i686.*windows.*}}
 
 define i32 @main() {
 	%res = tail call fastcc i32 @check_tail( i32 10, ptr @check_tail, i32 10 )		; <i32> [#uses=1]
diff --git a/llvm/test/Feature/load_extension.ll b/llvm/test/Feature/load_extension.ll
index ff29d409013c44..7c97262fdaa8dd 100644
--- a/llvm/test/Feature/load_extension.ll
+++ b/llvm/test/Feature/load_extension.ll
@@ -5,7 +5,7 @@
 ; RUN: llvm-lto2 run %t.o %loadbye %loadnewpmbye -wave-goodbye -o %t -r %t.o,somefunk,plx -r %t.o,junk,plx 2>&1 | FileCheck %s
 ; RUN: llvm-lto2 run %t.o %loadbye %loadnewpmbye -opt-pipeline="goodbye" -wave-goodbye -o %t -r %t.o,somefunk,plx -r %t.o,junk,plx 2>&1 | FileCheck %s
 ; REQUIRES: plugins, examples
-; UNSUPPORTED: windows
+; UNSUPPORTED: target={{.*windows.*}}
 ; CHECK: Bye
 ;
 ; Specifying a new PM pass plugin with the old PM is an error.
diff --git a/llvm/test/MC/AsmParser/debug-empty-source.s b/llvm/test/MC/AsmParser/debug-empty-source.s
index aa4a8d61972523..6b3f6e79feda8b 100644
--- a/llvm/test/MC/AsmParser/debug-empty-source.s
+++ b/llvm/test/MC/AsmParser/debug-empty-source.s
@@ -1,5 +1,5 @@
 // XFAIL: target={{.*}}-aix{{.*}}
-// UNSUPPORTED: -zos
+// UNSUPPORTED: target={{.*}}-zos{{.*}}
 // REQUIRES: object-emission
 // RUN: llvm-mc %s -o -| FileCheck %s
 
diff --git a/llvm/test/MC/AsmParser/include.ll b/llvm/test/MC/AsmParser/include.ll
index 0ca1697a14f488..3321f0a6a2872b 100644
--- a/llvm/test/MC/AsmParser/include.ll
+++ b/llvm/test/MC/AsmParser/include.ll
@@ -1,5 +1,5 @@
 ; RUN: llc -I %p/Inputs -filetype asm -o - %s | FileCheck %s
-; UNSUPPORTED: -zos,target=nvptx{{.*}}
+; UNSUPPORTED: target={{.*}}-zos{{.*}},target=nvptx{{.*}}
 ; REQUIRES: default_triple
 
 module asm ".include \22module.x\22"
diff --git a/llvm/test/MC/AsmParser/macro-same-context.ll b/llvm/test/MC/AsmParser/macro-same-context.ll
index 67e55cef3c74dc..1e58830493f37a 100644
--- a/llvm/test/MC/AsmParser/macro-same-context.ll
+++ b/llvm/test/MC/AsmParser/macro-same-context.ll
@@ -1,6 +1,6 @@
 ;; Test that macros in inline assembly blocks share the same context,
 ;; thus a definition is available to the whole file. PR36110
-; UNSUPPORTED: -zos,target=nvptx{{.*}}
+; UNSUPPORTED: target={{.*}}-zos{{.*}},target=nvptx{{.*}}
 ; RUN: not llc < %s 2>&1 | FileCheck %s
 ; REQUIRES: default_triple
 
diff --git a/llvm/test/MC/ELF/dwarf-file0.s b/llvm/test/MC/ELF/dwarf-file0.s
index dbe000deda9eed..d7d796b7ba7757 100644
--- a/llvm/test/MC/ELF/dwarf-file0.s
+++ b/llvm/test/MC/ELF/dwarf-file0.s
@@ -1,5 +1,5 @@
 # XFAIL: target={{.*}}-aix{{.*}}
-# UNSUPPORTED: -zos
+# UNSUPPORTED: target={{.*}}-zos{{.*}}
 # REQUIRES: object-emission
 # RUN: llvm-mc -dwarf-version 4 %s -filetype=obj -o - | llvm-dwarfdump -debug-line - | FileCheck %s
 # RUN: llvm-mc -dwarf-version 4 %s --fatal-warnings -o - | FileCheck %s --check-prefix=ASM
diff --git a/llvm/test/MC/ELF/dwarf-loc0.s b/llvm/test/MC/ELF/dwarf-loc0.s
index 1f1177f173330e..e5350936d0501a 100644
--- a/llvm/test/MC/ELF/dwarf-loc0.s
+++ b/llvm/test/MC/ELF/dwarf-loc0.s
@@ -1,5 +1,5 @@
 # XFAIL: target={{.*}}-aix{{.*}}
-# UNSUPPORTED: -zos
+# UNSUPPORTED: target={{.*}}-zos{{.*}}
 # REQUIRES: object-emission
 # RUN: llvm-mc -dwarf-version 5 --defsym FILE0=1 %s -filetype=obj -o - | llvm-dwarfdump -debug-line - | FileCheck %s
 # RUN: not llvm-mc -dwarf-version 4 %s -filetype=asm -o - 2>&1 | FileCheck %s -check-prefix=ERR
diff --git a/llvm/test/tools/llvm-objcopy/ELF/update-section.test b/llvm/test/tools/llvm-objcopy/ELF/update-section.test
index da17e6c7bc3d04..58f31c6b02a26b 100644
--- a/llvm/test/tools/llvm-objcopy/ELF/update-section.test
+++ b/llvm/test/tools/llvm-objcopy/ELF/update-section.test
@@ -1,4 +1,4 @@
-# XFAIL: target-arm && linux-gnu
+# XFAIL: target={{arm.*linux-gnu}}
 # REQUIRES: x86-registered-target
 
 # RUN: yaml2obj %s -o %t