diff --git a/libcxx/test/libcxx/selftest/dsl/dsl.sh.py b/libcxx/test/libcxx/selftest/dsl/dsl.sh.py
index f357b5d7767b09..a96ae90b44bb85 100644
--- a/libcxx/test/libcxx/selftest/dsl/dsl.sh.py
+++ b/libcxx/test/libcxx/selftest/dsl/dsl.sh.py
@@ -6,6 +6,9 @@
 #
 #===----------------------------------------------------------------------===##
 
+# TODO: Unbreak this on Windows
+# UNSUPPORTED: host-windows
+
 # RUN: %{python} '%s' '%S' '%T' '%{escaped_exec}' \
 # RUN:                          '%{escaped_cxx}' \
 # RUN:                          '%{escaped_flags}' \
diff --git a/libcxx/utils/libcxx/test/config.py b/libcxx/utils/libcxx/test/config.py
index 225dadb5f02d76..93090530b73886 100644
--- a/libcxx/utils/libcxx/test/config.py
+++ b/libcxx/utils/libcxx/test/config.py
@@ -425,6 +425,9 @@ def configure_features(self):
                 intMacroValue(macros['__cpp_concepts']) < 201811:
             self.config.available_features.add('libcpp-no-concepts')
 
+        if sys.platform.lower().strip() == 'win32':
+            self.config.available_features.add('host-windows')
+
         if self.target_info.is_windows():
             self.config.available_features.add('windows')
             if self.cxx_stdlib_under_test == 'libc++':