Index: libcxx/test/std/input.output/file.streams/fstreams/filebuf.members/open_path.pass.cpp
===================================================================
--- libcxx/test/std/input.output/file.streams/fstreams/filebuf.members/open_path.pass.cpp
+++ libcxx/test/std/input.output/file.streams/fstreams/filebuf.members/open_path.pass.cpp
@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 // UNSUPPORTED: c++98, c++03, c++11, c++14
-// XFAIL: dylib-has-no-filesystem
+// UNSUPPORTED: dylib-has-no-filesystem
 
 // <fstream>
 
Index: libcxx/test/std/input.output/file.streams/fstreams/fstream.cons/path.pass.cpp
===================================================================
--- libcxx/test/std/input.output/file.streams/fstreams/fstream.cons/path.pass.cpp
+++ libcxx/test/std/input.output/file.streams/fstreams/fstream.cons/path.pass.cpp
@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 // UNSUPPORTED: c++98, c++03, c++11, c++14
-// XFAIL: dylib-has-no-filesystem
+// UNSUPPORTED: dylib-has-no-filesystem
 
 // <fstream>
 
Index: libcxx/test/std/input.output/file.streams/fstreams/fstream.members/open_path.pass.cpp
===================================================================
--- libcxx/test/std/input.output/file.streams/fstreams/fstream.members/open_path.pass.cpp
+++ libcxx/test/std/input.output/file.streams/fstreams/fstream.members/open_path.pass.cpp
@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 // UNSUPPORTED: c++98, c++03, c++11, c++14
-// XFAIL: dylib-has-no-filesystem
+// UNSUPPORTED: dylib-has-no-filesystem
 
 // <fstream>
 
Index: libcxx/test/std/input.output/file.streams/fstreams/ifstream.cons/path.pass.cpp
===================================================================
--- libcxx/test/std/input.output/file.streams/fstreams/ifstream.cons/path.pass.cpp
+++ libcxx/test/std/input.output/file.streams/fstreams/ifstream.cons/path.pass.cpp
@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 // UNSUPPORTED: c++98, c++03, c++11, c++14
-// XFAIL: dylib-has-no-filesystem
+// UNSUPPORTED: dylib-has-no-filesystem
 
 // <fstream>
 
Index: libcxx/test/std/input.output/file.streams/fstreams/ifstream.members/open_path.pass.cpp
===================================================================
--- libcxx/test/std/input.output/file.streams/fstreams/ifstream.members/open_path.pass.cpp
+++ libcxx/test/std/input.output/file.streams/fstreams/ifstream.members/open_path.pass.cpp
@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 // UNSUPPORTED: c++98, c++03, c++11, c++14
-// XFAIL: dylib-has-no-filesystem
+// UNSUPPORTED: dylib-has-no-filesystem
 
 // <fstream>
 
Index: libcxx/test/std/input.output/file.streams/fstreams/ofstream.cons/path.pass.cpp
===================================================================
--- libcxx/test/std/input.output/file.streams/fstreams/ofstream.cons/path.pass.cpp
+++ libcxx/test/std/input.output/file.streams/fstreams/ofstream.cons/path.pass.cpp
@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 // UNSUPPORTED: c++98, c++03, c++11, c++14
-// XFAIL: dylib-has-no-filesystem
+// UNSUPPORTED: dylib-has-no-filesystem
 
 // <fstream>
 
Index: libcxx/test/std/input.output/file.streams/fstreams/ofstream.members/open_path.pass.cpp
===================================================================
--- libcxx/test/std/input.output/file.streams/fstreams/ofstream.members/open_path.pass.cpp
+++ libcxx/test/std/input.output/file.streams/fstreams/ofstream.members/open_path.pass.cpp
@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 // UNSUPPORTED: c++98, c++03, c++11, c++14
-// XFAIL: dylib-has-no-filesystem
+// UNSUPPORTED: dylib-has-no-filesystem
 
 // <fstream>
 
Index: libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/default.pass.cpp
===================================================================
--- libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/default.pass.cpp
+++ libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/default.pass.cpp
@@ -8,7 +8,7 @@
 //
 // UNSUPPORTED: libcpp-has-no-threads
 // UNSUPPORTED: c++98, c++03, c++11
-// XFAIL: dylib-has-no-shared_mutex
+// UNSUPPORTED: dylib-has-no-shared_mutex
 
 // <shared_mutex>
 
Index: libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/move_assign.pass.cpp
===================================================================
--- libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/move_assign.pass.cpp
+++ libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/move_assign.pass.cpp
@@ -8,7 +8,7 @@
 //
 // UNSUPPORTED: libcpp-has-no-threads
 // UNSUPPORTED: c++98, c++03, c++11
-// XFAIL: dylib-has-no-shared_mutex
+// UNSUPPORTED: dylib-has-no-shared_mutex
 
 // <shared_mutex>
 
