diff --git a/libcxx/test/support/MoveOnly.h b/libcxx/test/support/MoveOnly.h
index 61eb1902c752f3..a748ab50bd8955 100644
--- a/libcxx/test/support/MoveOnly.h
+++ b/libcxx/test/support/MoveOnly.h
@@ -31,12 +31,19 @@ class MoveOnly
 
     constexpr int get() const {return data_;}
 
-    constexpr bool operator==(const MoveOnly& x) const {return data_ == x.data_;}
-    constexpr bool operator!=(const MoveOnly& x) const {return data_ != x.data_;}
-    constexpr bool operator< (const MoveOnly& x) const {return data_ <  x.data_;}
-    constexpr bool operator<=(const MoveOnly& x) const {return data_ <= x.data_;}
-    constexpr bool operator> (const MoveOnly& x) const {return data_ >  x.data_;}
-    constexpr bool operator>=(const MoveOnly& x) const {return data_ >= x.data_;}
+    friend constexpr bool operator==(const MoveOnly& x, const MoveOnly& y)
+        { return x.data_ == y.data_; }
+    friend constexpr bool operator!=(const MoveOnly& x, const MoveOnly& y)
+        { return x.data_ != y.data_; }
+    friend constexpr bool operator< (const MoveOnly& x, const MoveOnly& y)
+        { return x.data_ <  y.data_; }
+    friend constexpr bool operator<=(const MoveOnly& x, const MoveOnly& y)
+        { return x.data_ <= y.data_; }
+    friend constexpr bool operator> (const MoveOnly& x, const MoveOnly& y)
+        { return x.data_ >  y.data_; }
+    friend constexpr bool operator>=(const MoveOnly& x, const MoveOnly& y)
+        { return x.data_ >= y.data_; }
+
     TEST_CONSTEXPR_CXX14 MoveOnly operator+(const MoveOnly& x) const
         { return MoveOnly{data_ + x.data_}; }
     TEST_CONSTEXPR_CXX14 MoveOnly operator*(const MoveOnly& x) const
@@ -50,7 +57,7 @@ struct hash<MoveOnly>
 {
     typedef MoveOnly argument_type;
     typedef size_t result_type;
-    constexpr std::size_t operator()(const MoveOnly& x) const {return x.get();}
+    constexpr size_t operator()(const MoveOnly& x) const {return x.get();}
 };
 
 }