diff --git a/test/std/containers/associative/map/map.access/max_size.pass.cpp b/test/std/containers/associative/map/map.access/max_size.pass.cpp
index 82a817a1f..9df3b074e 100644
--- a/test/std/containers/associative/map/map.access/max_size.pass.cpp
+++ b/test/std/containers/associative/map/map.access/max_size.pass.cpp
@@ -34,18 +34,18 @@ int main()
   {
     typedef limited_allocator<KV, (size_t)-1> A;
     typedef std::map<int, int, std::less<int>, A> C;
-    const C::difference_type max_dist =
-        std::numeric_limits<C::difference_type>::max();
+    const C::size_type max_dist =
+        static_cast<C::size_type>(std::numeric_limits<C::difference_type>::max());
     C c;
     assert(c.max_size() <= max_dist);
     LIBCPP_ASSERT(c.max_size() == max_dist);
-    }
-    {
-      typedef std::map<char, int> C;
-      const C::difference_type max_dist =
-          std::numeric_limits<C::difference_type>::max();
-      C c;
-      assert(c.max_size() <= max_dist);
-      assert(c.max_size() <= alloc_max_size(c.get_allocator()));
-    }
+  }
+  {
+    typedef std::map<char, int> C;
+    const C::size_type max_dist =
+        static_cast<C::size_type>(std::numeric_limits<C::difference_type>::max());
+    C c;
+    assert(c.max_size() <= max_dist);
+    assert(c.max_size() <= alloc_max_size(c.get_allocator()));
+  }
 }
diff --git a/test/std/containers/associative/multimap/max_size.pass.cpp b/test/std/containers/associative/multimap/max_size.pass.cpp
index 8d5ec1148..c836a1823 100644
--- a/test/std/containers/associative/multimap/max_size.pass.cpp
+++ b/test/std/containers/associative/multimap/max_size.pass.cpp
@@ -34,18 +34,18 @@ int main()
   {
     typedef limited_allocator<KV, (size_t)-1> A;
     typedef std::multimap<int, int, std::less<int>, A> C;
-    const C::difference_type max_dist =
-        std::numeric_limits<C::difference_type>::max();
+    const C::size_type max_dist =
+        static_cast<C::size_type>(std::numeric_limits<C::difference_type>::max());
     C c;
     assert(c.max_size() <= max_dist);
     LIBCPP_ASSERT(c.max_size() == max_dist);
-    }
-    {
-      typedef std::multimap<char, int> C;
-      const C::difference_type max_dist =
-          std::numeric_limits<C::difference_type>::max();
-      C c;
-      assert(c.max_size() <= max_dist);
-      assert(c.max_size() <= alloc_max_size(c.get_allocator()));
-    }
+  }
+  {
+    typedef std::multimap<char, int> C;
+    const C::size_type max_dist =
+        static_cast<C::size_type>(std::numeric_limits<C::difference_type>::max());
+    C c;
+    assert(c.max_size() <= max_dist);
+    assert(c.max_size() <= alloc_max_size(c.get_allocator()));
+  }
 }