Index: libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/move_ctor.pass.cpp
===================================================================
--- libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/move_ctor.pass.cpp
+++ libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/move_ctor.pass.cpp
@@ -8,7 +8,7 @@
 //
 // UNSUPPORTED: libcpp-has-no-threads
 // UNSUPPORTED: c++98, c++03, c++11
-// XFAIL: dylib-has-no-shared_mutex
+// UNSUPPORTED: dylib-has-no-shared_mutex
 
 // <shared_mutex>
 
Index: libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/mutex.pass.cpp
===================================================================
--- libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/mutex.pass.cpp
+++ libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/mutex.pass.cpp
@@ -8,7 +8,7 @@
 //
 // UNSUPPORTED: libcpp-has-no-threads
 // UNSUPPORTED: c++98, c++03, c++11
-// XFAIL: dylib-has-no-shared_mutex
+// UNSUPPORTED: dylib-has-no-shared_mutex
 
 // FLAKY_TEST.
 
Index: libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/mutex_adopt_lock.pass.cpp
===================================================================
--- libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/mutex_adopt_lock.pass.cpp
+++ libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/mutex_adopt_lock.pass.cpp
@@ -8,7 +8,7 @@
 //
 // UNSUPPORTED: libcpp-has-no-threads
 // UNSUPPORTED: c++98, c++03, c++11
-// XFAIL: dylib-has-no-shared_mutex
+// UNSUPPORTED: dylib-has-no-shared_mutex
 
 // <shared_mutex>
 
Index: libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/mutex_defer_lock.pass.cpp
===================================================================
--- libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/mutex_defer_lock.pass.cpp
+++ libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/mutex_defer_lock.pass.cpp
@@ -8,7 +8,7 @@
 //
 // UNSUPPORTED: libcpp-has-no-threads
 // UNSUPPORTED: c++98, c++03, c++11
-// XFAIL: dylib-has-no-shared_mutex
+// UNSUPPORTED: dylib-has-no-shared_mutex
 
 // <shared_mutex>
 
Index: libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/mutex_duration.pass.cpp
===================================================================
--- libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/mutex_duration.pass.cpp
+++ libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/mutex_duration.pass.cpp
@@ -8,7 +8,7 @@
 //
 // UNSUPPORTED: libcpp-has-no-threads
 // UNSUPPORTED: c++98, c++03, c++11
-// XFAIL: dylib-has-no-shared_mutex
+// UNSUPPORTED: dylib-has-no-shared_mutex
 
 // FLAKY_TEST.
 
Index: libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/mutex_time_point.pass.cpp
===================================================================
--- libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/mutex_time_point.pass.cpp
+++ libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/mutex_time_point.pass.cpp
@@ -8,7 +8,7 @@
 //
 // UNSUPPORTED: libcpp-has-no-threads
 // UNSUPPORTED: c++98, c++03, c++11
-// XFAIL: dylib-has-no-shared_mutex
+// UNSUPPORTED: dylib-has-no-shared_mutex
 
 // FLAKY_TEST.
 
Index: libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/mutex_try_to_lock.pass.cpp
===================================================================
--- libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/mutex_try_to_lock.pass.cpp
+++ libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/mutex_try_to_lock.pass.cpp
@@ -8,7 +8,7 @@
 //
 // UNSUPPORTED: libcpp-has-no-threads
 // UNSUPPORTED: c++98, c++03, c++11
-// XFAIL: dylib-has-no-shared_mutex
+// UNSUPPORTED: dylib-has-no-shared_mutex
 
 // FLAKY_TEST.
 
Index: libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp
===================================================================
--- libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp
+++ libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp
@@ -8,7 +8,7 @@
 //
 // UNSUPPORTED: libcpp-has-no-threads
 // UNSUPPORTED: c++98, c++03, c++11
-// XFAIL: dylib-has-no-shared_mutex
+// UNSUPPORTED: dylib-has-no-shared_mutex
 
 // FLAKY_TEST.
 
Index: libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.obs/mutex.pass.cpp
===================================================================
--- libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.obs/mutex.pass.cpp
+++ libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.obs/mutex.pass.cpp
@@ -8,7 +8,7 @@
 //
 // UNSUPPORTED: libcpp-has-no-threads
 // UNSUPPORTED: c++98, c++03, c++11
-// XFAIL: dylib-has-no-shared_mutex
+// UNSUPPORTED: dylib-has-no-shared_mutex
 
 // <shared_mutex>
 
Index: libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.obs/op_bool.pass.cpp
===================================================================
--- libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.obs/op_bool.pass.cpp
+++ libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.obs/op_bool.pass.cpp
@@ -8,7 +8,7 @@
 //
 // UNSUPPORTED: libcpp-has-no-threads
 // UNSUPPORTED: c++98, c++03, c++11
