diff --git a/test/libcxx/test/config.py b/test/libcxx/test/config.py
index 4e989b84c..654932468 100644
--- a/test/libcxx/test/config.py
+++ b/test/libcxx/test/config.py
@@ -290,6 +290,7 @@ class Configuration(object):
         # XFAIL markers for tests that are known to fail with versions of
         # libc++ as were shipped with a particular triple.
         if self.use_system_cxx_lib:
+            self.config.available_features.add('with_system_cxx_lib')
             self.config.available_features.add(
                 'with_system_cxx_lib=%s' % self.config.target_triple)
 
diff --git a/test/libcxx/version.pass.cpp b/test/libcxx/version.pass.cpp
index 8a29c5bcd..a9e8c3478 100644
--- a/test/libcxx/version.pass.cpp
+++ b/test/libcxx/version.pass.cpp
@@ -8,6 +8,8 @@
 //
 //===----------------------------------------------------------------------===//
 
+// UNSUPPORTED: with_system_cxx_lib
+
 // Test the _LIBCPP_VERSION and _LIBCPP_LIBRARY_VERSION macros
 
 #include <__config>