diff --git a/libcxx/test/libcxx/type_traits/is_scalar.objc.pass.mm b/libcxx/test/libcxx/type_traits/is_scalar.objc.pass.mm
--- a/libcxx/test/libcxx/type_traits/is_scalar.objc.pass.mm
+++ b/libcxx/test/libcxx/type_traits/is_scalar.objc.pass.mm
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-// UNSUPPORTED: c++98, c++03, c++11, c++14
+// UNSUPPORTED: c++98, c++03
 // REQUIRES: has-fblocks
 // ADDITIONAL_COMPILE_FLAGS: -fblocks
 
@@ -17,7 +17,6 @@
 // Make sure we report that blocks are scalar types.
 
 #include <type_traits>
-#include <optional>
 
 struct Foo { };
 template <int> struct Arg { };
@@ -35,8 +34,5 @@
 
 
 int main(int, char**) {
-    // Make sure that std::optional can be used with a block, which is the
-    // underlying motivation for making blocks satisfy std::is_scalar.
-    std::optional<Foo (^)(Arg<0>)> opt; (void)opt;
     return 0;
 }