-// XFAIL: dylib-has-no-shared_mutex
+// UNSUPPORTED: dylib-has-no-shared_mutex
 
 // <shared_mutex>
 
Index: libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.obs/owns_lock.pass.cpp
===================================================================
--- libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.obs/owns_lock.pass.cpp
+++ libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.obs/owns_lock.pass.cpp
@@ -8,7 +8,7 @@
 //
 // UNSUPPORTED: libcpp-has-no-threads
 // UNSUPPORTED: c++98, c++03, c++11
-// XFAIL: dylib-has-no-shared_mutex
+// UNSUPPORTED: dylib-has-no-shared_mutex
 
 // <shared_mutex>
 
Index: libcxx/test/std/utilities/any/any.class/any.assign/copy.pass.cpp
===================================================================
--- libcxx/test/std/utilities/any/any.class/any.assign/copy.pass.cpp
+++ libcxx/test/std/utilities/any/any.class/any.assign/copy.pass.cpp
@@ -8,7 +8,7 @@
 
 // UNSUPPORTED: c++98, c++03, c++11, c++14
 
-// XFAIL: dylib-has-no-bad_any_cast && !libcpp-no-exceptions
+// UNSUPPORTED: dylib-has-no-bad_any_cast && !libcpp-no-exceptions
 
 // <any>
 
Index: libcxx/test/std/utilities/any/any.class/any.assign/move.pass.cpp
===================================================================
--- libcxx/test/std/utilities/any/any.class/any.assign/move.pass.cpp
+++ libcxx/test/std/utilities/any/any.class/any.assign/move.pass.cpp
@@ -8,7 +8,7 @@
 
 // UNSUPPORTED: c++98, c++03, c++11, c++14
 
-// XFAIL: dylib-has-no-bad_any_cast && !libcpp-no-exceptions
+// UNSUPPORTED: dylib-has-no-bad_any_cast && !libcpp-no-exceptions
 
 // <any>
 
Index: libcxx/test/std/utilities/any/any.class/any.assign/value.pass.cpp
===================================================================
--- libcxx/test/std/utilities/any/any.class/any.assign/value.pass.cpp
+++ libcxx/test/std/utilities/any/any.class/any.assign/value.pass.cpp
@@ -8,7 +8,7 @@
 
 // UNSUPPORTED: c++98, c++03, c++11, c++14
 
-// XFAIL: dylib-has-no-bad_any_cast && !libcpp-no-exceptions
+// UNSUPPORTED: dylib-has-no-bad_any_cast && !libcpp-no-exceptions
 
 // <any>
 
Index: libcxx/test/std/utilities/any/any.class/any.cons/copy.pass.cpp
===================================================================
--- libcxx/test/std/utilities/any/any.class/any.cons/copy.pass.cpp
+++ libcxx/test/std/utilities/any/any.class/any.cons/copy.pass.cpp
@@ -8,7 +8,7 @@
 
 // UNSUPPORTED: c++98, c++03, c++11, c++14
 
-// XFAIL: dylib-has-no-bad_any_cast && !libcpp-no-exceptions
+// UNSUPPORTED: dylib-has-no-bad_any_cast && !libcpp-no-exceptions
 
 // <any>
 
Index: libcxx/test/std/utilities/any/any.class/any.cons/in_place_type.pass.cpp
===================================================================
--- libcxx/test/std/utilities/any/any.class/any.cons/in_place_type.pass.cpp
+++ libcxx/test/std/utilities/any/any.class/any.cons/in_place_type.pass.cpp
@@ -8,7 +8,7 @@
 
 // UNSUPPORTED: c++98, c++03, c++11, c++14
 
-// XFAIL: dylib-has-no-bad_any_cast && !libcpp-no-exceptions
+// UNSUPPORTED: dylib-has-no-bad_any_cast && !libcpp-no-exceptions
 
 // <any>
 
Index: libcxx/test/std/utilities/any/any.class/any.cons/move.pass.cpp
===================================================================
--- libcxx/test/std/utilities/any/any.class/any.cons/move.pass.cpp
+++ libcxx/test/std/utilities/any/any.class/any.cons/move.pass.cpp
@@ -8,7 +8,7 @@
 
 // UNSUPPORTED: c++98, c++03, c++11, c++14
 
-// XFAIL: dylib-has-no-bad_any_cast && !libcpp-no-exceptions
+// UNSUPPORTED: dylib-has-no-bad_any_cast && !libcpp-no-exceptions
 
 // <any>
 
Index: libcxx/test/std/utilities/any/any.class/any.cons/value.pass.cpp
===================================================================
--- libcxx/test/std/utilities/any/any.class/any.cons/value.pass.cpp
+++ libcxx/test/std/utilities/any/any.class/any.cons/value.pass.cpp
@@ -8,7 +8,7 @@
 
 // UNSUPPORTED: c++98, c++03, c++11, c++14
 
