diff --git a/test/Driver/CommandHistory.C b/test/Driver/CommandHistory.C
index d91e54ee88..aefda3ce02 100644
--- a/test/Driver/CommandHistory.C
+++ b/test/Driver/CommandHistory.C
@@ -10,7 +10,7 @@
 // RUN: %rm /tmp/__testing_cling_history
 // RUN: cat %s | env --unset=CLING_NOHISTORY CLING_HISTSIZE=8 CLING_HISTFILE="/tmp/__testing_cling_history" %cling - 2>&1
 // RUN: diff /tmp/__testing_cling_history "%S/Inputs/cling_history"
-// REQUIRES: not_system-windows
+// UNSUPPORTED: system-windows
 
 #include <iostream>
 
diff --git a/test/Driver/CurrentDirRm.C b/test/Driver/CurrentDirRm.C
index f66aed0067..d8ab6779d8 100644
--- a/test/Driver/CurrentDirRm.C
+++ b/test/Driver/CurrentDirRm.C
@@ -11,7 +11,7 @@
 // RUN: cd "%T/Remove"
 // RUN: %rmdir "%T/Remove"
 // RUN: %cling %s -Xclang -verify 2>&1 | FileCheck %s
-// REQUIRES: not_system-windows
+// UNSUPPORTED: system-windows
 
 extern "C" {
   int printf(const char*, ...);
diff --git a/test/Driver/Gnu.C b/test/Driver/Gnu.C
index 47c0c084a2..28ff19a15c 100644
--- a/test/Driver/Gnu.C
+++ b/test/Driver/Gnu.C
@@ -10,7 +10,7 @@
 // RUN: cat %s | %cling -D__STRICT_ANSI__ -std=gnu++11 -Xclang -verify 2>&1 | FileCheck %s
 // RUN: cat %s | %cling -D__STRICT_ANSI__ -std=gnu++14 -Xclang -verify 2>&1 | FileCheck %s
 // RUN: cat %s | %cling -D__STRICT_ANSI__ -std=gnu++1z -Xclang -verify 2>&1 | FileCheck %s
-// REQUIRES: not_system-windows
+// UNSUPPORTED: system-windows
 
 #ifdef __cplusplus
 extern "C" int printf(const char*, ...);
diff --git a/test/Driver/StartupFile.C b/test/Driver/StartupFile.C
index 4b0e304587..04479a2d8e 100644
--- a/test/Driver/StartupFile.C
+++ b/test/Driver/StartupFile.C
@@ -7,7 +7,7 @@
 //------------------------------------------------------------------------------
 
 // RUN: cat %s | env CLING_HOME="%S/Inputs" %cling %s 2>&1 | FileCheck %s
-// REQUIRES: not_system-windows
+// UNSUPPORTED: system-windows
 
 // CHECK: Startup file ran, magic # was 43210
 
diff --git a/test/DynamicLibraryManager/cached_realpath.C b/test/DynamicLibraryManager/cached_realpath.C
index 7193d67a2e..c4a6dbff8a 100644
--- a/test/DynamicLibraryManager/cached_realpath.C
+++ b/test/DynamicLibraryManager/cached_realpath.C
@@ -6,7 +6,7 @@
 // LICENSE.TXT for details.
 //------------------------------------------------------------------------------
 
-// REQUIRES: not_system-windows
+// UNSUPPORTED: system-windows
 
 // RUN: %rm -fr %t-dir
 // RUN: %mkdir %t-dir
diff --git a/test/DynamicLibraryManager/pie.C b/test/DynamicLibraryManager/pie.C
index 92aac5e34a..b1b6e3f330 100644
--- a/test/DynamicLibraryManager/pie.C
+++ b/test/DynamicLibraryManager/pie.C
@@ -6,7 +6,7 @@
 // LICENSE.TXT for details.
 //------------------------------------------------------------------------------
 
-// REQUIRES: not_system-windows
+// UNSUPPORTED: system-windows
 
 // RUN: mkdir -p %t-dir/lib
 // RUN: %clang -shared -DCLING_EXPORT=%dllexport %S/call_lib_A.c -o%t-dir/lib/libcall_lib_A%shlibext
diff --git a/test/lit.cfg b/test/lit.cfg
index 8c5afbd0a0..d1b480bc27 100644
--- a/test/lit.cfg
+++ b/test/lit.cfg
@@ -109,10 +109,6 @@ config.substitutions.append(('%shlibext', config.shlibext))
 if platform.system() not in ['Windows'] or lit_config.getBashPath() != '':
     config.available_features.add('shell')
 
-# Filter-out tests not supposed to run on Windows
-if platform.system() not in ['Windows']:
-    config.available_features.add('not_system-windows')
-
 # ROOT adds features that "heal" some of cling's tests; need to detect
 # vanilla vs cling-as-part-of-ROOT. The latter has no `lib/UserInterface/textinput/`:
 if os.path.isdir(os.path.join(config.cling_src_root, 'lib', 'UserInterface', 'textinput')):