diff --git a/test/utilities/optional/optional.comp_with_t/equal.pass.cpp b/test/utilities/optional/optional.comp_with_t/equal.pass.cpp
index b1865faf..81150ad2 100644
--- a/test/utilities/optional/optional.comp_with_t/equal.pass.cpp
+++ b/test/utilities/optional/optional.comp_with_t/equal.pass.cpp
@@ -14,11 +14,25 @@
 
 #include <optional>
 
+#if _LIBCPP_STD_VER > 11
+
+struct X
+{
+    int i_;
+
+    constexpr X(int i) : i_(i) {}
+};
+
+constexpr bool operator == ( const X &rhs, const X &lhs )
+    { return rhs.i_ == lhs.i_ ; }
+    
+#endif
+
 int main()
 {
 #if _LIBCPP_STD_VER > 11
     {
-    typedef int T;
+    typedef X T;
     typedef std::optional<T> O;
     
     constexpr T val(2);
@@ -26,16 +40,16 @@ int main()
     constexpr O o2{1};  // engaged
     constexpr O o3{val};  // engaged
 
-    static_assert ( !(o1 == 1), "" );
-    static_assert (   o2 == 1,  "" );
-    static_assert ( !(o3 == 1), "" );
-    static_assert (   o3 == 2 , "" );
+    static_assert ( !(o1 == T(1)), "" );
+    static_assert (   o2 == T(1),  "" );
+    static_assert ( !(o3 == T(1)), "" );
+    static_assert (   o3 == T(2) , "" );
     static_assert (   o3 == val, "" );
         
-    static_assert ( !(1 == o1), "" );
-    static_assert (   1 == o2,  "" );
-    static_assert ( !(1 == o3), "" );
-    static_assert (   2 == o3 , "" );
+    static_assert ( !(T(1) == o1), "" );
+    static_assert (   T(1) == o2,  "" );
+    static_assert ( !(T(1) == o3), "" );
+    static_assert (   T(2) == o3 , "" );
     static_assert ( val == o3 , "" );
     }
 #endif
diff --git a/test/utilities/optional/optional.comp_with_t/less_than.pass.cpp b/test/utilities/optional/optional.comp_with_t/less_than.pass.cpp
index ffc4441c..c71c8cc9 100644
--- a/test/utilities/optional/optional.comp_with_t/less_than.pass.cpp
+++ b/test/utilities/optional/optional.comp_with_t/less_than.pass.cpp
@@ -23,22 +23,9 @@ struct X
     constexpr X(int i) : i_(i) {}
 };
 
-namespace std
-{
-
-template <>
-struct less<X>
-{
-    constexpr
-    bool
-    operator()(const X& x, const X& y) const
-    {
-        return x.i_ < y.i_;
-    }
-};
-
-}
-
+constexpr bool operator < ( const X &rhs, const X &lhs )
+    { return rhs.i_ < lhs.i_ ; }
+    
 #endif
 
 int main()
diff --git a/test/utilities/optional/optional.relops/equal.pass.cpp b/test/utilities/optional/optional.relops/equal.pass.cpp
index ec0503c3..a600d07e 100644
--- a/test/utilities/optional/optional.relops/equal.pass.cpp
+++ b/test/utilities/optional/optional.relops/equal.pass.cpp
@@ -15,11 +15,25 @@
 #include <type_traits>
 #include <cassert>
 
+#if _LIBCPP_STD_VER > 11
+
+struct X
+{
+    int i_;
+
+    constexpr X(int i) : i_(i) {}
+};
+
+constexpr bool operator == ( const X &rhs, const X &lhs )
+    { return rhs.i_ == lhs.i_ ; }
+    
+#endif
+
 int main()
 {
 #if _LIBCPP_STD_VER > 11
     {
-    typedef int T;
+    typedef X T;
     typedef std::optional<T> O;
     
     constexpr O o1;     // disengaged
diff --git a/test/utilities/optional/optional.relops/less_than.pass.cpp b/test/utilities/optional/optional.relops/less_than.pass.cpp
index a1f60214..6bcb3046 100644
--- a/test/utilities/optional/optional.relops/less_than.pass.cpp
+++ b/test/utilities/optional/optional.relops/less_than.pass.cpp
@@ -22,21 +22,8 @@ struct X
     constexpr X(int i) : i_(i) {}
 };
 
-namespace std
-{
-
-template <>
-struct less<X>
-{
-    constexpr
-    bool
-    operator()(const X& x, const X& y) const
-    {
-        return x.i_ < y.i_;
-    }
-};
-
-}
+constexpr bool operator < ( const X &rhs, const X &lhs )
+    { return rhs.i_ < lhs.i_ ; }
 
 #endif