-// XFAIL: dylib-has-no-bad_any_cast && !libcpp-no-exceptions
+// UNSUPPORTED: dylib-has-no-bad_any_cast && !libcpp-no-exceptions
 
 // <any>
 
Index: libcxx/test/std/utilities/any/any.class/any.modifiers/emplace.pass.cpp
===================================================================
--- libcxx/test/std/utilities/any/any.class/any.modifiers/emplace.pass.cpp
+++ libcxx/test/std/utilities/any/any.class/any.modifiers/emplace.pass.cpp
@@ -8,7 +8,7 @@
 
 // UNSUPPORTED: c++98, c++03, c++11, c++14
 
-// XFAIL: dylib-has-no-bad_any_cast && !libcpp-no-exceptions
+// UNSUPPORTED: dylib-has-no-bad_any_cast && !libcpp-no-exceptions
 
 // <any>
 
Index: libcxx/test/std/utilities/any/any.class/any.modifiers/reset.pass.cpp
===================================================================
--- libcxx/test/std/utilities/any/any.class/any.modifiers/reset.pass.cpp
+++ libcxx/test/std/utilities/any/any.class/any.modifiers/reset.pass.cpp
@@ -8,7 +8,7 @@
 
 // UNSUPPORTED: c++98, c++03, c++11, c++14
 
-// XFAIL: dylib-has-no-bad_any_cast && !libcpp-no-exceptions
+// UNSUPPORTED: dylib-has-no-bad_any_cast && !libcpp-no-exceptions
 
 // <any>
 
Index: libcxx/test/std/utilities/any/any.class/any.modifiers/swap.pass.cpp
===================================================================
--- libcxx/test/std/utilities/any/any.class/any.modifiers/swap.pass.cpp
+++ libcxx/test/std/utilities/any/any.class/any.modifiers/swap.pass.cpp
@@ -8,7 +8,7 @@
 
 // UNSUPPORTED: c++98, c++03, c++11, c++14
 
-// XFAIL: dylib-has-no-bad_any_cast && !libcpp-no-exceptions
+// UNSUPPORTED: dylib-has-no-bad_any_cast && !libcpp-no-exceptions
 
 // <any>
 
Index: libcxx/test/std/utilities/any/any.nonmembers/any.cast/any_cast_pointer.pass.cpp
===================================================================
--- libcxx/test/std/utilities/any/any.nonmembers/any.cast/any_cast_pointer.pass.cpp
+++ libcxx/test/std/utilities/any/any.nonmembers/any.cast/any_cast_pointer.pass.cpp
@@ -8,7 +8,7 @@
 
 // UNSUPPORTED: c++98, c++03, c++11, c++14
 
-// XFAIL: dylib-has-no-bad_any_cast && !libcpp-no-exceptions
+// UNSUPPORTED: dylib-has-no-bad_any_cast && !libcpp-no-exceptions
 
 // <any>
 
Index: libcxx/test/std/utilities/any/any.nonmembers/any.cast/any_cast_reference.pass.cpp
===================================================================
--- libcxx/test/std/utilities/any/any.nonmembers/any.cast/any_cast_reference.pass.cpp
+++ libcxx/test/std/utilities/any/any.nonmembers/any.cast/any_cast_reference.pass.cpp
@@ -8,7 +8,7 @@
 
 // UNSUPPORTED: c++98, c++03, c++11, c++14
 
-// XFAIL: dylib-has-no-bad_any_cast && !libcpp-no-exceptions
+// UNSUPPORTED: dylib-has-no-bad_any_cast && !libcpp-no-exceptions
 
 // <any>
 
Index: libcxx/test/std/utilities/any/any.nonmembers/make_any.pass.cpp
===================================================================
--- libcxx/test/std/utilities/any/any.nonmembers/make_any.pass.cpp
+++ libcxx/test/std/utilities/any/any.nonmembers/make_any.pass.cpp
@@ -8,7 +8,7 @@
 
 // UNSUPPORTED: c++98, c++03, c++11, c++14
 
-// XFAIL: dylib-has-no-bad_any_cast && !libcpp-no-exceptions
+// UNSUPPORTED: dylib-has-no-bad_any_cast && !libcpp-no-exceptions
 
 // <any>
 
Index: libcxx/test/std/utilities/any/any.nonmembers/swap.pass.cpp
===================================================================
--- libcxx/test/std/utilities/any/any.nonmembers/swap.pass.cpp
+++ libcxx/test/std/utilities/any/any.nonmembers/swap.pass.cpp
@@ -8,7 +8,7 @@
 
 // UNSUPPORTED: c++98, c++03, c++11, c++14
 
-// XFAIL: dylib-has-no-bad_any_cast && !libcpp-no-exceptions
+// UNSUPPORTED: dylib-has-no-bad_any_cast && !libcpp-no-exceptions
 
 // <any>
 
