diff --git a/test/libcxx/test/config.py b/test/libcxx/test/config.py
index 8ee2d3043..7299dbead 100644
--- a/test/libcxx/test/config.py
+++ b/test/libcxx/test/config.py
@@ -456,7 +456,14 @@ class Configuration(object):
            not self.is_windows:
             self.cxx.compile_flags += [
                 '-include', os.path.join(support_path, 'nasty_macros.hpp')]
-        if self.is_windows and self.debug_build:
+        if self.cxx_stdlib_under_test == 'msvc':
+            # FIXME: Uncomment this once STL commits the support header.
+            # self.cxx.compile_flags += [
+            #    '-include', os.path.join(support_path,
+            #                             'msvc_stdlib_force_include.h')]
+            pass
+        if self.is_windows and self.debug_build and \
+                self.cxx_stdlib_under_test != 'msvc':
             self.cxx.compile_flags += [
                 '-include', os.path.join(support_path,
                                          'set_windows_crt_report_mode.h')
diff --git a/test/std/experimental/string.view/lit.local.cfg b/test/std/experimental/string.view/lit.local.cfg
new file mode 100644
index 000000000..376dbe7c1
--- /dev/null
+++ b/test/std/experimental/string.view/lit.local.cfg
@@ -0,0 +1,3 @@
+# Disable all of the filesystem tests if the correct feature is not available.
+if 'msvc' in config.available_features:
+  config.unsupported = True
diff --git a/test/std/input.output/iostreams.base/ios.base/ios.base.storage/iword.pass.cpp b/test/std/input.output/iostreams.base/ios.base/ios.base.storage/iword.pass.cpp
index 1e2ee5063..59f0bd478 100644
--- a/test/std/input.output/iostreams.base/ios.base/ios.base.storage/iword.pass.cpp
+++ b/test/std/input.output/iostreams.base/ios.base/ios.base.storage/iword.pass.cpp
@@ -13,6 +13,9 @@
 
 // long& iword(int idx);
 
+// This test compiles but never completes when compiled against the MSVC STL
+// UNSUPPORTED: msvc
+
 #include <ios>
 #include <string>
 #include <cassert>
diff --git a/test/std/input.output/iostreams.base/ios.base/ios.base.storage/pword.pass.cpp b/test/std/input.output/iostreams.base/ios.base/ios.base.storage/pword.pass.cpp
index 5246ad8f6..45115823b 100644
--- a/test/std/input.output/iostreams.base/ios.base/ios.base.storage/pword.pass.cpp
+++ b/test/std/input.output/iostreams.base/ios.base/ios.base.storage/pword.pass.cpp
@@ -13,6 +13,9 @@
 
 // void*& pword(int idx);
 
+// This test compiles but never completes when compiled against the MSVC STL
+// UNSUPPORTED: msvc
+
 #include <ios>
 #include <string>
 #include <cassert>