Index: test/std/algorithms/alg.sorting/alg.heap.operations/make.heap/make_heap.pass.cpp
===================================================================
--- test/std/algorithms/alg.sorting/alg.heap.operations/make.heap/make_heap.pass.cpp
+++ test/std/algorithms/alg.sorting/alg.heap.operations/make.heap/make_heap.pass.cpp
@@ -17,7 +17,7 @@
 #include <algorithm>
 #include <cassert>
 
-void test(unsigned N)
+void test(int N)
 {
     int* ia = new int [N];
     for (int i = 0; i < N; ++i)
Index: test/std/algorithms/alg.sorting/alg.heap.operations/pop.heap/pop_heap.pass.cpp
===================================================================
--- test/std/algorithms/alg.sorting/alg.heap.operations/pop.heap/pop_heap.pass.cpp
+++ test/std/algorithms/alg.sorting/alg.heap.operations/pop.heap/pop_heap.pass.cpp
@@ -17,7 +17,7 @@
 #include <algorithm>
 #include <cassert>
 
-void test(unsigned N)
+void test(int N)
 {
     int* ia = new int [N];
     for (int i = 0; i < N; ++i)
Index: test/std/algorithms/alg.sorting/alg.heap.operations/pop.heap/pop_heap_comp.pass.cpp
===================================================================
--- test/std/algorithms/alg.sorting/alg.heap.operations/pop.heap/pop_heap_comp.pass.cpp
+++ test/std/algorithms/alg.sorting/alg.heap.operations/pop.heap/pop_heap_comp.pass.cpp
@@ -29,7 +29,7 @@
 
 #endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
 
-void test(unsigned N)
+void test(int N)
 {
     int* ia = new int [N];
     for (int i = 0; i < N; ++i)
Index: test/std/algorithms/alg.sorting/alg.heap.operations/push.heap/push_heap.pass.cpp
===================================================================
--- test/std/algorithms/alg.sorting/alg.heap.operations/push.heap/push_heap.pass.cpp
+++ test/std/algorithms/alg.sorting/alg.heap.operations/push.heap/push_heap.pass.cpp
@@ -18,7 +18,7 @@
 #include <algorithm>
 #include <cassert>
 
-void test(unsigned N)
+void test(int N)
 {
     int* ia = new int [N];
     for (int i = 0; i < N; ++i)
Index: test/std/algorithms/alg.sorting/alg.heap.operations/push.heap/push_heap_comp.pass.cpp
===================================================================
--- test/std/algorithms/alg.sorting/alg.heap.operations/push.heap/push_heap_comp.pass.cpp
+++ test/std/algorithms/alg.sorting/alg.heap.operations/push.heap/push_heap_comp.pass.cpp
@@ -30,7 +30,7 @@
 
 #endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
 
-void test(unsigned N)
+void test(int N)
 {
     int* ia = new int [N];
     for (int i = 0; i < N; ++i)
Index: test/std/algorithms/alg.sorting/alg.heap.operations/sort.heap/sort_heap.pass.cpp
===================================================================
--- test/std/algorithms/alg.sorting/alg.heap.operations/sort.heap/sort_heap.pass.cpp
+++ test/std/algorithms/alg.sorting/alg.heap.operations/sort.heap/sort_heap.pass.cpp
@@ -17,7 +17,7 @@
 #include <algorithm>
 #include <cassert>
 
-void test(unsigned N)
+void test(int N)
 {
     int* ia = new int [N];
     for (int i = 0; i < N; ++i)
Index: test/std/algorithms/alg.sorting/alg.heap.operations/sort.heap/sort_heap_comp.pass.cpp
===================================================================
--- test/std/algorithms/alg.sorting/alg.heap.operations/sort.heap/sort_heap_comp.pass.cpp
+++ test/std/algorithms/alg.sorting/alg.heap.operations/sort.heap/sort_heap_comp.pass.cpp
@@ -29,7 +29,7 @@
 
 #endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
 
-void test(unsigned N)
+void test(int N)
 {
     int* ia = new int [N];
     for (int i = 0; i < N; ++i)
Index: test/std/algorithms/alg.sorting/alg.min.max/max_element.pass.cpp
===================================================================
--- test/std/algorithms/alg.sorting/alg.min.max/max_element.pass.cpp
+++ test/std/algorithms/alg.sorting/alg.min.max/max_element.pass.cpp
@@ -35,7 +35,7 @@
 
 template <class Iter>
 void
-test(unsigned N)
+test(int N)
 {
     int* a = new int[N];
     for (int i = 0; i < N; ++i)
Index: test/std/algorithms/alg.sorting/alg.min.max/max_element_comp.pass.cpp
===================================================================
--- test/std/algorithms/alg.sorting/alg.min.max/max_element_comp.pass.cpp
+++ test/std/algorithms/alg.sorting/alg.min.max/max_element_comp.pass.cpp
@@ -36,7 +36,7 @@
 
 template <class Iter>
 void
-test(unsigned N)
+test(int N)
 {
     int* a = new int[N];
     for (int i = 0; i < N; ++i)
Index: test/std/algorithms/alg.sorting/alg.min.max/min_element.pass.cpp
===================================================================
--- test/std/algorithms/alg.sorting/alg.min.max/min_element.pass.cpp
+++ test/std/algorithms/alg.sorting/alg.min.max/min_element.pass.cpp
@@ -35,7 +35,7 @@
 
 template <class Iter>
 void
-test(unsigned N)
+test(int N)
 {
     int* a = new int[N];
     for (int i = 0; i < N; ++i)
Index: test/std/algorithms/alg.sorting/alg.min.max/min_element_comp.pass.cpp
===================================================================
--- test/std/algorithms/alg.sorting/alg.min.max/min_element_comp.pass.cpp
+++ test/std/algorithms/alg.sorting/alg.min.max/min_element_comp.pass.cpp
@@ -36,7 +36,7 @@
 
 template <class Iter>
 void
-test(unsigned N)
+test(int N)
 {
     int* a = new int[N];
     for (int i = 0; i < N; ++i)
Index: test/std/algorithms/alg.sorting/alg.min.max/minmax_element.pass.cpp
===================================================================
--- test/std/algorithms/alg.sorting/alg.min.max/minmax_element.pass.cpp
+++ test/std/algorithms/alg.sorting/alg.min.max/minmax_element.pass.cpp
@@ -41,7 +41,7 @@
 
 template <class Iter>
 void
-test(unsigned N)
+test(int N)
 {
     int* a = new int[N];
     for (int i = 0; i < N; ++i)
Index: test/std/algorithms/alg.sorting/alg.min.max/minmax_element_comp.pass.cpp
===================================================================
--- test/std/algorithms/alg.sorting/alg.min.max/minmax_element_comp.pass.cpp
+++ test/std/algorithms/alg.sorting/alg.min.max/minmax_element_comp.pass.cpp
@@ -44,7 +44,7 @@
 
 template <class Iter>
 void
-test(unsigned N)
+test(int N)
 {
     int* a = new int[N];
     for (int i = 0; i < N; ++i)
Index: test/std/algorithms/alg.sorting/alg.nth.element/nth_element.pass.cpp
===================================================================
--- test/std/algorithms/alg.sorting/alg.nth.element/nth_element.pass.cpp
+++ test/std/algorithms/alg.sorting/alg.nth.element/nth_element.pass.cpp
@@ -19,7 +19,7 @@
 #include <cassert>
 
 void
-test_one(unsigned N, unsigned M)
+test_one(int N, int M)
 {
     assert(N != 0);
     assert(M < N);
@@ -34,7 +34,7 @@
 }
 
 void
-test(unsigned N)
+test(int N)
 {
     test_one(N, 0);
     test_one(N, 1);
Index: test/std/algorithms/alg.sorting/alg.nth.element/nth_element_comp.pass.cpp
===================================================================
--- test/std/algorithms/alg.sorting/alg.nth.element/nth_element_comp.pass.cpp
+++ test/std/algorithms/alg.sorting/alg.nth.element/nth_element_comp.pass.cpp
@@ -33,7 +33,7 @@
 #endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
 
 void
-test_one(unsigned N, unsigned M)
+test_one(int N, int M)
 {
     assert(N != 0);
     assert(M < N);
@@ -48,7 +48,7 @@
 }
 
 void
-test(unsigned N)
+test(int N)
 {
     test_one(N, 0);
     test_one(N, 1);
Index: test/std/algorithms/alg.sorting/alg.sort/partial.sort.copy/partial_sort_copy.pass.cpp
===================================================================
--- test/std/algorithms/alg.sorting/alg.sort/partial.sort.copy/partial_sort_copy.pass.cpp
+++ test/std/algorithms/alg.sorting/alg.sort/partial.sort.copy/partial_sort_copy.pass.cpp
@@ -24,7 +24,7 @@
 
 template <class Iter>
 void
-test_larger_sorts(unsigned N, unsigned M)
+test_larger_sorts(int N, int M)
 {
     int* input = new int[N];
     int* output = new int[M];
@@ -43,7 +43,7 @@
 
 template <class Iter>
 void
-test_larger_sorts(unsigned N)
+test_larger_sorts(int N)
 {
     test_larger_sorts<Iter>(N, 0);
     test_larger_sorts<Iter>(N, 1);
Index: test/std/algorithms/alg.sorting/alg.sort/partial.sort.copy/partial_sort_copy_comp.pass.cpp
===================================================================
--- test/std/algorithms/alg.sorting/alg.sort/partial.sort.copy/partial_sort_copy_comp.pass.cpp
+++ test/std/algorithms/alg.sorting/alg.sort/partial.sort.copy/partial_sort_copy_comp.pass.cpp
@@ -27,7 +27,7 @@
 
 template <class Iter>
 void
-test_larger_sorts(unsigned N, unsigned M)
+test_larger_sorts(int N, int M)
 {
     int* input = new int[N];
     int* output = new int[M];
@@ -47,7 +47,7 @@
 
 template <class Iter>
 void
-test_larger_sorts(unsigned N)
+test_larger_sorts(int N)
 {
     test_larger_sorts<Iter>(N, 0);
     test_larger_sorts<Iter>(N, 1);
Index: test/std/algorithms/alg.sorting/alg.sort/partial.sort/partial_sort.pass.cpp
===================================================================
--- test/std/algorithms/alg.sorting/alg.sort/partial.sort/partial_sort.pass.cpp
+++ test/std/algorithms/alg.sorting/alg.sort/partial.sort/partial_sort.pass.cpp
@@ -19,7 +19,7 @@
 #include <cassert>
 
 void
-test_larger_sorts(unsigned N, unsigned M)
+test_larger_sorts(int N, int M)
 {
     assert(N != 0);
     assert(N >= M);
@@ -37,7 +37,7 @@
 }
 
 void
-test_larger_sorts(unsigned N)
+test_larger_sorts(int N)
 {
     test_larger_sorts(N, 0);
     test_larger_sorts(N, 1);
Index: test/std/algorithms/alg.sorting/alg.sort/partial.sort/partial_sort_comp.pass.cpp
===================================================================
--- test/std/algorithms/alg.sorting/alg.sort/partial.sort/partial_sort_comp.pass.cpp
+++ test/std/algorithms/alg.sorting/alg.sort/partial.sort/partial_sort_comp.pass.cpp
@@ -33,7 +33,7 @@
 #endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
 
 void
-test_larger_sorts(unsigned N, unsigned M)
+test_larger_sorts(int N, int M)
 {
     assert(N != 0);
     assert(N >= M);
@@ -51,7 +51,7 @@
 }
 
 void
-test_larger_sorts(unsigned N)
+test_larger_sorts(int N)
 {
     test_larger_sorts(N, 0);
     test_larger_sorts(N, 1);
Index: test/std/algorithms/alg.sorting/alg.sort/sort/sort.pass.cpp
===================================================================
--- test/std/algorithms/alg.sorting/alg.sort/sort/sort.pass.cpp
+++ test/std/algorithms/alg.sorting/alg.sort/sort/sort.pass.cpp
@@ -72,7 +72,7 @@
 }
 
 void
-test_larger_sorts(unsigned N, unsigned M)
+test_larger_sorts(int N, int M)
 {
     assert(N != 0);
     assert(M != 0);
@@ -112,7 +112,7 @@
 }
 
 void
-test_larger_sorts(unsigned N)
+test_larger_sorts(int N)
 {
     test_larger_sorts(N, 1);
     test_larger_sorts(N, 2);
Index: test/std/algorithms/alg.sorting/alg.sort/stable.sort/stable_sort.pass.cpp
===================================================================
--- test/std/algorithms/alg.sorting/alg.sort/stable.sort/stable_sort.pass.cpp
+++ test/std/algorithms/alg.sorting/alg.sort/stable.sort/stable_sort.pass.cpp
@@ -72,7 +72,7 @@
 }
 
 void
-test_larger_sorts(unsigned N, unsigned M)
+test_larger_sorts(int N, int M)
 {
     assert(N != 0);
     assert(M != 0);
@@ -112,7 +112,7 @@
 }
 
 void
-test_larger_sorts(unsigned N)
+test_larger_sorts(int N)
 {
     test_larger_sorts(N, 1);
     test_larger_sorts(N, 2);