Index: libcxx/test/std/utilities/optional/optional.bad_optional_access/default.pass.cpp
===================================================================
--- libcxx/test/std/utilities/optional/optional.bad_optional_access/default.pass.cpp
+++ libcxx/test/std/utilities/optional/optional.bad_optional_access/default.pass.cpp
@@ -8,7 +8,7 @@
 
 // UNSUPPORTED: c++98, c++03, c++11, c++14
 
-// XFAIL: dylib-has-no-bad_optional_access
+// UNSUPPORTED: dylib-has-no-bad_optional_access
 
 // <optional>
 
Index: libcxx/test/std/utilities/optional/optional.bad_optional_access/derive.pass.cpp
===================================================================
--- libcxx/test/std/utilities/optional/optional.bad_optional_access/derive.pass.cpp
+++ libcxx/test/std/utilities/optional/optional.bad_optional_access/derive.pass.cpp
@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 // UNSUPPORTED: c++98, c++03, c++11, c++14
-// XFAIL: dylib-has-no-bad_optional_access
+// UNSUPPORTED: dylib-has-no-bad_optional_access
 
 // <optional>
 
Index: libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/U.pass.cpp
===================================================================
--- libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/U.pass.cpp
+++ libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/U.pass.cpp
@@ -8,7 +8,7 @@
 //
 // UNSUPPORTED: c++98, c++03, c++11, c++14
 
-// XFAIL: dylib-has-no-bad_optional_access && !libcpp-no-exceptions
+// UNSUPPORTED: dylib-has-no-bad_optional_access && !libcpp-no-exceptions
 
 // <optional>
 
Index: libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/const_T.pass.cpp
===================================================================
--- libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/const_T.pass.cpp
+++ libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/const_T.pass.cpp
@@ -8,7 +8,7 @@
 //
 // UNSUPPORTED: c++98, c++03, c++11, c++14
 
-// XFAIL: dylib-has-no-bad_optional_access && !libcpp-no-exceptions
+// UNSUPPORTED: dylib-has-no-bad_optional_access && !libcpp-no-exceptions
 
 // <optional>
 
Index: libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/move.pass.cpp
===================================================================
--- libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/move.pass.cpp
+++ libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/move.pass.cpp
@@ -8,7 +8,7 @@
 
 // UNSUPPORTED: c++98, c++03, c++11, c++14
 
-// XFAIL: dylib-has-no-bad_optional_access && !libcpp-no-exceptions
+// UNSUPPORTED: dylib-has-no-bad_optional_access && !libcpp-no-exceptions
 
 // <optional>
 
Index: libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/rvalue_T.pass.cpp
===================================================================
--- libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/rvalue_T.pass.cpp
+++ libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/rvalue_T.pass.cpp
@@ -8,7 +8,7 @@
 //
 // UNSUPPORTED: c++98, c++03, c++11, c++14
 
-// XFAIL: dylib-has-no-bad_optional_access && !libcpp-no-exceptions
+// UNSUPPORTED: dylib-has-no-bad_optional_access && !libcpp-no-exceptions
 
 // <optional>
 
Index: libcxx/test/std/utilities/optional/optional.object/optional.object.observe/value.pass.cpp
===================================================================
--- libcxx/test/std/utilities/optional/optional.object/optional.object.observe/value.pass.cpp
+++ libcxx/test/std/utilities/optional/optional.object/optional.object.observe/value.pass.cpp
@@ -8,7 +8,7 @@
 
 // UNSUPPORTED: c++98, c++03, c++11, c++14
 
-// XFAIL: dylib-has-no-bad_optional_access && !libcpp-no-exceptions
+// UNSUPPORTED: dylib-has-no-bad_optional_access && !libcpp-no-exceptions
 
 // <optional>
 
Index: libcxx/test/std/utilities/optional/optional.object/optional.object.observe/value_const.pass.cpp
===================================================================
--- libcxx/test/std/utilities/optional/optional.object/optional.object.observe/value_const.pass.cpp
+++ libcxx/test/std/utilities/optional/optional.object/optional.object.observe/value_const.pass.cpp
@@ -8,7 +8,7 @@
 
 // UNSUPPORTED: c++98, c++03, c++11, c++14
 
-// XFAIL: dylib-has-no-bad_optional_access && !libcpp-no-exceptions
+// UNSUPPORTED: dylib-has-no-bad_optional_access && !libcpp-no-exceptions
 
 // <optional>
 
Index: libcxx/test/std/utilities/optional/optional.object/optional.object.observe/value_const_rvalue.pass.cpp
===================================================================
--- libcxx/test/std/utilities/optional/optional.object/optional.object.observe/value_const_rvalue.pass.cpp
+++ libcxx/test/std/utilities/optional/optional.object/optional.object.observe/value_const_rvalue.pass.cpp
@@ -8,7 +8,7 @@
 
 // UNSUPPORTED: c++98, c++03, c++11, c++14
 