diff --git a/test/std/containers/associative/multiset/max_size.pass.cpp b/test/std/containers/associative/multiset/max_size.pass.cpp
index 8ca34ba82..8c5b15e39 100644
--- a/test/std/containers/associative/multiset/max_size.pass.cpp
+++ b/test/std/containers/associative/multiset/max_size.pass.cpp
@@ -33,16 +33,16 @@ int main()
     {
       typedef limited_allocator<int, (size_t)-1> A;
       typedef std::multiset<int, std::less<int>, A> C;
-      const C::difference_type max_dist =
-          std::numeric_limits<C::difference_type>::max();
+      const C::size_type max_dist =
+          static_cast<C::size_type>(std::numeric_limits<C::difference_type>::max());
       C c;
       assert(c.max_size() <= max_dist);
       LIBCPP_ASSERT(c.max_size() == max_dist);
     }
     {
       typedef std::multiset<char> C;
-      const C::difference_type max_dist =
-          std::numeric_limits<C::difference_type>::max();
+      const C::size_type max_dist =
+          static_cast<C::size_type>(std::numeric_limits<C::difference_type>::max());
       C c;
       assert(c.max_size() <= max_dist);
       assert(c.max_size() <= alloc_max_size(c.get_allocator()));
diff --git a/test/std/containers/associative/set/max_size.pass.cpp b/test/std/containers/associative/set/max_size.pass.cpp
index c894eb51b..8be84046e 100644
--- a/test/std/containers/associative/set/max_size.pass.cpp
+++ b/test/std/containers/associative/set/max_size.pass.cpp
@@ -33,16 +33,16 @@ int main()
     {
       typedef limited_allocator<int, (size_t)-1> A;
       typedef std::set<int, std::less<int>, A> C;
-      const C::difference_type max_dist =
-          std::numeric_limits<C::difference_type>::max();
+      const C::size_type max_dist =
+          static_cast<C::size_type>(std::numeric_limits<C::difference_type>::max());
       C c;
       assert(c.max_size() <= max_dist);
       LIBCPP_ASSERT(c.max_size() == max_dist);
     }
     {
       typedef std::set<char> C;
-      const C::difference_type max_dist =
-          std::numeric_limits<C::difference_type>::max();
+      const C::size_type max_dist =
+          static_cast<C::size_type>(std::numeric_limits<C::difference_type>::max());
       C c;
       assert(c.max_size() <= max_dist);
       assert(c.max_size() <= alloc_max_size(c.get_allocator()));
diff --git a/test/std/containers/sequences/deque/deque.capacity/max_size.pass.cpp b/test/std/containers/sequences/deque/deque.capacity/max_size.pass.cpp
index 11ce9d2f6..2365d4e11 100644
--- a/test/std/containers/sequences/deque/deque.capacity/max_size.pass.cpp
+++ b/test/std/containers/sequences/deque/deque.capacity/max_size.pass.cpp
@@ -30,16 +30,16 @@ int main() {
   {
     typedef limited_allocator<int, (size_t)-1> A;
     typedef std::deque<int, A> C;
-    const C::difference_type max_dist =
-        std::numeric_limits<C::difference_type>::max();
+    const C::size_type max_dist =
+        static_cast<C::size_type>(std::numeric_limits<C::difference_type>::max());
     C c;
     assert(c.max_size() <= max_dist);
     LIBCPP_ASSERT(c.max_size() == max_dist);
   }
   {
     typedef std::deque<char> C;
-    const C::difference_type max_dist =
-        std::numeric_limits<C::difference_type>::max();
+    const C::size_type max_dist =
+        static_cast<C::size_type>(std::numeric_limits<C::difference_type>::max());
     C c;
     assert(c.max_size() <= max_dist);
     assert(c.max_size() <= alloc_max_size(c.get_allocator()));
diff --git a/test/std/containers/sequences/forwardlist/max_size.pass.cpp b/test/std/containers/sequences/forwardlist/max_size.pass.cpp
index 916d12a9f..dc35ac5f5 100644
--- a/test/std/containers/sequences/forwardlist/max_size.pass.cpp
+++ b/test/std/containers/sequences/forwardlist/max_size.pass.cpp
@@ -31,16 +31,16 @@ int main()
     {
       typedef limited_allocator<int, (size_t)-1> A;
       typedef std::forward_list<int, A> C;
-      const C::difference_type max_dist =
-          std::numeric_limits<C::difference_type>::max();
+      const C::size_type max_dist =
+          static_cast<C::size_type>(std::numeric_limits<C::difference_type>::max());
       C c;
       assert(c.max_size() <= max_dist);
       LIBCPP_ASSERT(c.max_size() == max_dist);
     }
     {
       typedef std::forward_list<char> C;
-      const C::difference_type max_dist =
-          std::numeric_limits<C::difference_type>::max();
+      const C::size_type max_dist =
+          static_cast<C::size_type>(std::numeric_limits<C::difference_type>::max());
       C c;
       assert(c.max_size() <= max_dist);
       assert(c.max_size() <= alloc_max_size(c.get_allocator()));
diff --git a/test/std/containers/sequences/list/list.capacity/max_size.pass.cpp b/test/std/containers/sequences/list/list.capacity/max_size.pass.cpp
index bd1b65e63..e8a48a2db 100644
--- a/test/std/containers/sequences/list/list.capacity/max_size.pass.cpp
+++ b/test/std/containers/sequences/list/list.capacity/max_size.pass.cpp
@@ -30,16 +30,16 @@ int main() {
   {
     typedef limited_allocator<int, (size_t)-1> A;
     typedef std::list<int, A> C;
-    const C::difference_type max_dist =
-        std::numeric_limits<C::difference_type>::max();
+    const C::size_type max_dist =
+        static_cast<C::size_type>(std::numeric_limits<C::difference_type>::max());
     C c;
     assert(c.max_size() <= max_dist);
     LIBCPP_ASSERT(c.max_size() == max_dist);
   }
   {
     typedef std::list<char> C;
-    const C::difference_type max_dist =
-        std::numeric_limits<C::difference_type>::max();
+    const C::size_type max_dist =
+        static_cast<C::size_type>(std::numeric_limits<C::difference_type>::max());
     C c;
     assert(c.max_size() <= max_dist);
     assert(c.max_size() <= alloc_max_size(c.get_allocator()));
diff --git a/test/std/containers/sequences/vector/vector.capacity/max_size.pass.cpp b/test/std/containers/sequences/vector/vector.capacity/max_size.pass.cpp
index 5f7a6268d..3ab5cc6a8 100644
--- a/test/std/containers/sequences/vector/vector.capacity/max_size.pass.cpp
+++ b/test/std/containers/sequences/vector/vector.capacity/max_size.pass.cpp
@@ -31,16 +31,16 @@ int main() {
   {
     typedef limited_allocator<int, (size_t)-1> A;
     typedef std::vector<int, A> C;
-    const C::difference_type max_dist =
-        std::numeric_limits<C::difference_type>::max();
+    const C::size_type max_dist =
+        static_cast<C::size_type>(std::numeric_limits<C::difference_type>::max());
     C c;
     assert(c.max_size() <= max_dist);
     LIBCPP_ASSERT(c.max_size() == max_dist);
   }
   {
     typedef std::vector<char> C;
-    const C::difference_type max_dist =
-        std::numeric_limits<C::difference_type>::max();
+    const C::size_type max_dist =
+        static_cast<C::size_type>(std::numeric_limits<C::difference_type>::max());
     C c;
     assert(c.max_size() <= max_dist);
     assert(c.max_size() <= alloc_max_size(c.get_allocator()));
diff --git a/test/std/containers/unord/unord.map/max_size.pass.cpp b/test/std/containers/unord/unord.map/max_size.pass.cpp
index 152741981..d01b52683 100644
--- a/test/std/containers/unord/unord.map/max_size.pass.cpp
+++ b/test/std/containers/unord/unord.map/max_size.pass.cpp
@@ -36,16 +36,16 @@ int main()
     typedef limited_allocator<KV, (size_t)-1> A;
     typedef std::unordered_map<int, int, std::hash<int>, std::equal_to<int>, A>
         C;
-    const C::difference_type max_dist =
-        std::numeric_limits<C::difference_type>::max();
+    const C::size_type max_dist =
+        static_cast<C::size_type>(std::numeric_limits<C::difference_type>::max());
     C c;
     assert(c.max_size() <= max_dist);
     LIBCPP_ASSERT(c.max_size() == max_dist);
     }
     {
       typedef std::unordered_map<char, int> C;
-      const C::difference_type max_dist =
-          std::numeric_limits<C::difference_type>::max();
+    const C::size_type max_dist =
+        static_cast<C::size_type>(std::numeric_limits<C::difference_type>::max());
       C c;
       assert(c.max_size() <= max_dist);
       assert(c.max_size() <= alloc_max_size(c.get_allocator()));
diff --git a/test/std/containers/unord/unord.multimap/max_size.pass.cpp b/test/std/containers/unord/unord.multimap/max_size.pass.cpp
index 5b58bac38..228575c2e 100644
--- a/test/std/containers/unord/unord.multimap/max_size.pass.cpp
+++ b/test/std/containers/unord/unord.multimap/max_size.pass.cpp
@@ -38,16 +38,16 @@ int main()
     typedef std::unordered_multimap<int, int, std::hash<int>,
                                     std::equal_to<int>, A>
         C;
-    const C::difference_type max_dist =
-        std::numeric_limits<C::difference_type>::max();
+    const C::size_type max_dist =
+        static_cast<C::size_type>(std::numeric_limits<C::difference_type>::max());
     C c;
     assert(c.max_size() <= max_dist);
     LIBCPP_ASSERT(c.max_size() == max_dist);
     }
     {
       typedef std::unordered_multimap<char, int> C;
-      const C::difference_type max_dist =
-          std::numeric_limits<C::difference_type>::max();
+    const C::size_type max_dist =
+        static_cast<C::size_type>(std::numeric_limits<C::difference_type>::max());
       C c;
       assert(c.max_size() <= max_dist);
       assert(c.max_size() <= alloc_max_size(c.get_allocator()));
diff --git a/test/std/containers/unord/unord.multiset/max_size.pass.cpp b/test/std/containers/unord/unord.multiset/max_size.pass.cpp
index eac4db8b0..e76624e5c 100644
--- a/test/std/containers/unord/unord.multiset/max_size.pass.cpp
+++ b/test/std/containers/unord/unord.multiset/max_size.pass.cpp
@@ -37,16 +37,16 @@ int main()
       typedef std::unordered_multiset<int, std::hash<int>, std::equal_to<int>,
                                       A>
           C;
-      const C::difference_type max_dist =
-          std::numeric_limits<C::difference_type>::max();
+      const C::size_type max_dist =
+          static_cast<C::size_type>(std::numeric_limits<C::difference_type>::max());
       C c;
       assert(c.max_size() <= max_dist);
       LIBCPP_ASSERT(c.max_size() == max_dist);
     }
     {
       typedef std::unordered_multiset<char> C;
-      const C::difference_type max_dist =
-          std::numeric_limits<C::difference_type>::max();
+      const C::size_type max_dist =
+          static_cast<C::size_type>(std::numeric_limits<C::difference_type>::max());
       C c;
       assert(c.max_size() <= max_dist);
       assert(c.max_size() <= alloc_max_size(c.get_allocator()));
diff --git a/test/std/containers/unord/unord.set/max_size.pass.cpp b/test/std/containers/unord/unord.set/max_size.pass.cpp
index 1b902660d..eb695ae97 100644
--- a/test/std/containers/unord/unord.set/max_size.pass.cpp
+++ b/test/std/containers/unord/unord.set/max_size.pass.cpp
@@ -33,16 +33,16 @@ int main()
     {
       typedef limited_allocator<int, (size_t)-1> A;
       typedef std::unordered_set<int, std::hash<int>, std::equal_to<int>, A> C;
-      const C::difference_type max_dist =
-          std::numeric_limits<C::difference_type>::max();
+      const C::size_type max_dist =
+          static_cast<C::size_type>(std::numeric_limits<C::difference_type>::max());
       C c;
       assert(c.max_size() <= max_dist);
       LIBCPP_ASSERT(c.max_size() == max_dist);
     }
     {
       typedef std::unordered_set<char> C;
-      const C::difference_type max_dist =
-          std::numeric_limits<C::difference_type>::max();
+      const C::size_type max_dist =
+          static_cast<C::size_type>(std::numeric_limits<C::difference_type>::max());
       C c;
       assert(c.max_size() <= max_dist);
       assert(c.max_size() <= alloc_max_size(c.get_allocator()));