diff --git a/libcxx/test/libcxx/containers/sequences/vector/db_back.pass.cpp b/libcxx/test/libcxx/containers/sequences/vector/db_back.pass.cpp
--- a/libcxx/test/libcxx/containers/sequences/vector/db_back.pass.cpp
+++ b/libcxx/test/libcxx/containers/sequences/vector/db_back.pass.cpp
@@ -22,28 +22,15 @@
 #include <cstdlib>
 
 #include "test_macros.h"
-#include "min_allocator.h"
-
-int main(int, char**)
-{
-    {
-    typedef int T;
-    typedef std::vector<T> C;
-    C c(1);
-    assert(c.back() == 0);
-    c.clear();
-    assert(c.back() == 0);
-    assert(false);
-    }
-#if TEST_STD_VER >= 11
-    {
-    typedef int T;
-    typedef std::vector<T, min_allocator<T>> C;
-    C c(1);
-    assert(c.back() == 0);
-    c.clear();
-    assert(c.back() == 0);
-    assert(false);
-    }
-#endif
+
+int main(int, char**) {
+  typedef int T;
+  typedef std::vector<T> C;
+  C c(1);
+  assert(c.back() == 0);
+  c.clear();
+  assert(c.back() == 0);
+  assert(false);
+
+  return 0;
 }
diff --git a/libcxx/test/libcxx/containers/sequences/vector/db_cback.pass.cpp b/libcxx/test/libcxx/containers/sequences/vector/db_back_2.pass.cpp
copy from libcxx/test/libcxx/containers/sequences/vector/db_cback.pass.cpp
copy to libcxx/test/libcxx/containers/sequences/vector/db_back_2.pass.cpp
--- a/libcxx/test/libcxx/containers/sequences/vector/db_cback.pass.cpp
+++ b/libcxx/test/libcxx/containers/sequences/vector/db_back_2.pass.cpp
@@ -8,7 +8,7 @@
 
 // <vector>
 
-// Call back() on empty const container.
+// Call back() on empty container.
 
 // UNSUPPORTED: libcxx-no-debug-mode
 
@@ -24,22 +24,14 @@
 #include "test_macros.h"
 #include "min_allocator.h"
 
-int main(int, char**)
-{
-    {
-    typedef int T;
-    typedef std::vector<T> C;
-    const C c;
-    assert(c.back() == 0);
-    assert(false);
-    }
-#if TEST_STD_VER >= 11
-    {
-    typedef int T;
-    typedef std::vector<T, min_allocator<T>> C;
-    const C c;
-    assert(c.back() == 0);
-    assert(false);
-    }
-#endif
+int main(int, char**) {
+  typedef int T;
+  typedef std::vector<T, min_allocator<T> > C;
+  C c(1);
+  assert(c.back() == 0);
+  c.clear();
+  assert(c.back() == 0);
+  assert(false);
+
+  return 0;
 }
diff --git a/libcxx/test/libcxx/containers/sequences/vector/db_cback.pass.cpp b/libcxx/test/libcxx/containers/sequences/vector/db_cback.pass.cpp
--- a/libcxx/test/libcxx/containers/sequences/vector/db_cback.pass.cpp
+++ b/libcxx/test/libcxx/containers/sequences/vector/db_cback.pass.cpp
@@ -22,24 +22,13 @@
 #include <cstdlib>
 
 #include "test_macros.h"
-#include "min_allocator.h"
-
-int main(int, char**)
-{
-    {
-    typedef int T;
-    typedef std::vector<T> C;
-    const C c;
-    assert(c.back() == 0);
-    assert(false);
-    }
-#if TEST_STD_VER >= 11
-    {
-    typedef int T;
-    typedef std::vector<T, min_allocator<T>> C;
-    const C c;
-    assert(c.back() == 0);
-    assert(false);
-    }
-#endif
+
+int main(int, char**) {
+  typedef int T;
+  typedef std::vector<T> C;
+  const C c;
+  assert(c.back() == 0);
+  assert(false);
+
+  return 0;
 }
diff --git a/libcxx/test/libcxx/containers/sequences/vector/db_cback.pass.cpp b/libcxx/test/libcxx/containers/sequences/vector/db_cback_2.pass.cpp
copy from libcxx/test/libcxx/containers/sequences/vector/db_cback.pass.cpp
copy to libcxx/test/libcxx/containers/sequences/vector/db_cback_2.pass.cpp
--- a/libcxx/test/libcxx/containers/sequences/vector/db_cback.pass.cpp
+++ b/libcxx/test/libcxx/containers/sequences/vector/db_cback_2.pass.cpp
@@ -24,22 +24,12 @@
 #include "test_macros.h"
 #include "min_allocator.h"
 
-int main(int, char**)
-{
-    {
-    typedef int T;
-    typedef std::vector<T> C;
-    const C c;
-    assert(c.back() == 0);
-    assert(false);
-    }
-#if TEST_STD_VER >= 11
-    {
-    typedef int T;
-    typedef std::vector<T, min_allocator<T>> C;
-    const C c;
-    assert(c.back() == 0);
-    assert(false);
-    }
-#endif
+int main(int, char**) {
+  typedef int T;
+  typedef std::vector<T, min_allocator<T> > C;
+  const C c;
+  assert(c.back() == 0);
+  assert(false);
+
+  return 0;
 }
diff --git a/libcxx/test/libcxx/containers/sequences/vector/db_cfront.pass.cpp b/libcxx/test/libcxx/containers/sequences/vector/db_cfront.pass.cpp
--- a/libcxx/test/libcxx/containers/sequences/vector/db_cfront.pass.cpp
+++ b/libcxx/test/libcxx/containers/sequences/vector/db_cfront.pass.cpp
@@ -22,24 +22,13 @@
 #include <cstdlib>
 
 #include "test_macros.h"
-#include "min_allocator.h"
-
-int main(int, char**)
-{
-    {
-    typedef int T;
-    typedef std::vector<T> C;
-    const C c;
-    assert(c.front() == 0);
-    assert(false);
-    }
-#if TEST_STD_VER >= 11
-    {
-    typedef int T;
-    typedef std::vector<T, min_allocator<T>> C;
-    const C c;
-    assert(c.front() == 0);
-    assert(false);
-    }
-#endif
+
+int main(int, char**) {
+  typedef int T;
+  typedef std::vector<T> C;
+  const C c;
+  assert(c.front() == 0);
+  assert(false);
+
+  return 0;
 }
diff --git a/libcxx/test/libcxx/containers/sequences/vector/db_cfront.pass.cpp b/libcxx/test/libcxx/containers/sequences/vector/db_cfront_2.pass.cpp
copy from libcxx/test/libcxx/containers/sequences/vector/db_cfront.pass.cpp
copy to libcxx/test/libcxx/containers/sequences/vector/db_cfront_2.pass.cpp
--- a/libcxx/test/libcxx/containers/sequences/vector/db_cfront.pass.cpp
+++ b/libcxx/test/libcxx/containers/sequences/vector/db_cfront_2.pass.cpp
@@ -24,22 +24,12 @@
 #include "test_macros.h"
 #include "min_allocator.h"
 
-int main(int, char**)
-{
-    {
-    typedef int T;
-    typedef std::vector<T> C;
-    const C c;
-    assert(c.front() == 0);
-    assert(false);
-    }
-#if TEST_STD_VER >= 11
-    {
-    typedef int T;
-    typedef std::vector<T, min_allocator<T>> C;
-    const C c;
-    assert(c.front() == 0);
-    assert(false);
-    }
-#endif
+int main(int, char**) {
+  typedef int T;
+  typedef std::vector<T, min_allocator<T> > C;
+  const C c;
+  assert(c.front() == 0);
+  assert(false);
+
+  return 0;
 }
diff --git a/libcxx/test/libcxx/containers/sequences/vector/db_front.pass.cpp b/libcxx/test/libcxx/containers/sequences/vector/db_front.pass.cpp
--- a/libcxx/test/libcxx/containers/sequences/vector/db_front.pass.cpp
+++ b/libcxx/test/libcxx/containers/sequences/vector/db_front.pass.cpp
@@ -22,28 +22,15 @@
 #include <cstdlib>
 
 #include "test_macros.h"
-#include "min_allocator.h"
-
-int main(int, char**)
-{
-    {
-    typedef int T;
-    typedef std::vector<T> C;
-    C c(1);
-    assert(c.front() == 0);
-    c.clear();
-    assert(c.front() == 0);
-    assert(false);
-    }
-#if TEST_STD_VER >= 11
-    {
-    typedef int T;
-    typedef std::vector<T, min_allocator<T>> C;
-    C c(1);
-    assert(c.front() == 0);
-    c.clear();
-    assert(c.front() == 0);
-    assert(false);
-    }
-#endif
+
+int main(int, char**) {
+  typedef int T;
+  typedef std::vector<T> C;
+  C c(1);
+  assert(c.front() == 0);
+  c.clear();
+  assert(c.front() == 0);
+  assert(false);
+
+  return 0;
 }
diff --git a/libcxx/test/libcxx/containers/sequences/vector/db_cback.pass.cpp b/libcxx/test/libcxx/containers/sequences/vector/db_front_2.pass.cpp
copy from libcxx/test/libcxx/containers/sequences/vector/db_cback.pass.cpp
copy to libcxx/test/libcxx/containers/sequences/vector/db_front_2.pass.cpp
--- a/libcxx/test/libcxx/containers/sequences/vector/db_cback.pass.cpp
+++ b/libcxx/test/libcxx/containers/sequences/vector/db_front_2.pass.cpp
@@ -8,7 +8,7 @@
 
 // <vector>
 
-// Call back() on empty const container.
+// Call front() on empty container.
 
 // UNSUPPORTED: libcxx-no-debug-mode
 
@@ -24,22 +24,14 @@
 #include "test_macros.h"
 #include "min_allocator.h"
 
-int main(int, char**)
-{
-    {
-    typedef int T;
-    typedef std::vector<T> C;
-    const C c;
-    assert(c.back() == 0);
-    assert(false);
-    }
-#if TEST_STD_VER >= 11
-    {
-    typedef int T;
-    typedef std::vector<T, min_allocator<T>> C;
-    const C c;
-    assert(c.back() == 0);
-    assert(false);
-    }
-#endif
+int main(int, char**) {
+  typedef int T;
+  typedef std::vector<T, min_allocator<T> > C;
+  C c(1);
+  assert(c.front() == 0);
+  c.clear();
+  assert(c.front() == 0);
+  assert(false);
+
+  return 0;
 }
diff --git a/libcxx/test/libcxx/containers/sequences/vector/db_index.pass.cpp b/libcxx/test/libcxx/containers/sequences/vector/db_index.pass.cpp
--- a/libcxx/test/libcxx/containers/sequences/vector/db_index.pass.cpp
+++ b/libcxx/test/libcxx/containers/sequences/vector/db_index.pass.cpp
@@ -22,28 +22,15 @@
 #include <cstdlib>
 
 #include "test_macros.h"
-#include "min_allocator.h"
-
-int main(int, char**)
-{
-    {
-    typedef int T;
-    typedef std::vector<T> C;
-    C c(1);
-    assert(c[0] == 0);
-    c.clear();
-    assert(c[0] == 0);
-    assert(false);
-    }
-#if TEST_STD_VER >= 11
-    {
-    typedef int T;
-    typedef std::vector<T, min_allocator<T>> C;
-    C c(1);
-    assert(c[0] == 0);
-    c.clear();
-    assert(c[0] == 0);
-    assert(false);
-    }
-#endif
+
+int main(int, char**) {
+  typedef int T;
+  typedef std::vector<T> C;
+  C c(1);
+  assert(c[0] == 0);
+  c.clear();
+  assert(c[0] == 0);
+  assert(false);
+
+  return 0;
 }
diff --git a/libcxx/test/libcxx/containers/sequences/vector/db_cback.pass.cpp b/libcxx/test/libcxx/containers/sequences/vector/db_index_2.pass.cpp
copy from libcxx/test/libcxx/containers/sequences/vector/db_cback.pass.cpp
copy to libcxx/test/libcxx/containers/sequences/vector/db_index_2.pass.cpp
--- a/libcxx/test/libcxx/containers/sequences/vector/db_cback.pass.cpp
+++ b/libcxx/test/libcxx/containers/sequences/vector/db_index_2.pass.cpp
@@ -8,7 +8,7 @@
 
 // <vector>
 
-// Call back() on empty const container.
+// Index vector out of bounds.
 
 // UNSUPPORTED: libcxx-no-debug-mode
 
@@ -24,22 +24,14 @@
 #include "test_macros.h"
 #include "min_allocator.h"
 
-int main(int, char**)
-{
-    {
-    typedef int T;
-    typedef std::vector<T> C;
-    const C c;
-    assert(c.back() == 0);
-    assert(false);
-    }
-#if TEST_STD_VER >= 11
-    {
-    typedef int T;
-    typedef std::vector<T, min_allocator<T>> C;
-    const C c;
-    assert(c.back() == 0);
-    assert(false);
-    }
-#endif
+int main(int, char**) {
+  typedef int T;
+  typedef std::vector<T, min_allocator<T> > C;
+  C c(1);
+  assert(c[0] == 0);
+  c.clear();
+  assert(c[0] == 0);
+  assert(false);
+
+  return 0;
 }
diff --git a/libcxx/test/libcxx/containers/sequences/vector/db_iterators_3.pass.cpp b/libcxx/test/libcxx/containers/sequences/vector/db_iterators_10.pass.cpp
copy from libcxx/test/libcxx/containers/sequences/vector/db_iterators_3.pass.cpp
copy to libcxx/test/libcxx/containers/sequences/vector/db_iterators_10.pass.cpp
--- a/libcxx/test/libcxx/containers/sequences/vector/db_iterators_3.pass.cpp
+++ b/libcxx/test/libcxx/containers/sequences/vector/db_iterators_10.pass.cpp
@@ -24,24 +24,14 @@
 #include "test_macros.h"
 #include "min_allocator.h"
 
-int main(int, char**)
-{
-    {
-    typedef int T;
-    typedef std::vector<T> C;
-    C c1;
-    C c2;
-    int i = c1.begin() - c2.begin(); (void)i;
-    assert(false);
-    }
-#if TEST_STD_VER >= 11
-    {
-    typedef int T;
-    typedef std::vector<T, min_allocator<T>> C;
-    C c1;
-    C c2;
-    int i = c1.begin() - c2.begin(); (void)i;
-    assert(false);
-    }
-#endif
+int main(int, char**) {
+  typedef int T;
+  typedef std::vector<T, min_allocator<T> > C;
+  C c1;
+  C c2;
+  int i = c1.begin() - c2.begin();
+  (void)i;
+  assert(false);
+
+  return 0;
 }
diff --git a/libcxx/test/libcxx/containers/sequences/vector/db_cback.pass.cpp b/libcxx/test/libcxx/containers/sequences/vector/db_iterators_11.pass.cpp
copy from libcxx/test/libcxx/containers/sequences/vector/db_cback.pass.cpp
copy to libcxx/test/libcxx/containers/sequences/vector/db_iterators_11.pass.cpp
--- a/libcxx/test/libcxx/containers/sequences/vector/db_cback.pass.cpp
+++ b/libcxx/test/libcxx/containers/sequences/vector/db_iterators_11.pass.cpp
@@ -8,7 +8,7 @@
 
 // <vector>
 
-// Call back() on empty const container.
+// Index iterator out of bounds.
 
 // UNSUPPORTED: libcxx-no-debug-mode
 
@@ -24,22 +24,14 @@
 #include "test_macros.h"
 #include "min_allocator.h"
 
-int main(int, char**)
-{
-    {
-    typedef int T;
-    typedef std::vector<T> C;
-    const C c;
-    assert(c.back() == 0);
-    assert(false);
-    }
-#if TEST_STD_VER >= 11
-    {
-    typedef int T;
-    typedef std::vector<T, min_allocator<T>> C;
-    const C c;
-    assert(c.back() == 0);
-    assert(false);
-    }
-#endif
+int main(int, char**) {
+  typedef int T;
+  typedef std::vector<T, min_allocator<T> > C;
+  C c(1);
+  C::iterator i = c.begin();
+  assert(i[0] == 0);
+  assert(i[1] == 0);
+  assert(false);
+
+  return 0;
 }
diff --git a/libcxx/test/libcxx/containers/sequences/vector/db_cback.pass.cpp b/libcxx/test/libcxx/containers/sequences/vector/db_iterators_12.pass.cpp
copy from libcxx/test/libcxx/containers/sequences/vector/db_cback.pass.cpp
copy to libcxx/test/libcxx/containers/sequences/vector/db_iterators_12.pass.cpp
--- a/libcxx/test/libcxx/containers/sequences/vector/db_cback.pass.cpp
+++ b/libcxx/test/libcxx/containers/sequences/vector/db_iterators_12.pass.cpp
@@ -8,7 +8,7 @@
 
 // <vector>
 
-// Call back() on empty const container.
+// Add to iterator out of bounds.
 
 // UNSUPPORTED: libcxx-no-debug-mode
 
@@ -24,22 +24,16 @@
 #include "test_macros.h"
 #include "min_allocator.h"
 
-int main(int, char**)
-{
-    {
-    typedef int T;
-    typedef std::vector<T> C;
-    const C c;
-    assert(c.back() == 0);
-    assert(false);
-    }
-#if TEST_STD_VER >= 11
-    {
-    typedef int T;
-    typedef std::vector<T, min_allocator<T>> C;
-    const C c;
-    assert(c.back() == 0);
-    assert(false);
-    }
-#endif
+int main(int, char**) {
+  typedef int T;
+  typedef std::vector<T, min_allocator<T> > C;
+  C c(1);
+  C::iterator i = c.begin();
+  i += 1;
+  assert(i == c.end());
+  i = c.begin();
+  i += 2;
+  assert(false);
+
+  return 0;
 }
diff --git a/libcxx/test/libcxx/containers/sequences/vector/db_cback.pass.cpp b/libcxx/test/libcxx/containers/sequences/vector/db_iterators_13.pass.cpp
copy from libcxx/test/libcxx/containers/sequences/vector/db_cback.pass.cpp
copy to libcxx/test/libcxx/containers/sequences/vector/db_iterators_13.pass.cpp
--- a/libcxx/test/libcxx/containers/sequences/vector/db_cback.pass.cpp
+++ b/libcxx/test/libcxx/containers/sequences/vector/db_iterators_13.pass.cpp
@@ -8,7 +8,7 @@
 
 // <vector>
 
-// Call back() on empty const container.
+// Decrement iterator prior to begin.
 
 // UNSUPPORTED: libcxx-no-debug-mode
 
@@ -24,22 +24,15 @@
 #include "test_macros.h"
 #include "min_allocator.h"
 
-int main(int, char**)
-{
-    {
-    typedef int T;
-    typedef std::vector<T> C;
-    const C c;
-    assert(c.back() == 0);
-    assert(false);
-    }
-#if TEST_STD_VER >= 11
-    {
-    typedef int T;
-    typedef std::vector<T, min_allocator<T>> C;
-    const C c;
-    assert(c.back() == 0);
-    assert(false);
-    }
-#endif
+int main(int, char**) {
+  typedef int T;
+  typedef std::vector<T, min_allocator<T> > C;
+  C c(1);
+  C::iterator i = c.end();
+  --i;
+  assert(i == c.begin());
+  --i;
+  assert(false);
+
+  return 0;
 }
diff --git a/libcxx/test/libcxx/containers/sequences/vector/db_cback.pass.cpp b/libcxx/test/libcxx/containers/sequences/vector/db_iterators_14.pass.cpp
copy from libcxx/test/libcxx/containers/sequences/vector/db_cback.pass.cpp
copy to libcxx/test/libcxx/containers/sequences/vector/db_iterators_14.pass.cpp
--- a/libcxx/test/libcxx/containers/sequences/vector/db_cback.pass.cpp
+++ b/libcxx/test/libcxx/containers/sequences/vector/db_iterators_14.pass.cpp
@@ -8,7 +8,7 @@
 
 // <vector>
 
-// Call back() on empty const container.
+// Increment iterator past end.
 
 // UNSUPPORTED: libcxx-no-debug-mode
 
@@ -24,22 +24,15 @@
 #include "test_macros.h"
 #include "min_allocator.h"
 
-int main(int, char**)
-{
-    {
-    typedef int T;
-    typedef std::vector<T> C;
-    const C c;
-    assert(c.back() == 0);
-    assert(false);
-    }
-#if TEST_STD_VER >= 11
-    {
-    typedef int T;
-    typedef std::vector<T, min_allocator<T>> C;
-    const C c;
-    assert(c.back() == 0);
-    assert(false);
-    }
-#endif
+int main(int, char**) {
+  typedef int T;
+  typedef std::vector<T, min_allocator<T> > C;
+  C c(1);
+  C::iterator i = c.begin();
+  ++i;
+  assert(i == c.end());
+  ++i;
+  assert(false);
+
+  return 0;
 }
diff --git a/libcxx/test/libcxx/containers/sequences/vector/db_iterators_8.pass.cpp b/libcxx/test/libcxx/containers/sequences/vector/db_iterators_15.pass.cpp
copy from libcxx/test/libcxx/containers/sequences/vector/db_iterators_8.pass.cpp
copy to libcxx/test/libcxx/containers/sequences/vector/db_iterators_15.pass.cpp
--- a/libcxx/test/libcxx/containers/sequences/vector/db_iterators_8.pass.cpp
+++ b/libcxx/test/libcxx/containers/sequences/vector/db_iterators_15.pass.cpp
@@ -24,24 +24,14 @@
 #include "test_macros.h"
 #include "min_allocator.h"
 
-int main(int, char**)
-{
-    {
-    typedef int T;
-    typedef std::vector<T> C;
-    C c(1);
-    C::iterator i = c.end();
-    T j = *i; (void)j;
-    assert(false);
-    }
-#if TEST_STD_VER >= 11
-    {
-    typedef int T;
-    typedef std::vector<T, min_allocator<T>> C;
-    C c(1);
-    C::iterator i = c.end();
-    T j = *i; (void)j;
-    assert(false);
-    }
-#endif
+int main(int, char**) {
+  typedef int T;
+  typedef std::vector<T, min_allocator<T> > C;
+  C c(1);
+  C::iterator i = c.end();
+  T j = *i;
+  (void)j;
+  assert(false);
+
+  return 0;
 }
diff --git a/libcxx/test/libcxx/containers/sequences/vector/db_iterators_2.pass.cpp b/libcxx/test/libcxx/containers/sequences/vector/db_iterators_2.pass.cpp
--- a/libcxx/test/libcxx/containers/sequences/vector/db_iterators_2.pass.cpp
+++ b/libcxx/test/libcxx/containers/sequences/vector/db_iterators_2.pass.cpp
@@ -22,26 +22,15 @@
 #include <cstdlib>
 
 #include "test_macros.h"
-#include "min_allocator.h"
-
-int main(int, char**)
-{
-    {
-    typedef int T;
-    typedef std::vector<T> C;
-    C c1;
-    C c2;
-    bool b = c1.begin() < c2.begin(); (void)b;
-    assert(false);
-    }
-#if TEST_STD_VER >= 11
-    {
-    typedef int T;
-    typedef std::vector<T, min_allocator<T>> C;
-    C c1;
-    C c2;
-    bool b = c1.begin() < c2.begin(); (void)b;
-    assert(false);
-    }
-#endif
+
+int main(int, char**) {
+  typedef int T;
+  typedef std::vector<T> C;
+  C c1;
+  C c2;
+  bool b = c1.begin() < c2.begin();
+  (void)b;
+  assert(false);
+
+  return 0;
 }
diff --git a/libcxx/test/libcxx/containers/sequences/vector/db_iterators_3.pass.cpp b/libcxx/test/libcxx/containers/sequences/vector/db_iterators_3.pass.cpp
--- a/libcxx/test/libcxx/containers/sequences/vector/db_iterators_3.pass.cpp
+++ b/libcxx/test/libcxx/containers/sequences/vector/db_iterators_3.pass.cpp
@@ -22,26 +22,15 @@
 #include <cstdlib>
 
 #include "test_macros.h"
-#include "min_allocator.h"
-
-int main(int, char**)
-{
-    {
-    typedef int T;
-    typedef std::vector<T> C;
-    C c1;
-    C c2;
-    int i = c1.begin() - c2.begin(); (void)i;
-    assert(false);
-    }
-#if TEST_STD_VER >= 11
-    {
-    typedef int T;
-    typedef std::vector<T, min_allocator<T>> C;
-    C c1;
-    C c2;
-    int i = c1.begin() - c2.begin(); (void)i;
-    assert(false);
-    }
-#endif
+
+int main(int, char**) {
+  typedef int T;
+  typedef std::vector<T> C;
+  C c1;
+  C c2;
+  int i = c1.begin() - c2.begin();
+  (void)i;
+  assert(false);
+
+  return 0;
 }
diff --git a/libcxx/test/libcxx/containers/sequences/vector/db_iterators_4.pass.cpp b/libcxx/test/libcxx/containers/sequences/vector/db_iterators_4.pass.cpp
--- a/libcxx/test/libcxx/containers/sequences/vector/db_iterators_4.pass.cpp
+++ b/libcxx/test/libcxx/containers/sequences/vector/db_iterators_4.pass.cpp
@@ -22,28 +22,15 @@
 #include <cstdlib>
 
 #include "test_macros.h"
-#include "min_allocator.h"
-
-int main(int, char**)
-{
-    {
-    typedef int T;
-    typedef std::vector<T> C;
-    C c(1);
-    C::iterator i = c.begin();
-    assert(i[0] == 0);
-    assert(i[1] == 0);
-    assert(false);
-    }
-#if TEST_STD_VER >= 11
-    {
-    typedef int T;
-    typedef std::vector<T, min_allocator<T>> C;
-    C c(1);
-    C::iterator i = c.begin();
-    assert(i[0] == 0);
-    assert(i[1] == 0);
-    assert(false);
-    }
-#endif
+
+int main(int, char**) {
+  typedef int T;
+  typedef std::vector<T> C;
+  C c(1);
+  C::iterator i = c.begin();
+  assert(i[0] == 0);
+  assert(i[1] == 0);
+  assert(false);
+
+  return 0;
 }
diff --git a/libcxx/test/libcxx/containers/sequences/vector/db_iterators_5.pass.cpp b/libcxx/test/libcxx/containers/sequences/vector/db_iterators_5.pass.cpp
--- a/libcxx/test/libcxx/containers/sequences/vector/db_iterators_5.pass.cpp
+++ b/libcxx/test/libcxx/containers/sequences/vector/db_iterators_5.pass.cpp
@@ -22,32 +22,17 @@
 #include <cstdlib>
 
 #include "test_macros.h"
-#include "min_allocator.h"
-
-int main(int, char**)
-{
-    {
-    typedef int T;
-    typedef std::vector<T> C;
-    C c(1);
-    C::iterator i = c.begin();
-    i += 1;
-    assert(i == c.end());
-    i = c.begin();
-    i += 2;
-    assert(false);
-    }
-#if TEST_STD_VER >= 11
-    {
-    typedef int T;
-    typedef std::vector<T, min_allocator<T>> C;
-    C c(1);
-    C::iterator i = c.begin();
-    i += 1;
-    assert(i == c.end());
-    i = c.begin();
-    i += 2;
-    assert(false);
-    }
-#endif
+
+int main(int, char**) {
+  typedef int T;
+  typedef std::vector<T> C;
+  C c(1);
+  C::iterator i = c.begin();
+  i += 1;
+  assert(i == c.end());
+  i = c.begin();
+  i += 2;
+  assert(false);
+
+  return 0;
 }
diff --git a/libcxx/test/libcxx/containers/sequences/vector/db_iterators_6.pass.cpp b/libcxx/test/libcxx/containers/sequences/vector/db_iterators_6.pass.cpp
--- a/libcxx/test/libcxx/containers/sequences/vector/db_iterators_6.pass.cpp
+++ b/libcxx/test/libcxx/containers/sequences/vector/db_iterators_6.pass.cpp
@@ -22,30 +22,16 @@
 #include <cstdlib>
 
 #include "test_macros.h"
-#include "min_allocator.h"
-
-int main(int, char**)
-{
-    {
-    typedef int T;
-    typedef std::vector<T> C;
-    C c(1);
-    C::iterator i = c.end();
-    --i;
-    assert(i == c.begin());
-    --i;
-    assert(false);
-    }
-#if TEST_STD_VER >= 11
-    {
-    typedef int T;
-    typedef std::vector<T, min_allocator<T>> C;
-    C c(1);
-    C::iterator i = c.end();
-    --i;
-    assert(i == c.begin());
-    --i;
-    assert(false);
-    }
-#endif
+
+int main(int, char**) {
+  typedef int T;
+  typedef std::vector<T> C;
+  C c(1);
+  C::iterator i = c.end();
+  --i;
+  assert(i == c.begin());
+  --i;
+  assert(false);
+
+  return 0;
 }
diff --git a/libcxx/test/libcxx/containers/sequences/vector/db_iterators_7.pass.cpp b/libcxx/test/libcxx/containers/sequences/vector/db_iterators_7.pass.cpp
--- a/libcxx/test/libcxx/containers/sequences/vector/db_iterators_7.pass.cpp
+++ b/libcxx/test/libcxx/containers/sequences/vector/db_iterators_7.pass.cpp
@@ -22,30 +22,16 @@
 #include <cstdlib>
 
 #include "test_macros.h"
-#include "min_allocator.h"
-
-int main(int, char**)
-{
-    {
-    typedef int T;
-    typedef std::vector<T> C;
-    C c(1);
-    C::iterator i = c.begin();
-    ++i;
-    assert(i == c.end());
-    ++i;
-    assert(false);
-    }
-#if TEST_STD_VER >= 11
-    {
-    typedef int T;
-    typedef std::vector<T, min_allocator<T>> C;
-    C c(1);
-    C::iterator i = c.begin();
-    ++i;
-    assert(i == c.end());
-    ++i;
-    assert(false);
-    }
-#endif
+
+int main(int, char**) {
+  typedef int T;
+  typedef std::vector<T> C;
+  C c(1);
+  C::iterator i = c.begin();
+  ++i;
+  assert(i == c.end());
+  ++i;
+  assert(false);
+
+  return 0;
 }
diff --git a/libcxx/test/libcxx/containers/sequences/vector/db_iterators_8.pass.cpp b/libcxx/test/libcxx/containers/sequences/vector/db_iterators_8.pass.cpp
--- a/libcxx/test/libcxx/containers/sequences/vector/db_iterators_8.pass.cpp
+++ b/libcxx/test/libcxx/containers/sequences/vector/db_iterators_8.pass.cpp
@@ -22,26 +22,15 @@
 #include <cstdlib>
 
 #include "test_macros.h"
-#include "min_allocator.h"
-
-int main(int, char**)
-{
-    {
-    typedef int T;
-    typedef std::vector<T> C;
-    C c(1);
-    C::iterator i = c.end();
-    T j = *i; (void)j;
-    assert(false);
-    }
-#if TEST_STD_VER >= 11
-    {
-    typedef int T;
-    typedef std::vector<T, min_allocator<T>> C;
-    C c(1);
-    C::iterator i = c.end();
-    T j = *i; (void)j;
-    assert(false);
-    }
-#endif
+
+int main(int, char**) {
+  typedef int T;
+  typedef std::vector<T> C;
+  C c(1);
+  C::iterator i = c.end();
+  T j = *i;
+  (void)j;
+  assert(false);
+
+  return 0;
 }
diff --git a/libcxx/test/libcxx/containers/sequences/vector/db_iterators_2.pass.cpp b/libcxx/test/libcxx/containers/sequences/vector/db_iterators_9.pass.cpp
copy from libcxx/test/libcxx/containers/sequences/vector/db_iterators_2.pass.cpp
copy to libcxx/test/libcxx/containers/sequences/vector/db_iterators_9.pass.cpp
--- a/libcxx/test/libcxx/containers/sequences/vector/db_iterators_2.pass.cpp
+++ b/libcxx/test/libcxx/containers/sequences/vector/db_iterators_9.pass.cpp
@@ -24,24 +24,14 @@
 #include "test_macros.h"
 #include "min_allocator.h"
 
-int main(int, char**)
-{
-    {
-    typedef int T;
-    typedef std::vector<T> C;
-    C c1;
-    C c2;
-    bool b = c1.begin() < c2.begin(); (void)b;
-    assert(false);
-    }
-#if TEST_STD_VER >= 11
-    {
-    typedef int T;
-    typedef std::vector<T, min_allocator<T>> C;
-    C c1;
-    C c2;
-    bool b = c1.begin() < c2.begin(); (void)b;
-    assert(false);
-    }
-#endif
+int main(int, char**) {
+  typedef int T;
+  typedef std::vector<T, min_allocator<T> > C;
+  C c1;
+  C c2;
+  bool b = c1.begin() < c2.begin();
+  (void)b;
+  assert(false);
+
+  return 0;
 }
diff --git a/libcxx/test/libcxx/strings/basic.string/string.access/db_back.pass.cpp b/libcxx/test/libcxx/strings/basic.string/string.access/db_back.pass.cpp
--- a/libcxx/test/libcxx/strings/basic.string/string.access/db_back.pass.cpp
+++ b/libcxx/test/libcxx/strings/basic.string/string.access/db_back.pass.cpp
@@ -22,26 +22,14 @@
 #include <cstdlib>
 
 #include "test_macros.h"
-#include "min_allocator.h"
-
-int main(int, char**)
-{
-    {
-    typedef std::string S;
-    S s(1, '\0');
-    assert(s.back() == 0);
-    s.clear();
-    assert(s.back() == 0);
-    assert(false);
-    }
-#if TEST_STD_VER >= 11
-    {
-    typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
-    S s(1, '\0');
-    assert(s.back() == 0);
-    s.clear();
-    assert(s.back() == 0);
-    assert(false);
-    }
-#endif
+
+int main(int, char**) {
+  typedef std::string S;
+  S s(1, '\0');
+  assert(s.back() == 0);
+  s.clear();
+  assert(s.back() == 0);
+  assert(false);
+
+  return 0;
 }
diff --git a/libcxx/test/libcxx/strings/basic.string/string.access/db_cback.pass.cpp b/libcxx/test/libcxx/strings/basic.string/string.access/db_back_2.pass.cpp
copy from libcxx/test/libcxx/strings/basic.string/string.access/db_cback.pass.cpp
copy to libcxx/test/libcxx/strings/basic.string/string.access/db_back_2.pass.cpp
--- a/libcxx/test/libcxx/strings/basic.string/string.access/db_cback.pass.cpp
+++ b/libcxx/test/libcxx/strings/basic.string/string.access/db_back_2.pass.cpp
@@ -8,7 +8,7 @@
 
 // <string>
 
-// Call back() on empty const container.
+// Call back() on empty container.
 
 // UNSUPPORTED: libcxx-no-debug-mode
 
@@ -24,20 +24,13 @@
 #include "test_macros.h"
 #include "min_allocator.h"
 
-int main(int, char**)
-{
-    {
-    typedef std::string S;
-    const S s;
-    assert(s.back() == 0);
-    assert(false);
-    }
-#if TEST_STD_VER >= 11
-    {
-    typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
-    const S s;
-    assert(s.back() == 0);
-    assert(false);
-    }
-#endif
+int main(int, char**) {
+  typedef std::basic_string<char, std::char_traits<char>, min_allocator<char> > S;
+  S s(1, '\0');
+  assert(s.back() == 0);
+  s.clear();
+  assert(s.back() == 0);
+  assert(false);
+
+  return 0;
 }
diff --git a/libcxx/test/libcxx/strings/basic.string/string.access/db_cback.pass.cpp b/libcxx/test/libcxx/strings/basic.string/string.access/db_cback.pass.cpp
--- a/libcxx/test/libcxx/strings/basic.string/string.access/db_cback.pass.cpp
+++ b/libcxx/test/libcxx/strings/basic.string/string.access/db_cback.pass.cpp
@@ -22,22 +22,12 @@
 #include <cstdlib>
 
 #include "test_macros.h"
-#include "min_allocator.h"
-
-int main(int, char**)
-{
-    {
-    typedef std::string S;
-    const S s;
-    assert(s.back() == 0);
-    assert(false);
-    }
-#if TEST_STD_VER >= 11
-    {
-    typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
-    const S s;
-    assert(s.back() == 0);
-    assert(false);
-    }
-#endif
+
+int main(int, char**) {
+  typedef std::string S;
+  const S s;
+  assert(s.back() == 0);
+  assert(false);
+
+  return 0;
 }
diff --git a/libcxx/test/libcxx/strings/basic.string/string.access/db_cback.pass.cpp b/libcxx/test/libcxx/strings/basic.string/string.access/db_cback_2.pass.cpp
copy from libcxx/test/libcxx/strings/basic.string/string.access/db_cback.pass.cpp
copy to libcxx/test/libcxx/strings/basic.string/string.access/db_cback_2.pass.cpp
--- a/libcxx/test/libcxx/strings/basic.string/string.access/db_cback.pass.cpp
+++ b/libcxx/test/libcxx/strings/basic.string/string.access/db_cback_2.pass.cpp
@@ -24,20 +24,11 @@
 #include "test_macros.h"
 #include "min_allocator.h"
 
-int main(int, char**)
-{
-    {
-    typedef std::string S;
-    const S s;
-    assert(s.back() == 0);
-    assert(false);
-    }
-#if TEST_STD_VER >= 11
-    {
-    typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
-    const S s;
-    assert(s.back() == 0);
-    assert(false);
-    }
-#endif
+int main(int, char**) {
+  typedef std::basic_string<char, std::char_traits<char>, min_allocator<char> > S;
+  const S s;
+  assert(s.back() == 0);
+  assert(false);
+
+  return 0;
 }
diff --git a/libcxx/test/libcxx/strings/basic.string/string.access/db_cfront.pass.cpp b/libcxx/test/libcxx/strings/basic.string/string.access/db_cfront.pass.cpp
--- a/libcxx/test/libcxx/strings/basic.string/string.access/db_cfront.pass.cpp
+++ b/libcxx/test/libcxx/strings/basic.string/string.access/db_cfront.pass.cpp
@@ -22,22 +22,12 @@
 #include <cstdlib>
 
 #include "test_macros.h"
-#include "min_allocator.h"
-
-int main(int, char**)
-{
-    {
-    typedef std::string S;
-    const S s;
-    assert(s.front() == 0);
-    assert(false);
-    }
-#if TEST_STD_VER >= 11
-    {
-    typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
-    const S s;
-    assert(s.front() == 0);
-    assert(false);
-    }
-#endif
+
+int main(int, char**) {
+  typedef std::string S;
+  const S s;
+  assert(s.front() == 0);
+  assert(false);
+
+  return 0;
 }
diff --git a/libcxx/test/libcxx/strings/basic.string/string.access/db_cfront.pass.cpp b/libcxx/test/libcxx/strings/basic.string/string.access/db_cfront_2.pass.cpp
copy from libcxx/test/libcxx/strings/basic.string/string.access/db_cfront.pass.cpp
copy to libcxx/test/libcxx/strings/basic.string/string.access/db_cfront_2.pass.cpp
--- a/libcxx/test/libcxx/strings/basic.string/string.access/db_cfront.pass.cpp
+++ b/libcxx/test/libcxx/strings/basic.string/string.access/db_cfront_2.pass.cpp
@@ -24,20 +24,11 @@
 #include "test_macros.h"
 #include "min_allocator.h"
 
-int main(int, char**)
-{
-    {
-    typedef std::string S;
-    const S s;
-    assert(s.front() == 0);
-    assert(false);
-    }
-#if TEST_STD_VER >= 11
-    {
-    typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
-    const S s;
-    assert(s.front() == 0);
-    assert(false);
-    }
-#endif
+int main(int, char**) {
+  typedef std::basic_string<char, std::char_traits<char>, min_allocator<char> > S;
+  const S s;
+  assert(s.front() == 0);
+  assert(false);
+
+  return 0;
 }
diff --git a/libcxx/test/libcxx/strings/basic.string/string.access/db_cindex.pass.cpp b/libcxx/test/libcxx/strings/basic.string/string.access/db_cindex.pass.cpp
--- a/libcxx/test/libcxx/strings/basic.string/string.access/db_cindex.pass.cpp
+++ b/libcxx/test/libcxx/strings/basic.string/string.access/db_cindex.pass.cpp
@@ -22,24 +22,13 @@
 #include <cstdlib>
 
 #include "test_macros.h"
-#include "min_allocator.h"
-
-int main(int, char**)
-{
-    {
-    typedef std::string S;
-    const S s;
-    assert(s[0] == 0);
-    assert(s[1] == 0);
-    assert(false);
-    }
-#if TEST_STD_VER >= 11
-    {
-    typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
-    const S s;
-    assert(s[0] == 0);
-    assert(s[1] == 0);
-    assert(false);
-    }
-#endif
+
+int main(int, char**) {
+  typedef std::string S;
+  const S s;
+  assert(s[0] == 0);
+  assert(s[1] == 0);
+  assert(false);
+
+  return 0;
 }
diff --git a/libcxx/test/libcxx/strings/basic.string/string.access/db_cindex.pass.cpp b/libcxx/test/libcxx/strings/basic.string/string.access/db_cindex_2.pass.cpp
copy from libcxx/test/libcxx/strings/basic.string/string.access/db_cindex.pass.cpp
copy to libcxx/test/libcxx/strings/basic.string/string.access/db_cindex_2.pass.cpp
--- a/libcxx/test/libcxx/strings/basic.string/string.access/db_cindex.pass.cpp
+++ b/libcxx/test/libcxx/strings/basic.string/string.access/db_cindex_2.pass.cpp
@@ -24,22 +24,12 @@
 #include "test_macros.h"
 #include "min_allocator.h"
 
-int main(int, char**)
-{
-    {
-    typedef std::string S;
-    const S s;
-    assert(s[0] == 0);
-    assert(s[1] == 0);
-    assert(false);
-    }
-#if TEST_STD_VER >= 11
-    {
-    typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
-    const S s;
-    assert(s[0] == 0);
-    assert(s[1] == 0);
-    assert(false);
-    }
-#endif
+int main(int, char**) {
+  typedef std::basic_string<char, std::char_traits<char>, min_allocator<char> > S;
+  const S s;
+  assert(s[0] == 0);
+  assert(s[1] == 0);
+  assert(false);
+
+  return 0;
 }
diff --git a/libcxx/test/libcxx/strings/basic.string/string.access/db_front.pass.cpp b/libcxx/test/libcxx/strings/basic.string/string.access/db_front.pass.cpp
--- a/libcxx/test/libcxx/strings/basic.string/string.access/db_front.pass.cpp
+++ b/libcxx/test/libcxx/strings/basic.string/string.access/db_front.pass.cpp
@@ -22,26 +22,14 @@
 #include <cstdlib>
 
 #include "test_macros.h"
-#include "min_allocator.h"
-
-int main(int, char**)
-{
-    {
-    typedef std::string S;
-    S s(1, '\0');
-    assert(s.front() == 0);
-    s.clear();
-    assert(s.front() == 0);
-    assert(false);
-    }
-#if TEST_STD_VER >= 11
-    {
-    typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
-    S s(1, '\0');
-    assert(s.front() == 0);
-    s.clear();
-    assert(s.front() == 0);
-    assert(false);
-    }
-#endif
+
+int main(int, char**) {
+  typedef std::string S;
+  S s(1, '\0');
+  assert(s.front() == 0);
+  s.clear();
+  assert(s.front() == 0);
+  assert(false);
+
+  return 0;
 }
diff --git a/libcxx/test/libcxx/strings/basic.string/string.access/db_cback.pass.cpp b/libcxx/test/libcxx/strings/basic.string/string.access/db_front_2.pass.cpp
copy from libcxx/test/libcxx/strings/basic.string/string.access/db_cback.pass.cpp
copy to libcxx/test/libcxx/strings/basic.string/string.access/db_front_2.pass.cpp
--- a/libcxx/test/libcxx/strings/basic.string/string.access/db_cback.pass.cpp
+++ b/libcxx/test/libcxx/strings/basic.string/string.access/db_front_2.pass.cpp
@@ -8,7 +8,7 @@
 
 // <string>
 
-// Call back() on empty const container.
+// Call front() on empty container.
 
 // UNSUPPORTED: libcxx-no-debug-mode
 
@@ -24,20 +24,13 @@
 #include "test_macros.h"
 #include "min_allocator.h"
 
-int main(int, char**)
-{
-    {
-    typedef std::string S;
-    const S s;
-    assert(s.back() == 0);
-    assert(false);
-    }
-#if TEST_STD_VER >= 11
-    {
-    typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
-    const S s;
-    assert(s.back() == 0);
-    assert(false);
-    }
-#endif
+int main(int, char**) {
+  typedef std::basic_string<char, std::char_traits<char>, min_allocator<char> > S;
+  S s(1, '\0');
+  assert(s.front() == 0);
+  s.clear();
+  assert(s.front() == 0);
+  assert(false);
+
+  return 0;
 }
diff --git a/libcxx/test/libcxx/strings/basic.string/string.access/db_index.pass.cpp b/libcxx/test/libcxx/strings/basic.string/string.access/db_index.pass.cpp
--- a/libcxx/test/libcxx/strings/basic.string/string.access/db_index.pass.cpp
+++ b/libcxx/test/libcxx/strings/basic.string/string.access/db_index.pass.cpp
@@ -22,24 +22,13 @@
 #include <cstdlib>
 
 #include "test_macros.h"
-#include "min_allocator.h"
-
-int main(int, char**)
-{
-    {
-    typedef std::string S;
-    S s;
-    assert(s[0] == 0);
-    assert(s[1] == 0);
-    assert(false);
-    }
-#if TEST_STD_VER >= 11
-    {
-    typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
-    S s;
-    assert(s[0] == 0);
-    assert(s[1] == 0);
-    assert(false);
-    }
-#endif
+
+int main(int, char**) {
+  typedef std::string S;
+  S s;
+  assert(s[0] == 0);
+  assert(s[1] == 0);
+  assert(false);
+
+  return 0;
 }
diff --git a/libcxx/test/libcxx/strings/basic.string/string.access/db_index.pass.cpp b/libcxx/test/libcxx/strings/basic.string/string.access/db_index_2.pass.cpp
copy from libcxx/test/libcxx/strings/basic.string/string.access/db_index.pass.cpp
copy to libcxx/test/libcxx/strings/basic.string/string.access/db_index_2.pass.cpp
--- a/libcxx/test/libcxx/strings/basic.string/string.access/db_index.pass.cpp
+++ b/libcxx/test/libcxx/strings/basic.string/string.access/db_index_2.pass.cpp
@@ -24,22 +24,12 @@
 #include "test_macros.h"
 #include "min_allocator.h"
 
-int main(int, char**)
-{
-    {
-    typedef std::string S;
-    S s;
-    assert(s[0] == 0);
-    assert(s[1] == 0);
-    assert(false);
-    }
-#if TEST_STD_VER >= 11
-    {
-    typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
-    S s;
-    assert(s[0] == 0);
-    assert(s[1] == 0);
-    assert(false);
-    }
-#endif
+int main(int, char**) {
+  typedef std::basic_string<char, std::char_traits<char>, min_allocator<char> > S;
+  S s;
+  assert(s[0] == 0);
+  assert(s[1] == 0);
+  assert(false);
+
+  return 0;
 }
diff --git a/libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_3.pass.cpp b/libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_10.pass.cpp
copy from libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_3.pass.cpp
copy to libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_10.pass.cpp
--- a/libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_3.pass.cpp
+++ b/libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_10.pass.cpp
@@ -24,24 +24,13 @@
 #include "test_macros.h"
 #include "min_allocator.h"
 
-int main(int, char**)
-{
-    {
-    typedef std::string S;
-    S s1;
-    S s2;
-    int i = s1.begin() - s2.begin();
-    (void) i;
-    assert(false);
-    }
-#if TEST_STD_VER >= 11
-    {
-    typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
-    S s1;
-    S s2;
-    int i = s1.begin() - s2.begin();
-    (void) i;
-    assert(false);
-    }
-#endif
+int main(int, char**) {
+  typedef std::basic_string<char, std::char_traits<char>, min_allocator<char> > S;
+  S s1;
+  S s2;
+  int i = s1.begin() - s2.begin();
+  (void)i;
+  assert(false);
+
+  return 0;
 }
diff --git a/libcxx/test/libcxx/strings/basic.string/string.access/db_cback.pass.cpp b/libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_11.pass.cpp
copy from libcxx/test/libcxx/strings/basic.string/string.access/db_cback.pass.cpp
copy to libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_11.pass.cpp
--- a/libcxx/test/libcxx/strings/basic.string/string.access/db_cback.pass.cpp
+++ b/libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_11.pass.cpp
@@ -8,7 +8,7 @@
 
 // <string>
 
-// Call back() on empty const container.
+// Index iterator out of bounds.
 
 // UNSUPPORTED: libcxx-no-debug-mode
 
@@ -24,20 +24,13 @@
 #include "test_macros.h"
 #include "min_allocator.h"
 
-int main(int, char**)
-{
-    {
-    typedef std::string S;
-    const S s;
-    assert(s.back() == 0);
-    assert(false);
-    }
-#if TEST_STD_VER >= 11
-    {
-    typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
-    const S s;
-    assert(s.back() == 0);
-    assert(false);
-    }
-#endif
+int main(int, char**) {
+  typedef std::basic_string<char, std::char_traits<char>, min_allocator<char> > C;
+  C c(1, '\0');
+  C::iterator i = c.begin();
+  assert(i[0] == 0);
+  assert(i[1] == 0);
+  assert(false);
+
+  return 0;
 }
diff --git a/libcxx/test/libcxx/strings/basic.string/string.access/db_cback.pass.cpp b/libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_12.pass.cpp
copy from libcxx/test/libcxx/strings/basic.string/string.access/db_cback.pass.cpp
copy to libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_12.pass.cpp
--- a/libcxx/test/libcxx/strings/basic.string/string.access/db_cback.pass.cpp
+++ b/libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_12.pass.cpp
@@ -8,7 +8,7 @@
 
 // <string>
 
-// Call back() on empty const container.
+// Add to iterator out of bounds.
 
 // UNSUPPORTED: libcxx-no-debug-mode
 
@@ -24,20 +24,15 @@
 #include "test_macros.h"
 #include "min_allocator.h"
 
-int main(int, char**)
-{
-    {
-    typedef std::string S;
-    const S s;
-    assert(s.back() == 0);
-    assert(false);
-    }
-#if TEST_STD_VER >= 11
-    {
-    typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
-    const S s;
-    assert(s.back() == 0);
-    assert(false);
-    }
-#endif
+int main(int, char**) {
+  typedef std::basic_string<char, std::char_traits<char>, min_allocator<char> > C;
+  C c(1, '\0');
+  C::iterator i = c.begin();
+  i += 1;
+  assert(i == c.end());
+  i = c.begin();
+  i += 2;
+  assert(false);
+
+  return 0;
 }
diff --git a/libcxx/test/libcxx/strings/basic.string/string.access/db_cback.pass.cpp b/libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_13.pass.cpp
copy from libcxx/test/libcxx/strings/basic.string/string.access/db_cback.pass.cpp
copy to libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_13.pass.cpp
--- a/libcxx/test/libcxx/strings/basic.string/string.access/db_cback.pass.cpp
+++ b/libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_13.pass.cpp
@@ -8,7 +8,7 @@
 
 // <string>
 
-// Call back() on empty const container.
+// Decrement iterator prior to begin.
 
 // UNSUPPORTED: libcxx-no-debug-mode
 
@@ -24,20 +24,14 @@
 #include "test_macros.h"
 #include "min_allocator.h"
 
-int main(int, char**)
-{
-    {
-    typedef std::string S;
-    const S s;
-    assert(s.back() == 0);
-    assert(false);
-    }
-#if TEST_STD_VER >= 11
-    {
-    typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
-    const S s;
-    assert(s.back() == 0);
-    assert(false);
-    }
-#endif
+int main(int, char**) {
+  typedef std::basic_string<char, std::char_traits<char>, min_allocator<char> > C;
+  C c(1, '\0');
+  C::iterator i = c.end();
+  --i;
+  assert(i == c.begin());
+  --i;
+  assert(false);
+
+  return 0;
 }
diff --git a/libcxx/test/libcxx/strings/basic.string/string.access/db_cback.pass.cpp b/libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_14.pass.cpp
copy from libcxx/test/libcxx/strings/basic.string/string.access/db_cback.pass.cpp
copy to libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_14.pass.cpp
--- a/libcxx/test/libcxx/strings/basic.string/string.access/db_cback.pass.cpp
+++ b/libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_14.pass.cpp
@@ -8,7 +8,7 @@
 
 // <string>
 
-// Call back() on empty const container.
+// Increment iterator past end.
 
 // UNSUPPORTED: libcxx-no-debug-mode
 
@@ -24,20 +24,14 @@
 #include "test_macros.h"
 #include "min_allocator.h"
 
-int main(int, char**)
-{
-    {
-    typedef std::string S;
-    const S s;
-    assert(s.back() == 0);
-    assert(false);
-    }
-#if TEST_STD_VER >= 11
-    {
-    typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
-    const S s;
-    assert(s.back() == 0);
-    assert(false);
-    }
-#endif
+int main(int, char**) {
+  typedef std::basic_string<char, std::char_traits<char>, min_allocator<char> > C;
+  C c(1, '\0');
+  C::iterator i = c.begin();
+  ++i;
+  assert(i == c.end());
+  ++i;
+  assert(false);
+
+  return 0;
 }
diff --git a/libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_8.pass.cpp b/libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_15.pass.cpp
copy from libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_8.pass.cpp
copy to libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_15.pass.cpp
--- a/libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_8.pass.cpp
+++ b/libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_15.pass.cpp
@@ -24,22 +24,12 @@
 #include "test_macros.h"
 #include "min_allocator.h"
 
-int main(int, char**)
-{
-    {
-    typedef std::string C;
-    C c(1, '\0');
-    C::iterator i = c.end();
-    (void) *i;
-    assert(false);
-    }
-#if TEST_STD_VER >= 11
-    {
-    typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> C;
-    C c(1, '\0');
-    C::iterator i = c.end();
-    (void) *i;
-    assert(false);
-    }
-#endif
+int main(int, char**) {
+  typedef std::basic_string<char, std::char_traits<char>, min_allocator<char> > C;
+  C c(1, '\0');
+  C::iterator i = c.end();
+  (void)*i;
+  assert(false);
+
+  return 0;
 }
diff --git a/libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_2.pass.cpp b/libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_2.pass.cpp
--- a/libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_2.pass.cpp
+++ b/libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_2.pass.cpp
@@ -22,26 +22,14 @@
 #include <cstdlib>
 
 #include "test_macros.h"
-#include "min_allocator.h"
-
-int main(int, char**)
-{
-    {
-    typedef std::string S;
-    S s1;
-    S s2;
-    bool b = s1.begin() < s2.begin();
-    (void) b;
-    assert(false);
-    }
-#if TEST_STD_VER >= 11
-    {
-    typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
-    S s1;
-    S s2;
-    bool b = s1.begin() < s2.begin();
-    (void) b;
-    assert(false);
-    }
-#endif
+
+int main(int, char**) {
+  typedef std::string S;
+  S s1;
+  S s2;
+  bool b = s1.begin() < s2.begin();
+  (void)b;
+  assert(false);
+
+  return 0;
 }
diff --git a/libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_3.pass.cpp b/libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_3.pass.cpp
--- a/libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_3.pass.cpp
+++ b/libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_3.pass.cpp
@@ -22,26 +22,14 @@
 #include <cstdlib>
 
 #include "test_macros.h"
-#include "min_allocator.h"
-
-int main(int, char**)
-{
-    {
-    typedef std::string S;
-    S s1;
-    S s2;
-    int i = s1.begin() - s2.begin();
-    (void) i;
-    assert(false);
-    }
-#if TEST_STD_VER >= 11
-    {
-    typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
-    S s1;
-    S s2;
-    int i = s1.begin() - s2.begin();
-    (void) i;
-    assert(false);
-    }
-#endif
+
+int main(int, char**) {
+  typedef std::string S;
+  S s1;
+  S s2;
+  int i = s1.begin() - s2.begin();
+  (void)i;
+  assert(false);
+
+  return 0;
 }
diff --git a/libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_4.pass.cpp b/libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_4.pass.cpp
--- a/libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_4.pass.cpp
+++ b/libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_4.pass.cpp
@@ -22,26 +22,14 @@
 #include <cstdlib>
 
 #include "test_macros.h"
-#include "min_allocator.h"
-
-int main(int, char**)
-{
-    {
-    typedef std::string C;
-    C c(1, '\0');
-    C::iterator i = c.begin();
-    assert(i[0] == 0);
-    assert(i[1] == 0);
-    assert(false);
-    }
-#if TEST_STD_VER >= 11
-    {
-    typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> C;
-    C c(1, '\0');
-    C::iterator i = c.begin();
-    assert(i[0] == 0);
-    assert(i[1] == 0);
-    assert(false);
-    }
-#endif
+
+int main(int, char**) {
+  typedef std::string C;
+  C c(1, '\0');
+  C::iterator i = c.begin();
+  assert(i[0] == 0);
+  assert(i[1] == 0);
+  assert(false);
+
+  return 0;
 }
diff --git a/libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_5.pass.cpp b/libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_5.pass.cpp
--- a/libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_5.pass.cpp
+++ b/libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_5.pass.cpp
@@ -22,30 +22,16 @@
 #include <cstdlib>
 
 #include "test_macros.h"
-#include "min_allocator.h"
-
-int main(int, char**)
-{
-    {
-    typedef std::string C;
-    C c(1, '\0');
-    C::iterator i = c.begin();
-    i += 1;
-    assert(i == c.end());
-    i = c.begin();
-    i += 2;
-    assert(false);
-    }
-#if TEST_STD_VER >= 11
-    {
-    typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> C;
-    C c(1, '\0');
-    C::iterator i = c.begin();
-    i += 1;
-    assert(i == c.end());
-    i = c.begin();
-    i += 2;
-    assert(false);
-    }
-#endif
+
+int main(int, char**) {
+  typedef std::string C;
+  C c(1, '\0');
+  C::iterator i = c.begin();
+  i += 1;
+  assert(i == c.end());
+  i = c.begin();
+  i += 2;
+  assert(false);
+
+  return 0;
 }
diff --git a/libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_6.pass.cpp b/libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_6.pass.cpp
--- a/libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_6.pass.cpp
+++ b/libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_6.pass.cpp
@@ -22,28 +22,15 @@
 #include <cstdlib>
 
 #include "test_macros.h"
-#include "min_allocator.h"
-
-int main(int, char**)
-{
-    {
-    typedef std::string C;
-    C c(1, '\0');
-    C::iterator i = c.end();
-    --i;
-    assert(i == c.begin());
-    --i;
-    assert(false);
-    }
-#if TEST_STD_VER >= 11
-    {
-    typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> C;
-    C c(1, '\0');
-    C::iterator i = c.end();
-    --i;
-    assert(i == c.begin());
-    --i;
-    assert(false);
-    }
-#endif
+
+int main(int, char**) {
+  typedef std::string C;
+  C c(1, '\0');
+  C::iterator i = c.end();
+  --i;
+  assert(i == c.begin());
+  --i;
+  assert(false);
+
+  return 0;
 }
diff --git a/libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_7.pass.cpp b/libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_7.pass.cpp
--- a/libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_7.pass.cpp
+++ b/libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_7.pass.cpp
@@ -22,28 +22,15 @@
 #include <cstdlib>
 
 #include "test_macros.h"
-#include "min_allocator.h"
-
-int main(int, char**)
-{
-    {
-    typedef std::string C;
-    C c(1, '\0');
-    C::iterator i = c.begin();
-    ++i;
-    assert(i == c.end());
-    ++i;
-    assert(false);
-    }
-#if TEST_STD_VER >= 11
-    {
-    typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> C;
-    C c(1, '\0');
-    C::iterator i = c.begin();
-    ++i;
-    assert(i == c.end());
-    ++i;
-    assert(false);
-    }
-#endif
+
+int main(int, char**) {
+  typedef std::string C;
+  C c(1, '\0');
+  C::iterator i = c.begin();
+  ++i;
+  assert(i == c.end());
+  ++i;
+  assert(false);
+
+  return 0;
 }
diff --git a/libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_8.pass.cpp b/libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_8.pass.cpp
--- a/libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_8.pass.cpp
+++ b/libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_8.pass.cpp
@@ -22,24 +22,13 @@
 #include <cstdlib>
 
 #include "test_macros.h"
-#include "min_allocator.h"
-
-int main(int, char**)
-{
-    {
-    typedef std::string C;
-    C c(1, '\0');
-    C::iterator i = c.end();
-    (void) *i;
-    assert(false);
-    }
-#if TEST_STD_VER >= 11
-    {
-    typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> C;
-    C c(1, '\0');
-    C::iterator i = c.end();
-    (void) *i;
-    assert(false);
-    }
-#endif
+
+int main(int, char**) {
+  typedef std::string C;
+  C c(1, '\0');
+  C::iterator i = c.end();
+  (void)*i;
+  assert(false);
+
+  return 0;
 }
diff --git a/libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_2.pass.cpp b/libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_9.pass.cpp
copy from libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_2.pass.cpp
copy to libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_9.pass.cpp
--- a/libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_2.pass.cpp
+++ b/libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_9.pass.cpp
@@ -24,24 +24,13 @@
 #include "test_macros.h"
 #include "min_allocator.h"
 
-int main(int, char**)
-{
-    {
-    typedef std::string S;
-    S s1;
-    S s2;
-    bool b = s1.begin() < s2.begin();
-    (void) b;
-    assert(false);
-    }
-#if TEST_STD_VER >= 11
-    {
-    typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
-    S s1;
-    S s2;
-    bool b = s1.begin() < s2.begin();
-    (void) b;
-    assert(false);
-    }
-#endif
+int main(int, char**) {
+  typedef std::basic_string<char, std::char_traits<char>, min_allocator<char> > S;
+  S s1;
+  S s2;
+  bool b = s1.begin() < s2.begin();
+  (void)b;
+  assert(false);
+
+  return 0;
 }