-// XFAIL: dylib-has-no-bad_optional_access && !libcpp-no-exceptions
+// UNSUPPORTED: dylib-has-no-bad_optional_access && !libcpp-no-exceptions
 
 // <optional>
 
Index: libcxx/test/std/utilities/optional/optional.object/optional.object.observe/value_rvalue.pass.cpp
===================================================================
--- libcxx/test/std/utilities/optional/optional.object/optional.object.observe/value_rvalue.pass.cpp
+++ libcxx/test/std/utilities/optional/optional.object/optional.object.observe/value_rvalue.pass.cpp
@@ -9,7 +9,7 @@
 // UNSUPPORTED: c++98, c++03, c++11, c++14
 // <optional>
 
-// XFAIL: dylib-has-no-bad_optional_access && !libcpp-no-exceptions
+// UNSUPPORTED: dylib-has-no-bad_optional_access && !libcpp-no-exceptions
 
 // constexpr T& optional<T>::value() &&;
 
Index: libcxx/test/std/utilities/optional/optional.specalg/make_optional.pass.cpp
===================================================================
--- libcxx/test/std/utilities/optional/optional.specalg/make_optional.pass.cpp
+++ libcxx/test/std/utilities/optional/optional.specalg/make_optional.pass.cpp
@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 // UNSUPPORTED: c++98, c++03, c++11, c++14
-// XFAIL: dylib-has-no-bad_optional_access && !libcpp-no-exceptions
+// UNSUPPORTED: dylib-has-no-bad_optional_access && !libcpp-no-exceptions
 
 // <optional>
 //
Index: libcxx/test/std/utilities/time/time.clock/time.clock.file/now.pass.cpp
===================================================================
--- libcxx/test/std/utilities/time/time.clock/time.clock.file/now.pass.cpp
+++ libcxx/test/std/utilities/time/time.clock/time.clock.file/now.pass.cpp
@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 // UNSUPPORTED: c++98, c++03, c++11, c++14, c++17
-// XFAIL: dylib-has-no-filesystem
+// UNSUPPORTED: dylib-has-no-filesystem
 
 // <chrono>
 
Index: libcxx/test/std/utilities/variant/variant.bad_variant_access/bad_variant_access.pass.cpp
===================================================================
--- libcxx/test/std/utilities/variant/variant.bad_variant_access/bad_variant_access.pass.cpp
+++ libcxx/test/std/utilities/variant/variant.bad_variant_access/bad_variant_access.pass.cpp
@@ -9,8 +9,7 @@
 
 // UNSUPPORTED: c++98, c++03, c++11, c++14
 
-// XFAIL: dylib-has-no-bad_variant_access
-
+// UNSUPPORTED: dylib-has-no-bad_variant_access
 
 // <variant>
 
Index: libcxx/test/std/utilities/variant/variant.get/get_index.pass.cpp
===================================================================
--- libcxx/test/std/utilities/variant/variant.get/get_index.pass.cpp
+++ libcxx/test/std/utilities/variant/variant.get/get_index.pass.cpp
@@ -9,7 +9,7 @@
 
 // UNSUPPORTED: c++98, c++03, c++11, c++14
 
-// XFAIL: dylib-has-no-bad_variant_access && !libcpp-no-exceptions
+// UNSUPPORTED: dylib-has-no-bad_variant_access && !libcpp-no-exceptions
 
 // <variant>
 
Index: libcxx/test/std/utilities/variant/variant.get/get_type.pass.cpp
===================================================================
--- libcxx/test/std/utilities/variant/variant.get/get_type.pass.cpp
+++ libcxx/test/std/utilities/variant/variant.get/get_type.pass.cpp
@@ -9,7 +9,7 @@
 
 // UNSUPPORTED: c++98, c++03, c++11, c++14
 
-// XFAIL: dylib-has-no-bad_variant_access && !libcpp-no-exceptions
+// UNSUPPORTED: dylib-has-no-bad_variant_access && !libcpp-no-exceptions
 
 // <variant>
 
Index: libcxx/test/std/utilities/variant/variant.variant/variant.assign/T.pass.cpp
===================================================================
--- libcxx/test/std/utilities/variant/variant.variant/variant.assign/T.pass.cpp
+++ libcxx/test/std/utilities/variant/variant.variant/variant.assign/T.pass.cpp
@@ -9,7 +9,7 @@
 
 // UNSUPPORTED: c++98, c++03, c++11, c++14
 
-// XFAIL: dylib-has-no-bad_variant_access && !libcpp-no-exceptions
+// UNSUPPORTED: dylib-has-no-bad_variant_access && !libcpp-no-exceptions
 
 // <variant>
 
