diff --git a/test/Other/can-execute.txt b/test/Other/can-execute.txt
index c7d08f6d8b1..fd6961f86bf 100644
--- a/test/Other/can-execute.txt
+++ b/test/Other/can-execute.txt
@@ -1,4 +1,4 @@
-REQUIRES: shell
+REQUIRES: can-execute
 
 This tests that we abstract two peculiarities of unix in can_execute:
 
diff --git a/test/lit.cfg b/test/lit.cfg
index 9442dbfc897..57520469708 100644
--- a/test/lit.cfg
+++ b/test/lit.cfg
@@ -250,6 +250,10 @@ for pattern in [r"\bbugpoint\b(?!-)",   r"(?<!/|-)\bclang\b(?!-)",
 if execute_external:
     config.available_features.add('shell')
 
+# Others/can-execute.txt
+if sys.platform not in ['win32']:
+    config.available_features.add('can-execute')
+
 # Loadable module
 # FIXME: This should be supplied by Makefile or autoconf.
 if sys.platform in ['win32', 'cygwin']: