1 files changed, 13 insertions, 11 deletions
diff --git a/libcxx/test/utilities/optional/optional.object/optional.object.assign/copy.pass.cpp b/libcxx/test/utilities/optional/optional.object/optional.object.assign/copy.pass.cpp
index f6d365ae1de..81c3b4e6dfa 100644
--- a/libcxx/test/utilities/optional/optional.object/optional.object.assign/copy.pass.cpp
+++ b/libcxx/test/utilities/optional/optional.object/optional.object.assign/copy.pass.cpp
@@ -11,12 +11,14 @@
 
 // optional<T>& operator=(const optional<T>& rhs);
 
-#include <optional>
+#include <experimental/optional>
 #include <type_traits>
 #include <cassert>
 
 #if _LIBCPP_STD_VER > 11
 
+using std::experimental::optional;
+
 struct X
 {
     static bool throw_now;
@@ -37,15 +39,15 @@ int main()
 {
 #if _LIBCPP_STD_VER > 11
     {
-        std::optional<int> opt;
-        constexpr std::optional<int> opt2;
+        optional<int> opt;
+        constexpr optional<int> opt2;
         opt = opt2;
         static_assert(static_cast<bool>(opt2) == false, "");
         assert(static_cast<bool>(opt) == static_cast<bool>(opt2));
     }
     {
-        std::optional<int> opt;
-        constexpr std::optional<int> opt2(2);
+        optional<int> opt;
+        constexpr optional<int> opt2(2);
         opt = opt2;
         static_assert(static_cast<bool>(opt2) == true, "");
         static_assert(*opt2 == 2, "");
@@ -53,15 +55,15 @@ int main()
         assert(*opt == *opt2);
     }
     {
-        std::optional<int> opt(3);
-        constexpr std::optional<int> opt2;
+        optional<int> opt(3);
+        constexpr optional<int> opt2;
         opt = opt2;
         static_assert(static_cast<bool>(opt2) == false, "");
         assert(static_cast<bool>(opt) == static_cast<bool>(opt2));
     }
     {
-        std::optional<int> opt(3);
-        constexpr std::optional<int> opt2(2);
+        optional<int> opt(3);
+        constexpr optional<int> opt2(2);
         opt = opt2;
         static_assert(static_cast<bool>(opt2) == true, "");
         static_assert(*opt2 == 2, "");
@@ -69,8 +71,8 @@ int main()
         assert(*opt == *opt2);
     }
     {
-        std::optional<X> opt;
-        std::optional<X> opt2(X{});
+        optional<X> opt;
+        optional<X> opt2(X{});
         assert(static_cast<bool>(opt2) == true);
         try
         {