Index: libcxx/test/std/utilities/variant/variant.variant/variant.assign/copy.pass.cpp
===================================================================
--- libcxx/test/std/utilities/variant/variant.variant/variant.assign/copy.pass.cpp
+++ libcxx/test/std/utilities/variant/variant.variant/variant.assign/copy.pass.cpp
@@ -13,7 +13,7 @@
 // XFAIL: clang-3.5, clang-3.6, clang-3.7, clang-3.8
 // XFAIL: apple-clang-6, apple-clang-7, apple-clang-8.0
 
-// XFAIL: dylib-has-no-bad_variant_access && !libcpp-no-exceptions
+// UNSUPPORTED: dylib-has-no-bad_variant_access && !libcpp-no-exceptions
 
 // <variant>
 
Index: libcxx/test/std/utilities/variant/variant.variant/variant.assign/move.pass.cpp
===================================================================
--- libcxx/test/std/utilities/variant/variant.variant/variant.assign/move.pass.cpp
+++ libcxx/test/std/utilities/variant/variant.variant/variant.assign/move.pass.cpp
@@ -13,8 +13,7 @@
 // XFAIL: clang-3.5, clang-3.6, clang-3.7, clang-3.8
 // XFAIL: apple-clang-6, apple-clang-7, apple-clang-8.0
 
-// XFAIL: dylib-has-no-bad_variant_access && !libcpp-no-exceptions
-
+// UNSUPPORTED: dylib-has-no-bad_variant_access && !libcpp-no-exceptions
 
 // <variant>
 
Index: libcxx/test/std/utilities/variant/variant.variant/variant.ctor/T.pass.cpp
===================================================================
--- libcxx/test/std/utilities/variant/variant.variant/variant.ctor/T.pass.cpp
+++ libcxx/test/std/utilities/variant/variant.variant/variant.ctor/T.pass.cpp
@@ -8,7 +8,7 @@
 //===----------------------------------------------------------------------===//
 
 // UNSUPPORTED: c++98, c++03, c++11, c++14
-// XFAIL: dylib-has-no-bad_variant_access && !libcpp-no-exceptions
+// UNSUPPORTED: dylib-has-no-bad_variant_access && !libcpp-no-exceptions
 
 // <variant>
 
Index: libcxx/test/std/utilities/variant/variant.variant/variant.ctor/copy.pass.cpp
===================================================================
--- libcxx/test/std/utilities/variant/variant.variant/variant.ctor/copy.pass.cpp
+++ libcxx/test/std/utilities/variant/variant.variant/variant.ctor/copy.pass.cpp
@@ -9,7 +9,7 @@
 
 // UNSUPPORTED: c++98, c++03, c++11, c++14
 
-// XFAIL: dylib-has-no-bad_variant_access && !libcpp-no-exceptions
+// UNSUPPORTED: dylib-has-no-bad_variant_access && !libcpp-no-exceptions
 
 // <variant>
 
Index: libcxx/test/std/utilities/variant/variant.variant/variant.ctor/default.pass.cpp
===================================================================
--- libcxx/test/std/utilities/variant/variant.variant/variant.ctor/default.pass.cpp
+++ libcxx/test/std/utilities/variant/variant.variant/variant.ctor/default.pass.cpp
@@ -9,7 +9,7 @@
 
 // UNSUPPORTED: c++98, c++03, c++11, c++14
 
-// XFAIL: dylib-has-no-bad_variant_access && !libcpp-no-exceptions
+// UNSUPPORTED: dylib-has-no-bad_variant_access && !libcpp-no-exceptions
 
 // <variant>
 
Index: libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_index_args.pass.cpp
===================================================================
--- libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_index_args.pass.cpp
+++ libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_index_args.pass.cpp
@@ -9,7 +9,7 @@
 
 // UNSUPPORTED: c++98, c++03, c++11, c++14
 
-// XFAIL: dylib-has-no-bad_variant_access && !libcpp-no-exceptions
+// UNSUPPORTED: dylib-has-no-bad_variant_access && !libcpp-no-exceptions
 
 // <variant>
 
Index: libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_index_init_list_args.pass.cpp
===================================================================
--- libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_index_init_list_args.pass.cpp
+++ libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_index_init_list_args.pass.cpp
@@ -8,7 +8,7 @@
 //===----------------------------------------------------------------------===//
 
 // UNSUPPORTED: c++98, c++03, c++11, c++14
-// XFAIL: dylib-has-no-bad_variant_access && !libcpp-no-exceptions
+// UNSUPPORTED: dylib-has-no-bad_variant_access && !libcpp-no-exceptions
 
 // <variant>
 
Index: libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_type_args.pass.cpp
===================================================================
--- libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_type_args.pass.cpp
+++ libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_type_args.pass.cpp
@@ -9,7 +9,7 @@
 
 // UNSUPPORTED: c++98, c++03, c++11, c++14
 
