diff --git a/libcxx/test/libcxx/utilities/optional/optional.object/optional.object.assign/copy.pass.cpp b/libcxx/test/libcxx/utilities/optional/optional.object/optional.object.assign/copy.pass.cpp
index e4de92fbd013..cc04e4e87f0c 100644
--- a/libcxx/test/libcxx/utilities/optional/optional.object/optional.object.assign/copy.pass.cpp
+++ b/libcxx/test/libcxx/utilities/optional/optional.object/optional.object.assign/copy.pass.cpp
@@ -8,7 +8,6 @@
 //===----------------------------------------------------------------------===//
 
 // UNSUPPORTED: c++98, c++03, c++11, c++14
-// XFAIL: libcpp-no-exceptions
 // <optional>
 
 // optional<T>& operator=(const optional<T>& rhs);
@@ -45,7 +44,6 @@ struct Z2
     Z2& operator=(const Z2&) = default;
 };
 
-#if __cplusplus >= 201402
 template <class T>
 constexpr bool
 test()
@@ -55,23 +53,18 @@ test()
     opt = opt2;
     return true;
 }
-#endif
 
 int main()
 {
     {
         using T = int;
         static_assert((std::is_trivially_copy_assignable<optional<T>>::value), "");
-#if __cplusplus >= 201402
         static_assert(test<T>(), "");
-#endif
     }
     {
         using T = X;
         static_assert((std::is_trivially_copy_assignable<optional<T>>::value), "");
-#if __cplusplus >= 201402
         static_assert(test<T>(), "");
-#endif
     }
     static_assert(!(std::is_trivially_copy_assignable<optional<Y>>::value), "");
     static_assert(!(std::is_trivially_copy_assignable<optional<std::string>>::value), "");
diff --git a/libcxx/test/libcxx/utilities/optional/optional.object/optional.object.assign/move.pass.cpp b/libcxx/test/libcxx/utilities/optional/optional.object/optional.object.assign/move.pass.cpp
index e2eaa8ce6a0e..6f421153cafb 100644
--- a/libcxx/test/libcxx/utilities/optional/optional.object/optional.object.assign/move.pass.cpp
+++ b/libcxx/test/libcxx/utilities/optional/optional.object/optional.object.assign/move.pass.cpp
@@ -8,7 +8,6 @@
 //===----------------------------------------------------------------------===//
 
 // UNSUPPORTED: c++98, c++03, c++11, c++14
-// XFAIL: libcpp-no-exceptions
 // <optional>
 
 // optional<T>& operator=(optional<T>&& rhs);
@@ -42,7 +41,6 @@ struct Z2
     Z2& operator=(Z2&&) = default;
 };
 
-#if __cplusplus >= 201402
 template <class T>
 constexpr bool
 test()
@@ -52,23 +50,18 @@ test()
     opt = std::move(opt2);
     return true;
 }
-#endif
 
 int main()
 {
     {
         using T = int;
         static_assert((std::is_trivially_copy_constructible<optional<T>>::value), "");
-#if __cplusplus >= 201402
         static_assert(test<T>(), "");
-#endif
     }
     {
         using T = X;
         static_assert((std::is_trivially_copy_constructible<optional<T>>::value), "");
-#if __cplusplus >= 201402
         static_assert(test<T>(), "");
-#endif
     }
     static_assert(!(std::is_trivially_move_assignable<optional<Y>>::value), "");
     static_assert(!(std::is_trivially_move_assignable<optional<std::string>>::value), "");
diff --git a/libcxx/test/libcxx/utilities/optional/optional.object/optional.object.ctor/copy.pass.cpp b/libcxx/test/libcxx/utilities/optional/optional.object/optional.object.ctor/copy.pass.cpp
index 75e763507b2c..62eb6cd34880 100644
--- a/libcxx/test/libcxx/utilities/optional/optional.object/optional.object.ctor/copy.pass.cpp
+++ b/libcxx/test/libcxx/utilities/optional/optional.object/optional.object.ctor/copy.pass.cpp
@@ -8,7 +8,7 @@
 //===----------------------------------------------------------------------===//
 
 // UNSUPPORTED: c++98, c++03, c++11, c++14
-// XFAIL: libcpp-no-exceptions
+
 // <optional>
 
 // optional(const optional<T>& rhs);
diff --git a/libcxx/test/libcxx/utilities/optional/optional.object/optional.object.ctor/move.pass.cpp b/libcxx/test/libcxx/utilities/optional/optional.object/optional.object.ctor/move.pass.cpp
index e6d9bb8421c7..f13ca92e2807 100644
--- a/libcxx/test/libcxx/utilities/optional/optional.object/optional.object.ctor/move.pass.cpp
+++ b/libcxx/test/libcxx/utilities/optional/optional.object/optional.object.ctor/move.pass.cpp
@@ -8,7 +8,7 @@
 //===----------------------------------------------------------------------===//
 
 // UNSUPPORTED: c++98, c++03, c++11, c++14
-// XFAIL: libcpp-no-exceptions
+
 // <optional>
 
 // optional(optional<T>&& rhs);