10 files changed, 10 insertions, 10 deletions
diff --git a/lldb/lit/Expr/TestIRMemoryMap.test b/lldb/lit/Expr/TestIRMemoryMap.test
index 0741c31af38..a8f835b1676 100644
--- a/lldb/lit/Expr/TestIRMemoryMap.test
+++ b/lldb/lit/Expr/TestIRMemoryMap.test
@@ -1,4 +1,4 @@
-# UNSUPPORTED: windows
+# UNSUPPORTED: system-windows
 
 # RUN: %clangxx %p/Inputs/call-function.cpp -g -o %t
 
diff --git a/lldb/lit/Quit/TestQuitExitCode-30.test b/lldb/lit/Quit/TestQuitExitCode-30.test
index 5e74c9db79c..2f15398c761 100644
--- a/lldb/lit/Quit/TestQuitExitCode-30.test
+++ b/lldb/lit/Quit/TestQuitExitCode-30.test
@@ -1,3 +1,3 @@
-# UNSUPPORTED: windows
+# UNSUPPORTED: system-windows
 # RUN: %python %S/expect_exit_code.py 226 %lldb -b -s %s
 q -30
diff --git a/lldb/lit/Quit/TestQuitExitCode0.test b/lldb/lit/Quit/TestQuitExitCode0.test
index c15cb5e9ea7..af39b4293f3 100644
--- a/lldb/lit/Quit/TestQuitExitCode0.test
+++ b/lldb/lit/Quit/TestQuitExitCode0.test
@@ -1,3 +1,3 @@
-# UNSUPPORTED: windows
+# UNSUPPORTED: system-windows
 # RUN: %lldb -b -s %s
 q 0
diff --git a/lldb/lit/Quit/TestQuitExitCode30.test b/lldb/lit/Quit/TestQuitExitCode30.test
index 687d048c480..e5ff634e713 100644
--- a/lldb/lit/Quit/TestQuitExitCode30.test
+++ b/lldb/lit/Quit/TestQuitExitCode30.test
@@ -1,3 +1,3 @@
-# UNSUPPORTED: windows
+# UNSUPPORTED: system-windows
 # RUN: %python %S/expect_exit_code.py 30  %lldb -b -s %s
 q 30
diff --git a/lldb/lit/Quit/TestQuitExitCodeHex0.test b/lldb/lit/Quit/TestQuitExitCodeHex0.test
index 3e1fc5dbeeb..f85a046fa13 100644
--- a/lldb/lit/Quit/TestQuitExitCodeHex0.test
+++ b/lldb/lit/Quit/TestQuitExitCodeHex0.test
@@ -1,3 +1,3 @@
-# UNSUPPORTED: windows
+# UNSUPPORTED: system-windows
 # RUN: %lldb -b -s %s
 q 0x0
diff --git a/lldb/lit/Quit/TestQuitExitCodeHexA.test b/lldb/lit/Quit/TestQuitExitCodeHexA.test
index 43cfd591961..ca0e2d5acc3 100644
--- a/lldb/lit/Quit/TestQuitExitCodeHexA.test
+++ b/lldb/lit/Quit/TestQuitExitCodeHexA.test
@@ -1,3 +1,3 @@
-# UNSUPPORTED: windows
+# UNSUPPORTED: system-windows
 # RUN: %python %S/expect_exit_code.py 10 %lldb -b -s %s
 q 0xA
diff --git a/lldb/lit/Quit/TestQuitExitCodeImplicit0.test b/lldb/lit/Quit/TestQuitExitCodeImplicit0.test
index 1a95e8dc0bf..5494231b23b 100644
--- a/lldb/lit/Quit/TestQuitExitCodeImplicit0.test
+++ b/lldb/lit/Quit/TestQuitExitCodeImplicit0.test
@@ -1,3 +1,3 @@
-# UNSUPPORTED: windows
+# UNSUPPORTED: system-windows
 # RUN: %lldb -b -s %s
 q
diff --git a/lldb/lit/Quit/TestQuitExitCodeNonInt.test b/lldb/lit/Quit/TestQuitExitCodeNonInt.test
index 2b54163d648..87c0bd41bb0 100644
--- a/lldb/lit/Quit/TestQuitExitCodeNonInt.test
+++ b/lldb/lit/Quit/TestQuitExitCodeNonInt.test
@@ -1,4 +1,4 @@
-# UNSUPPORTED: windows
+# UNSUPPORTED: system-windows
 # RUN: %lldb -b -s %s 2>&1 | FileCheck %s
 q str
 // CHECK: Couldn't parse 'str'
diff --git a/lldb/lit/Quit/TestQuitExitCodeTooManyArgs.test b/lldb/lit/Quit/TestQuitExitCodeTooManyArgs.test
index 05be357fd57..a67669451e9 100644
--- a/lldb/lit/Quit/TestQuitExitCodeTooManyArgs.test
+++ b/lldb/lit/Quit/TestQuitExitCodeTooManyArgs.test
@@ -1,4 +1,4 @@
-# UNSUPPORTED: windows
+# UNSUPPORTED: system-windows
 # RUN: %lldb -b -s %s 2>&1 | FileCheck %s
 q 1 2
 // CHECK: Too many arguments for 'quit'
diff --git a/lldb/lit/tools/lldb-mi/target/target-select-so-path.test b/lldb/lit/tools/lldb-mi/target/target-select-so-path.test
index 785030bf2fd..8b71be5436d 100644
--- a/lldb/lit/tools/lldb-mi/target/target-select-so-path.test
+++ b/lldb/lit/tools/lldb-mi/target/target-select-so-path.test
@@ -1,4 +1,4 @@
-# UNSUPPORTED: windows, darwin
+# UNSUPPORTED: system-windows, system-darwin
 #
 # RUN: %clang -o %t %p/inputs/main.c -g
 # RUN: %python %p/inputs/target-select-so-path.py "%debugserver" "%lldbmi %t" %s