-// XFAIL: dylib-has-no-bad_variant_access && !libcpp-no-exceptions
+// UNSUPPORTED: dylib-has-no-bad_variant_access && !libcpp-no-exceptions
 
 // <variant>
 
Index: libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_type_init_list_args.pass.cpp
===================================================================
--- libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_type_init_list_args.pass.cpp
+++ libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_type_init_list_args.pass.cpp
@@ -8,7 +8,7 @@
 //===----------------------------------------------------------------------===//
 
 // UNSUPPORTED: c++98, c++03, c++11, c++14
-// XFAIL: dylib-has-no-bad_variant_access && !libcpp-no-exceptions
+// UNSUPPORTED: dylib-has-no-bad_variant_access && !libcpp-no-exceptions
 
 // <variant>
 
Index: libcxx/test/std/utilities/variant/variant.variant/variant.ctor/move.pass.cpp
===================================================================
--- libcxx/test/std/utilities/variant/variant.variant/variant.ctor/move.pass.cpp
+++ libcxx/test/std/utilities/variant/variant.variant/variant.ctor/move.pass.cpp
@@ -9,7 +9,7 @@
 
 // UNSUPPORTED: c++98, c++03, c++11, c++14
 
-// XFAIL: dylib-has-no-bad_variant_access && !libcpp-no-exceptions
+// UNSUPPORTED: dylib-has-no-bad_variant_access && !libcpp-no-exceptions
 
 // <variant>
 
Index: libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_index_args.pass.cpp
===================================================================
--- libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_index_args.pass.cpp
+++ libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_index_args.pass.cpp
@@ -9,7 +9,7 @@
 
 // UNSUPPORTED: c++98, c++03, c++11, c++14
 
-// XFAIL: dylib-has-no-bad_variant_access && !libcpp-no-exceptions
+// UNSUPPORTED: dylib-has-no-bad_variant_access && !libcpp-no-exceptions
 
 // <variant>
 
Index: libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_index_init_list_args.pass.cpp
===================================================================
--- libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_index_init_list_args.pass.cpp
+++ libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_index_init_list_args.pass.cpp
@@ -9,7 +9,7 @@
 
 // UNSUPPORTED: c++98, c++03, c++11, c++14
 
-// XFAIL: dylib-has-no-bad_variant_access && !libcpp-no-exceptions
+// UNSUPPORTED: dylib-has-no-bad_variant_access && !libcpp-no-exceptions
 
 // <variant>
 
Index: libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_type_args.pass.cpp
===================================================================
--- libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_type_args.pass.cpp
+++ libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_type_args.pass.cpp
@@ -9,7 +9,7 @@
 
 // UNSUPPORTED: c++98, c++03, c++11, c++14
 
-// XFAIL: dylib-has-no-bad_variant_access && !libcpp-no-exceptions
+// UNSUPPORTED: dylib-has-no-bad_variant_access && !libcpp-no-exceptions
 
 // <variant>
 
Index: libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_type_init_list_args.pass.cpp
===================================================================
--- libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_type_init_list_args.pass.cpp
+++ libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_type_init_list_args.pass.cpp
@@ -9,7 +9,7 @@
 
 // UNSUPPORTED: c++98, c++03, c++11, c++14
 
-// XFAIL: dylib-has-no-bad_variant_access && !libcpp-no-exceptions
+// UNSUPPORTED: dylib-has-no-bad_variant_access && !libcpp-no-exceptions
 
 // <variant>
 
Index: libcxx/test/std/utilities/variant/variant.variant/variant.swap/swap.pass.cpp
===================================================================
--- libcxx/test/std/utilities/variant/variant.variant/variant.swap/swap.pass.cpp
+++ libcxx/test/std/utilities/variant/variant.variant/variant.swap/swap.pass.cpp
@@ -9,7 +9,7 @@
 
 // UNSUPPORTED: c++98, c++03, c++11, c++14
 
-// XFAIL: dylib-has-no-bad_variant_access && !libcpp-no-exceptions
+// UNSUPPORTED: dylib-has-no-bad_variant_access && !libcpp-no-exceptions
 
 // <variant>
 
Index: libcxx/test/std/utilities/variant/variant.visit/visit.pass.cpp
===================================================================
--- libcxx/test/std/utilities/variant/variant.visit/visit.pass.cpp
+++ libcxx/test/std/utilities/variant/variant.visit/visit.pass.cpp
@@ -9,7 +9,7 @@
 
 // UNSUPPORTED: c++98, c++03, c++11, c++14
 
-// XFAIL: dylib-has-no-bad_variant_access && !libcpp-no-exceptions
+// UNSUPPORTED: dylib-has-no-bad_variant_access && !libcpp-no-exceptions
 
 // <variant>
 // template <class Visitor, class... Variants>