2010-09-03 François Dumont <francois.cppdevs@free.fr>

        * testsuite/lib/libstdc++.exp ([check_v3_target_debug_mode]): Fix so
        that it really detects when debug mode is activated.
        * testsuite/util/debug/construct_neg.h, insert_neg.h, assign_neg.h:
        Remove, content moved...
        * testsuite/util/debug/checks.h: ... here. Modify checks to take the
	type of the container to test rather than an intermediate container
        type traits helper.
	* testsuite/23_containers/unordered_map/debug/insert1_neg.cc: Update to
	use dg-require-debug-mode when necessary and use new check functions.
	* testsuite/23_containers/unordered_map/debug/construct1_neg.cc: 
	Likewise.
	* testsuite/23_containers/unordered_map/debug/construct2_neg.cc:
	Likewise.
	* testsuite/23_containers/unordered_map/debug/insert2_neg.cc: Likewise.
	* testsuite/23_containers/unordered_map/debug/construct3_neg.cc:
	Likewise.
	* testsuite/23_containers/unordered_map/debug/insert3_neg.cc: Likewise.
	* testsuite/23_containers/unordered_map/debug/construct4_neg.cc:
	Likewise.
	* testsuite/23_containers/unordered_map/debug/insert4_neg.cc: Likewise.
	* testsuite/23_containers/multimap/debug/insert1_neg.cc: Likewise.
	* testsuite/23_containers/multimap/debug/construct1_neg.cc: Likewise.
	* testsuite/23_containers/multimap/debug/construct2_neg.cc: Likewise.
	* testsuite/23_containers/multimap/debug/insert2_neg.cc: Likewise.
	* testsuite/23_containers/multimap/debug/construct3_neg.cc: Likewise.
	* testsuite/23_containers/multimap/debug/insert3_neg.cc: Likewise.
	* testsuite/23_containers/multimap/debug/construct4_neg.cc: Likewise.
	* testsuite/23_containers/multimap/debug/insert4_neg.cc: Likewise.
	* testsuite/23_containers/set/debug/insert1_neg.cc: Likewise.
	* testsuite/23_containers/set/debug/construct1_neg.cc: Likewise.
	* testsuite/23_containers/set/debug/construct2_neg.cc: Likewise.
	* testsuite/23_containers/set/debug/insert2_neg.cc: Likewise.
	* testsuite/23_containers/set/debug/construct3_neg.cc: Likewise.
	* testsuite/23_containers/set/debug/insert3_neg.cc: Likewise.
	* testsuite/23_containers/set/debug/construct4_neg.cc: Likewise.
	* testsuite/23_containers/set/debug/insert4_neg.cc: Likewise.
	* testsuite/23_containers/unordered_multimap/debug/insert1_neg.cc: 
	Likewise.
	* testsuite/23_containers/unordered_multimap/debug/construct1_neg.cc: 
	Likewise.
	* testsuite/23_containers/unordered_multimap/debug/construct2_neg.cc: 
	Likewise.
	* testsuite/23_containers/unordered_multimap/debug/insert2_neg.cc: 
	Likewise.
	* testsuite/23_containers/unordered_multimap/debug/construct3_neg.cc: 
	Likewise.
	* testsuite/23_containers/unordered_multimap/debug/insert3_neg.cc: 
	Likewise.
	* testsuite/23_containers/unordered_multimap/debug/construct4_neg.cc: 
	Likewise.
	* testsuite/23_containers/unordered_multimap/debug/insert4_neg.cc:
	Likewise.
	* testsuite/23_containers/vector/debug/assign1_neg.cc: Likewise.
	* testsuite/23_containers/vector/debug/construct1_neg.cc: Likewise.
	* testsuite/23_containers/vector/debug/construct2_neg.cc: Likewise.
	* testsuite/23_containers/vector/debug/assign2_neg.cc: Likewise.
	* testsuite/23_containers/vector/debug/construct3_neg.cc: Likewise.
	* testsuite/23_containers/vector/debug/assign3_neg.cc: Likewise.
	* testsuite/23_containers/vector/debug/construct4_neg.cc: Likewise.
	* testsuite/23_containers/vector/debug/assign4_neg.cc: Likewise.
	* testsuite/23_containers/vector/debug/insert1_neg.cc: Likewise.
	* testsuite/23_containers/vector/debug/insert2_neg.cc: Likewise.
	* testsuite/23_containers/vector/debug/insert3_neg.cc: Likewise.
	* testsuite/23_containers/vector/debug/insert4_neg.cc: Likewise.
	* testsuite/23_containers/unordered_set/debug/insert1_neg.cc: Likewise.
	* testsuite/23_containers/unordered_set/debug/construct1_neg.cc: 
	Likewise.
	* testsuite/23_containers/unordered_set/debug/construct2_neg.cc: 
	Likewise.
	* testsuite/23_containers/unordered_set/debug/insert2_neg.cc: Likewise.
	* testsuite/23_containers/unordered_set/debug/construct3_neg.cc: 
	Likewise.
	* testsuite/23_containers/unordered_set/debug/insert3_neg.cc: Likewise.
	* testsuite/23_containers/unordered_set/debug/construct4_neg.cc:
	Likewise.
	* testsuite/23_containers/unordered_set/debug/insert4_neg.cc: Likewise.
	* testsuite/23_containers/deque/debug/assign1_neg.cc: Likewise.
	* testsuite/23_containers/deque/debug/construct1_neg.cc: Likewise.
	* testsuite/23_containers/deque/debug/construct2_neg.cc: Likewise.
	* testsuite/23_containers/deque/debug/assign2_neg.cc: Likewise.
	* testsuite/23_containers/deque/debug/construct3_neg.cc: Likewise.
	* testsuite/23_containers/deque/debug/assign3_neg.cc: Likewise.
	* testsuite/23_containers/deque/debug/construct4_neg.cc: Likewise.
	* testsuite/23_containers/deque/debug/assign4_neg.cc: Likewise.
	* testsuite/23_containers/deque/debug/insert1_neg.cc: Likewise.
	* testsuite/23_containers/deque/debug/insert2_neg.cc: Likewise.
	* testsuite/23_containers/deque/debug/insert3_neg.cc: Likewise.
	* testsuite/23_containers/deque/debug/insert4_neg.cc: Likewise.
	* testsuite/23_containers/multiset/debug/insert1_neg.cc: Likewise.
	* testsuite/23_containers/multiset/debug/construct1_neg.cc: Likewise.
	* testsuite/23_containers/multiset/debug/construct2_neg.cc: Likewise.
	* testsuite/23_containers/multiset/debug/insert2_neg.cc: Likewise.
	* testsuite/23_containers/multiset/debug/construct3_neg.cc: Likewise.
	* testsuite/23_containers/multiset/debug/insert3_neg.cc: Likewise.
	* testsuite/23_containers/multiset/debug/construct4_neg.cc: Likewise.
	* testsuite/23_containers/multiset/debug/insert4_neg.cc: Likewise.
	* testsuite/23_containers/list/debug/assign1_neg.cc: Likewise.
	* testsuite/23_containers/list/debug/construct1_neg.cc: Likewise.
	* testsuite/23_containers/list/debug/construct2_neg.cc: Likewise.
	* testsuite/23_containers/list/debug/assign2_neg.cc: Likewise.
	* testsuite/23_containers/list/debug/construct3_neg.cc: Likewise.
	* testsuite/23_containers/list/debug/assign3_neg.cc: Likewise.
	* testsuite/23_containers/list/debug/construct4_neg.cc: Likewise.
	* testsuite/23_containers/list/debug/assign4_neg.cc: Likewise.
	* testsuite/23_containers/list/debug/insert1_neg.cc: Likewise.
	* testsuite/23_containers/list/debug/insert2_neg.cc: Likewise.
	* testsuite/23_containers/list/debug/insert3_neg.cc: Likewise.
	* testsuite/23_containers/list/debug/insert4_neg.cc: Likewise.
	* testsuite/23_containers/unordered_multiset/debug/insert1_neg.cc: 
	Likewise.
	* testsuite/23_containers/unordered_multiset/debug/construct1_neg.cc: 
	Likewise.
	* testsuite/23_containers/unordered_multiset/debug/construct2_neg.cc: 
	Likewise.
	* testsuite/23_containers/unordered_multiset/debug/insert2_neg.cc: 
	Likewise.
	* testsuite/23_containers/unordered_multiset/debug/construct3_neg.cc: 
	Likewise.
	* testsuite/23_containers/unordered_multiset/debug/insert3_neg.cc: 
	Likewise.
	* testsuite/23_containers/unordered_multiset/debug/construct4_neg.cc: 
	Likewise.
	* testsuite/23_containers/unordered_multiset/debug/insert4_neg.cc: 
	Likewise.
	* testsuite/23_containers/map/debug/insert1_neg.cc: Likewise.
	* testsuite/23_containers/map/debug/construct1_neg.cc: Likewise.
	* testsuite/23_containers/map/debug/construct2_neg.cc: Likewise.
	* testsuite/23_containers/map/debug/insert2_neg.cc: Likewise.
	* testsuite/23_containers/map/debug/construct3_neg.cc: Likewise.
	* testsuite/23_containers/map/debug/insert3_neg.cc: Likewise.
	* testsuite/23_containers/map/debug/construct4_neg.cc: Likewise.
	* testsuite/23_containers/map/debug/insert4_neg.cc: Likewise.

	* testsuite/23_containers/unordered_map/debug/cont_traits.h: Remove.
	* testsuite/23_containers/unordered_map/debug/debug_cont_traits.h:
	Likewise.
	* testsuite/23_containers/multimap/debug/cont_traits.h: Likewise.
	* testsuite/23_containers/multimap/debug/debug_cont_traits.h: Likewise.
	* testsuite/23_containers/set/debug/cont_traits.h: Likewise.
	* testsuite/23_containers/set/debug/debug_cont_traits.h: Likewise.
	* testsuite/23_containers/unordered_multimap/debug/cont_traits.h:
	Likewise.
	* testsuite/23_containers/unordered_multimap/debug/
	debug_cont_traits.h: Likewise.
	* testsuite/23_containers/vector/debug/cont_traits.h: Likewise.
	* testsuite/23_containers/vector/debug/debug_cont_traits.h: Likewise.
	* testsuite/23_containers/unordered_set/debug/cont_traits.h: Likewise.
	* testsuite/23_containers/unordered_set/debug/debug_cont_traits.h:
	Likewise.
	* testsuite/23_containers/deque/debug/cont_traits.h: Likewise.
	* testsuite/23_containers/deque/debug/debug_cont_traits.h: Likewise.
	* testsuite/23_containers/multiset/debug/cont_traits.h: Likewise.
	* testsuite/23_containers/multiset/debug/debug_cont_traits.h: Likewise.
	* testsuite/23_containers/list/debug/cont_traits.h: Likewise.
	* testsuite/23_containers/list/debug/debug_cont_traits.h: Likewise.
	* testsuite/23_containers/unordered_multiset/debug/cont_traits.h: 
	Likewise.
	* testsuite/23_containers/unordered_multiset/debug/
	debug_cont_traits.h: Likewise.
	* testsuite/23_containers/map/debug/cont_traits.h: Likewise.
	* testsuite/23_containers/map/debug/debug_cont_traits.h: Likewise.

	* testsuite/21_strings/basic_string/element_access/char: Tidy.
	* testsuite/21_strings/basic_string/element_access/wchar_t: Likewise.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@163837 138bc75d-0d04-0410-961f-82ee72b054a4

130 files changed, 927 insertions, 1475 deletions

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 79cfc049a2a..45a8f019ebc 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,170 @@
+2010-09-03  François Dumont <francois.cppdevs@free.fr>
+
+        * testsuite/lib/libstdc++.exp ([check_v3_target_debug_mode]): Fix so
+        that it really detects when debug mode is activated.
+        * testsuite/util/debug/construct_neg.h, insert_neg.h, assign_neg.h:
+        Remove, content moved...
+        * testsuite/util/debug/checks.h: ... here. Modify checks to take the
+	type of the container to test rather than an intermediate container
+        type traits helper.
+	* testsuite/23_containers/unordered_map/debug/insert1_neg.cc: Update to
+	use dg-require-debug-mode when necessary and use new check functions.
+	* testsuite/23_containers/unordered_map/debug/construct1_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_map/debug/construct2_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_map/debug/insert2_neg.cc: Likewise.
+	* testsuite/23_containers/unordered_map/debug/construct3_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_map/debug/insert3_neg.cc: Likewise.
+	* testsuite/23_containers/unordered_map/debug/construct4_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_map/debug/insert4_neg.cc: Likewise.
+	* testsuite/23_containers/multimap/debug/insert1_neg.cc: Likewise.
+	* testsuite/23_containers/multimap/debug/construct1_neg.cc: Likewise.
+	* testsuite/23_containers/multimap/debug/construct2_neg.cc: Likewise.
+	* testsuite/23_containers/multimap/debug/insert2_neg.cc: Likewise.
+	* testsuite/23_containers/multimap/debug/construct3_neg.cc: Likewise.
+	* testsuite/23_containers/multimap/debug/insert3_neg.cc: Likewise.
+	* testsuite/23_containers/multimap/debug/construct4_neg.cc: Likewise.
+	* testsuite/23_containers/multimap/debug/insert4_neg.cc: Likewise.
+	* testsuite/23_containers/set/debug/insert1_neg.cc: Likewise.
+	* testsuite/23_containers/set/debug/construct1_neg.cc: Likewise.
+	* testsuite/23_containers/set/debug/construct2_neg.cc: Likewise.
+	* testsuite/23_containers/set/debug/insert2_neg.cc: Likewise.
+	* testsuite/23_containers/set/debug/construct3_neg.cc: Likewise.
+	* testsuite/23_containers/set/debug/insert3_neg.cc: Likewise.
+	* testsuite/23_containers/set/debug/construct4_neg.cc: Likewise.
+	* testsuite/23_containers/set/debug/insert4_neg.cc: Likewise.
+	* testsuite/23_containers/unordered_multimap/debug/insert1_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_multimap/debug/construct1_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_multimap/debug/construct2_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_multimap/debug/insert2_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_multimap/debug/construct3_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_multimap/debug/insert3_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_multimap/debug/construct4_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_multimap/debug/insert4_neg.cc:
+	Likewise.
+	* testsuite/23_containers/vector/debug/assign1_neg.cc: Likewise.
+	* testsuite/23_containers/vector/debug/construct1_neg.cc: Likewise.
+	* testsuite/23_containers/vector/debug/construct2_neg.cc: Likewise.
+	* testsuite/23_containers/vector/debug/assign2_neg.cc: Likewise.
+	* testsuite/23_containers/vector/debug/construct3_neg.cc: Likewise.
+	* testsuite/23_containers/vector/debug/assign3_neg.cc: Likewise.
+	* testsuite/23_containers/vector/debug/construct4_neg.cc: Likewise.
+	* testsuite/23_containers/vector/debug/assign4_neg.cc: Likewise.
+	* testsuite/23_containers/vector/debug/insert1_neg.cc: Likewise.
+	* testsuite/23_containers/vector/debug/insert2_neg.cc: Likewise.
+	* testsuite/23_containers/vector/debug/insert3_neg.cc: Likewise.
+	* testsuite/23_containers/vector/debug/insert4_neg.cc: Likewise.
+	* testsuite/23_containers/unordered_set/debug/insert1_neg.cc: Likewise.
+	* testsuite/23_containers/unordered_set/debug/construct1_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_set/debug/construct2_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_set/debug/insert2_neg.cc: Likewise.
+	* testsuite/23_containers/unordered_set/debug/construct3_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_set/debug/insert3_neg.cc: Likewise.
+	* testsuite/23_containers/unordered_set/debug/construct4_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_set/debug/insert4_neg.cc: Likewise.
+	* testsuite/23_containers/deque/debug/assign1_neg.cc: Likewise.
+	* testsuite/23_containers/deque/debug/construct1_neg.cc: Likewise.
+	* testsuite/23_containers/deque/debug/construct2_neg.cc: Likewise.
+	* testsuite/23_containers/deque/debug/assign2_neg.cc: Likewise.
+	* testsuite/23_containers/deque/debug/construct3_neg.cc: Likewise.
+	* testsuite/23_containers/deque/debug/assign3_neg.cc: Likewise.
+	* testsuite/23_containers/deque/debug/construct4_neg.cc: Likewise.
+	* testsuite/23_containers/deque/debug/assign4_neg.cc: Likewise.
+	* testsuite/23_containers/deque/debug/insert1_neg.cc: Likewise.
+	* testsuite/23_containers/deque/debug/insert2_neg.cc: Likewise.
+	* testsuite/23_containers/deque/debug/insert3_neg.cc: Likewise.
+	* testsuite/23_containers/deque/debug/insert4_neg.cc: Likewise.
+	* testsuite/23_containers/multiset/debug/insert1_neg.cc: Likewise.
+	* testsuite/23_containers/multiset/debug/construct1_neg.cc: Likewise.
+	* testsuite/23_containers/multiset/debug/construct2_neg.cc: Likewise.
+	* testsuite/23_containers/multiset/debug/insert2_neg.cc: Likewise.
+	* testsuite/23_containers/multiset/debug/construct3_neg.cc: Likewise.
+	* testsuite/23_containers/multiset/debug/insert3_neg.cc: Likewise.
+	* testsuite/23_containers/multiset/debug/construct4_neg.cc: Likewise.
+	* testsuite/23_containers/multiset/debug/insert4_neg.cc: Likewise.
+	* testsuite/23_containers/list/debug/assign1_neg.cc: Likewise.
+	* testsuite/23_containers/list/debug/construct1_neg.cc: Likewise.
+	* testsuite/23_containers/list/debug/construct2_neg.cc: Likewise.
+	* testsuite/23_containers/list/debug/assign2_neg.cc: Likewise.
+	* testsuite/23_containers/list/debug/construct3_neg.cc: Likewise.
+	* testsuite/23_containers/list/debug/assign3_neg.cc: Likewise.
+	* testsuite/23_containers/list/debug/construct4_neg.cc: Likewise.
+	* testsuite/23_containers/list/debug/assign4_neg.cc: Likewise.
+	* testsuite/23_containers/list/debug/insert1_neg.cc: Likewise.
+	* testsuite/23_containers/list/debug/insert2_neg.cc: Likewise.
+	* testsuite/23_containers/list/debug/insert3_neg.cc: Likewise.
+	* testsuite/23_containers/list/debug/insert4_neg.cc: Likewise.
+	* testsuite/23_containers/unordered_multiset/debug/insert1_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_multiset/debug/construct1_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_multiset/debug/construct2_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_multiset/debug/insert2_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_multiset/debug/construct3_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_multiset/debug/insert3_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_multiset/debug/construct4_neg.cc:
+	Likewise.
+	* testsuite/23_containers/unordered_multiset/debug/insert4_neg.cc:
+	Likewise.
+	* testsuite/23_containers/map/debug/insert1_neg.cc: Likewise.
+	* testsuite/23_containers/map/debug/construct1_neg.cc: Likewise.
+	* testsuite/23_containers/map/debug/construct2_neg.cc: Likewise.
+	* testsuite/23_containers/map/debug/insert2_neg.cc: Likewise.
+	* testsuite/23_containers/map/debug/construct3_neg.cc: Likewise.
+	* testsuite/23_containers/map/debug/insert3_neg.cc: Likewise.
+	* testsuite/23_containers/map/debug/construct4_neg.cc: Likewise.
+	* testsuite/23_containers/map/debug/insert4_neg.cc: Likewise.
+
+	* testsuite/23_containers/unordered_map/debug/cont_traits.h: Remove.
+	* testsuite/23_containers/unordered_map/debug/debug_cont_traits.h:
+	Likewise.
+	* testsuite/23_containers/multimap/debug/cont_traits.h: Likewise.
+	* testsuite/23_containers/multimap/debug/debug_cont_traits.h: Likewise.
+	* testsuite/23_containers/set/debug/cont_traits.h: Likewise.
+	* testsuite/23_containers/set/debug/debug_cont_traits.h: Likewise.
+	* testsuite/23_containers/unordered_multimap/debug/cont_traits.h:
+	Likewise.
+	* testsuite/23_containers/unordered_multimap/debug/
+	debug_cont_traits.h: Likewise.
+	* testsuite/23_containers/vector/debug/cont_traits.h: Likewise.
+	* testsuite/23_containers/vector/debug/debug_cont_traits.h: Likewise.
+	* testsuite/23_containers/unordered_set/debug/cont_traits.h: Likewise.
+	* testsuite/23_containers/unordered_set/debug/debug_cont_traits.h:
+	Likewise.
+	* testsuite/23_containers/deque/debug/cont_traits.h: Likewise.
+	* testsuite/23_containers/deque/debug/debug_cont_traits.h: Likewise.
+	* testsuite/23_containers/multiset/debug/cont_traits.h: Likewise.
+	* testsuite/23_containers/multiset/debug/debug_cont_traits.h: Likewise.
+	* testsuite/23_containers/list/debug/cont_traits.h: Likewise.
+	* testsuite/23_containers/list/debug/debug_cont_traits.h: Likewise.
+	* testsuite/23_containers/unordered_multiset/debug/cont_traits.h:
+	Likewise.
+	* testsuite/23_containers/unordered_multiset/debug/
+	debug_cont_traits.h: Likewise.
+	* testsuite/23_containers/map/debug/cont_traits.h: Likewise.
+	* testsuite/23_containers/map/debug/debug_cont_traits.h: Likewise.
+
+	* testsuite/21_strings/basic_string/element_access/char: Tidy.
+	* testsuite/21_strings/basic_string/element_access/wchar_t: Likewise.
+
 2010-09-02  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	PR libstdc++/40974
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/element_access/char/21674.cc b/libstdc++-v3/testsuite/21_strings/basic_string/element_access/char/21674.cc
index 03d54339fdd..c8a8b93472a 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/element_access/char/21674.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/element_access/char/21674.cc
@@ -1,6 +1,6 @@
 // { dg-do run { xfail *-*-* } }
+// { dg-options "-O0" }
 // { dg-require-debug-mode "" }
-// { dg-options "-O0 -D_GLIBCXX_DEBUG" }
 
 // Copyright (C) 2005, 2009, 2010 Free Software Foundation, Inc.
 //
@@ -19,7 +19,6 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-
 #include <string>
 
 // libstdc++/21674
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/element_access/wchar_t/21674.cc b/libstdc++-v3/testsuite/21_strings/basic_string/element_access/wchar_t/21674.cc
index fe4a2495118..95046463dae 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/element_access/wchar_t/21674.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/element_access/wchar_t/21674.cc
@@ -1,6 +1,6 @@
 // { dg-do run { xfail *-*-* } }
+// { dg-options "-O0" }
 // { dg-require-debug-mode "" }
-// { dg-options "-O0 -D_GLIBCXX_DEBUG" }
 
 // Copyright (C) 2005, 2009, 2010 Free Software Foundation, Inc.
 //
@@ -19,7 +19,6 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-
 #include <string>
 
 // libstdc++/21674
diff --git a/libstdc++-v3/testsuite/23_containers/deque/debug/assign1_neg.cc b/libstdc++-v3/testsuite/23_containers/deque/debug/assign1_neg.cc
index b28e987108f..9a4d7d4394e 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/debug/assign1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/debug/assign1_neg.cc
@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/assign_neg.h>
-#include "cont_traits.h"
+#include <deque>
+#include <debug/checks.h>
 
 void test01()
 {
-  check1<cont_traits>();
+  __gnu_test::check_assign1<std::deque<int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/deque/debug/assign2_neg.cc b/libstdc++-v3/testsuite/23_containers/deque/debug/assign2_neg.cc
index cfff8ac9454..32eda8794dc 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/debug/assign2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/debug/assign2_neg.cc
@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/assign_neg.h>
-#include "cont_traits.h"
+#include <deque>
+#include <debug/checks.h>
 
 void test01()
 {
-  check2<cont_traits>();
+  __gnu_test::check_assign2<std::deque<int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/deque/debug/assign3_neg.cc b/libstdc++-v3/testsuite/23_containers/deque/debug/assign3_neg.cc
index cfd0bb02332..3d2b15e9431 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/debug/assign3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/debug/assign3_neg.cc
@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/assign_neg.h>
-#include "cont_traits.h"
+#include <deque>
+#include <debug/checks.h>
 
 void test01()
 {
-  check3<cont_traits>();
+  __gnu_test::check_assign3<std::deque<int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/deque/debug/assign4_neg.cc b/libstdc++-v3/testsuite/23_containers/deque/debug/assign4_neg.cc
index 115580defc9..7b6204158ad 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/debug/assign4_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/debug/assign4_neg.cc
@@ -17,12 +17,12 @@
 //
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/assign_neg.h>
-#include "debug_cont_traits.h"
+#include <debug/deque>
+#include <debug/checks.h>
 
 void test01()
 {
-  debug_check1<cont_traits>();
+  __gnu_test::check_assign1<__gnu_debug::deque<int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/deque/debug/construct1_neg.cc b/libstdc++-v3/testsuite/23_containers/deque/debug/construct1_neg.cc
index 791c1a296a1..6268951d732 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/debug/construct1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/debug/construct1_neg.cc
@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "cont_traits.h"
+#include <deque>
+#include <debug/checks.h>
 
 void test01()
 {
-  check1<cont_traits>();
+  __gnu_test::check_construct1<std::deque<int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/deque/debug/construct2_neg.cc b/libstdc++-v3/testsuite/23_containers/deque/debug/construct2_neg.cc
index 6cac9f03147..3b8d77547fa 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/debug/construct2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/debug/construct2_neg.cc
@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "cont_traits.h"
+#include <deque>
+#include <debug/checks.h>
 
 void test01()
 {
-  check2<cont_traits>();
+  __gnu_test::check_construct2<std::deque<int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/deque/debug/construct3_neg.cc b/libstdc++-v3/testsuite/23_containers/deque/debug/construct3_neg.cc
index 752c95c671f..1187cf8b1e1 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/debug/construct3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/debug/construct3_neg.cc
@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "cont_traits.h"
+#include <deque>
+#include <debug/checks.h>
 
 void test01()
 {
-  check3<cont_traits>();
+  __gnu_test::check_construct3<std::deque<int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/deque/debug/construct4_neg.cc b/libstdc++-v3/testsuite/23_containers/deque/debug/construct4_neg.cc
index 9ee467e0f0f..7d7906d0511 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/debug/construct4_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/debug/construct4_neg.cc
@@ -17,12 +17,12 @@
 //
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "debug_cont_traits.h"
+#include <debug/deque>
+#include <debug/checks.h>
 
 void test01()
 {
-  debug_check1<cont_traits>();
+  __gnu_test::check_construct1<__gnu_debug::deque<int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/deque/debug/cont_traits.h b/libstdc++-v3/testsuite/23_containers/deque/debug/cont_traits.h
deleted file mode 100644
index 13ab4f9fdf6..00000000000
--- a/libstdc++-v3/testsuite/23_containers/deque/debug/cont_traits.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (C) 2010 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-//
-
-#include <deque>
-
-template<typename Type>
-  struct cont_traits
-  {
-    typedef std::deque<Type> cont_type;
-    typedef Type val_type;
-
-    static val_type
-    make_val(Type val)
-    { return val; }
-
-    template<typename Iter>
-      static void
-      insert(cont_type& cont, Iter first, Iter last)
-      { cont.insert(cont.begin(), first, last); }
-  };
diff --git a/libstdc++-v3/testsuite/23_containers/deque/debug/debug_cont_traits.h b/libstdc++-v3/testsuite/23_containers/deque/debug/debug_cont_traits.h
deleted file mode 100644
index b4dda9250a9..00000000000
--- a/libstdc++-v3/testsuite/23_containers/deque/debug/debug_cont_traits.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (C) 2010 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-//
-
-#include <debug/deque>
-
-template<typename Type>
-  struct cont_traits
-  {
-    typedef __gnu_debug::deque<Type> cont_type;
-    typedef Type val_type;
-
-    static val_type
-    make_val(Type val)
-    { return val; }
-
-    template<typename Iter>
-      static void
-      insert(cont_type& cont, Iter first, Iter last)
-      { cont.insert(cont.begin(), first, last); }
-  };
diff --git a/libstdc++-v3/testsuite/23_containers/deque/debug/insert1_neg.cc b/libstdc++-v3/testsuite/23_containers/deque/debug/insert1_neg.cc
index d04b44148ee..38b4f554a40 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/debug/insert1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/debug/insert1_neg.cc
@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/insert_neg.h>
-#include "cont_traits.h"
+#include <deque>
+#include <debug/checks.h>
 
 void test01()
 {
-  check1<cont_traits>();
+  __gnu_test::check_insert1<std::deque<int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/deque/debug/insert2_neg.cc b/libstdc++-v3/testsuite/23_containers/deque/debug/insert2_neg.cc
index 106c64adb29..5aa7efae6dd 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/debug/insert2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/debug/insert2_neg.cc
@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/insert_neg.h>
-#include "cont_traits.h"
+#include <deque>
+#include <debug/checks.h>
 
 void test01()
 {
-  check2<cont_traits>();
+  __gnu_test::check_insert2<std::deque<int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/deque/debug/insert3_neg.cc b/libstdc++-v3/testsuite/23_containers/deque/debug/insert3_neg.cc
index 9d3d7b1ad85..bd854ad87dd 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/debug/insert3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/debug/insert3_neg.cc
@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/insert_neg.h>
-#include "cont_traits.h"
+#include <deque>
+#include <debug/checks.h>
 
 void test01()
 {
-  check3<cont_traits>();
+  __gnu_test::check_insert3<std::deque<int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/deque/debug/insert4_neg.cc b/libstdc++-v3/testsuite/23_containers/deque/debug/insert4_neg.cc
index fc49ae65558..ff88760ad44 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/debug/insert4_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/debug/insert4_neg.cc
@@ -17,12 +17,12 @@
 //
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/insert_neg.h>
-#include "debug_cont_traits.h"
+#include <debug/deque>
+#include <debug/checks.h>
 
 void test01()
 {
-  debug_check1<cont_traits>();
+  __gnu_test::check_insert1<__gnu_debug::deque<int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/list/debug/assign1_neg.cc b/libstdc++-v3/testsuite/23_containers/list/debug/assign1_neg.cc
index b28e987108f..e7b0e5cfe14 100644
--- a/libstdc++-v3/testsuite/23_containers/list/debug/assign1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/debug/assign1_neg.cc
@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/assign_neg.h>
-#include "cont_traits.h"
+#include <list>
+#include <debug/checks.h>
 
 void test01()
 {
-  check1<cont_traits>();
+  __gnu_test::check_assign1<std::list<int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/list/debug/assign2_neg.cc b/libstdc++-v3/testsuite/23_containers/list/debug/assign2_neg.cc
index cfff8ac9454..1bd6c2f9076 100644
--- a/libstdc++-v3/testsuite/23_containers/list/debug/assign2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/debug/assign2_neg.cc
@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/assign_neg.h>
-#include "cont_traits.h"
+#include <list>
+#include <debug/checks.h>
 
 void test01()
 {
-  check2<cont_traits>();
+  __gnu_test::check_assign2<std::list<int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/list/debug/assign3_neg.cc b/libstdc++-v3/testsuite/23_containers/list/debug/assign3_neg.cc
index cfd0bb02332..7a40d318911 100644
--- a/libstdc++-v3/testsuite/23_containers/list/debug/assign3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/debug/assign3_neg.cc
@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/assign_neg.h>
-#include "cont_traits.h"
+#include <list>
+#include <debug/checks.h>
 
 void test01()
 {
-  check3<cont_traits>();
+  __gnu_test::check_assign3<std::list<int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/list/debug/assign4_neg.cc b/libstdc++-v3/testsuite/23_containers/list/debug/assign4_neg.cc
index 115580defc9..bde7b923ee7 100644
--- a/libstdc++-v3/testsuite/23_containers/list/debug/assign4_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/debug/assign4_neg.cc
@@ -17,12 +17,12 @@
 //
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/assign_neg.h>
-#include "debug_cont_traits.h"
+#include <debug/list>
+#include <debug/checks.h>
 
 void test01()
 {
-  debug_check1<cont_traits>();
+  __gnu_test::check_assign1<__gnu_debug::list<int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/list/debug/construct1_neg.cc b/libstdc++-v3/testsuite/23_containers/list/debug/construct1_neg.cc
index 791c1a296a1..cbd045571a1 100644
--- a/libstdc++-v3/testsuite/23_containers/list/debug/construct1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/debug/construct1_neg.cc
@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "cont_traits.h"
+#include <list>
+#include <debug/checks.h>
 
 void test01()
 {
-  check1<cont_traits>();
+  __gnu_test::check_construct1<std::list<int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/list/debug/construct2_neg.cc b/libstdc++-v3/testsuite/23_containers/list/debug/construct2_neg.cc
index 6cac9f03147..40fdf43b8b2 100644
--- a/libstdc++-v3/testsuite/23_containers/list/debug/construct2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/debug/construct2_neg.cc
@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "cont_traits.h"
+#include <list>
+#include <debug/checks.h>
 
 void test01()
 {
-  check2<cont_traits>();
+  __gnu_test::check_construct2<std::list<int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/list/debug/construct3_neg.cc b/libstdc++-v3/testsuite/23_containers/list/debug/construct3_neg.cc
index 752c95c671f..5000f5a0793 100644
--- a/libstdc++-v3/testsuite/23_containers/list/debug/construct3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/debug/construct3_neg.cc
@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "cont_traits.h"
+#include <list>
+#include <debug/checks.h>
 
 void test01()
 {
-  check3<cont_traits>();
+  __gnu_test::check_construct3<std::list<int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/list/debug/construct4_neg.cc b/libstdc++-v3/testsuite/23_containers/list/debug/construct4_neg.cc
index 9ee467e0f0f..29843ea43b5 100644
--- a/libstdc++-v3/testsuite/23_containers/list/debug/construct4_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/debug/construct4_neg.cc
@@ -17,12 +17,12 @@
 //
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "debug_cont_traits.h"
+#include <debug/list>
+#include <debug/checks.h>
 
 void test01()
 {
-  debug_check1<cont_traits>();
+  __gnu_test::check_construct1<__gnu_debug::list<int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/list/debug/cont_traits.h b/libstdc++-v3/testsuite/23_containers/list/debug/cont_traits.h
deleted file mode 100644
index 662a97e24ad..00000000000
--- a/libstdc++-v3/testsuite/23_containers/list/debug/cont_traits.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (C) 2010 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-//
-
-#include <list>
-
-template<typename Type>
-  struct cont_traits
-  {
-    typedef std::list<Type> cont_type;
-    typedef Type val_type;
-
-    static val_type
-    make_val(Type val)
-    { return val; }
-
-    template<typename Iter>
-      static void
-      insert(cont_type& cont, Iter first, Iter last)
-      { cont.insert(cont.begin(), first, last); }
-  };
diff --git a/libstdc++-v3/testsuite/23_containers/list/debug/debug_cont_traits.h b/libstdc++-v3/testsuite/23_containers/list/debug/debug_cont_traits.h
deleted file mode 100644
index 4993735433a..00000000000
--- a/libstdc++-v3/testsuite/23_containers/list/debug/debug_cont_traits.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (C) 2010 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-//
-
-#include <debug/list>
-
-template<typename Type>
-  struct cont_traits
-  {
-    typedef __gnu_debug::list<Type> cont_type;
-    typedef Type val_type;
-
-    static val_type
-    make_val(Type val)
-    { return val; }
-
-    template<typename Iter>
-      static void
-      insert(cont_type& cont, Iter first, Iter last)
-      { cont.insert(cont.begin(), first, last); }
-  };
diff --git a/libstdc++-v3/testsuite/23_containers/list/debug/insert1_neg.cc b/libstdc++-v3/testsuite/23_containers/list/debug/insert1_neg.cc
index d04b44148ee..aa35b46cf85 100644
--- a/libstdc++-v3/testsuite/23_containers/list/debug/insert1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/debug/insert1_neg.cc
@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/insert_neg.h>
-#include "cont_traits.h"
+#include <list>
+#include <debug/checks.h>
 
 void test01()
 {
-  check1<cont_traits>();
+  __gnu_test::check_insert1<std::list<int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/list/debug/insert2_neg.cc b/libstdc++-v3/testsuite/23_containers/list/debug/insert2_neg.cc
index 106c64adb29..dc84fdd584f 100644
--- a/libstdc++-v3/testsuite/23_containers/list/debug/insert2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/debug/insert2_neg.cc
@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/insert_neg.h>
-#include "cont_traits.h"
+#include <list>
+#include <debug/checks.h>
 
 void test01()
 {
-  check2<cont_traits>();
+  __gnu_test::check_insert2<std::list<int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/list/debug/insert3_neg.cc b/libstdc++-v3/testsuite/23_containers/list/debug/insert3_neg.cc
index 9d3d7b1ad85..aa49108386e 100644
--- a/libstdc++-v3/testsuite/23_containers/list/debug/insert3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/debug/insert3_neg.cc
@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/insert_neg.h>
-#include "cont_traits.h"
+#include <list>
+#include <debug/checks.h>
 
 void test01()
 {
-  check3<cont_traits>();
+  __gnu_test::check_insert3<std::list<int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/list/debug/insert4_neg.cc b/libstdc++-v3/testsuite/23_containers/list/debug/insert4_neg.cc
index fc49ae65558..ade2806881f 100644
--- a/libstdc++-v3/testsuite/23_containers/list/debug/insert4_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/debug/insert4_neg.cc
@@ -17,12 +17,12 @@
 //
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/insert_neg.h>
-#include "debug_cont_traits.h"
+#include <debug/list>
+#include <debug/checks.h>
 
 void test01()
 {
-  debug_check1<cont_traits>();
+  __gnu_test::check_insert1<__gnu_debug::list<int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/map/debug/construct1_neg.cc b/libstdc++-v3/testsuite/23_containers/map/debug/construct1_neg.cc
index 791c1a296a1..72adcf42e38 100644
--- a/libstdc++-v3/testsuite/23_containers/map/debug/construct1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/debug/construct1_neg.cc
@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "cont_traits.h"
+#include <map>
+#include <debug/checks.h>
 
 void test01()
 {
-  check1<cont_traits>();
+  __gnu_test::check_construct1<std::map<int, int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/map/debug/construct2_neg.cc b/libstdc++-v3/testsuite/23_containers/map/debug/construct2_neg.cc
index 6cac9f03147..a9cb0e300c3 100644
--- a/libstdc++-v3/testsuite/23_containers/map/debug/construct2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/debug/construct2_neg.cc
@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "cont_traits.h"
+#include <map>
+#include <debug/checks.h>
 
 void test01()
 {
-  check2<cont_traits>();
+  __gnu_test::check_construct2<std::map<int, int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/map/debug/construct3_neg.cc b/libstdc++-v3/testsuite/23_containers/map/debug/construct3_neg.cc
index 752c95c671f..7f88827db77 100644
--- a/libstdc++-v3/testsuite/23_containers/map/debug/construct3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/debug/construct3_neg.cc
@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "cont_traits.h"
+#include <map>
+#include <debug/checks.h>
 
 void test01()
 {
-  check3<cont_traits>();
+  __gnu_test::check_construct3<std::map<int, int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/map/debug/construct4_neg.cc b/libstdc++-v3/testsuite/23_containers/map/debug/construct4_neg.cc
index 9ee467e0f0f..ce2eccc3839 100644
--- a/libstdc++-v3/testsuite/23_containers/map/debug/construct4_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/debug/construct4_neg.cc
@@ -17,12 +17,12 @@
 //
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "debug_cont_traits.h"
+#include <debug/map>
+#include <debug/checks.h>
 
 void test01()
 {
-  debug_check1<cont_traits>();
+  __gnu_test::check_construct1<__gnu_debug::map<int, int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/map/debug/cont_traits.h b/libstdc++-v3/testsuite/23_containers/map/debug/cont_traits.h
deleted file mode 100644
index 739ee7a719b..00000000000
--- a/libstdc++-v3/testsuite/23_containers/map/debug/cont_traits.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (C) 2010 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-//
-
-#include <map>
-
-template<typename Type>
-  struct cont_traits
-  {
-    typedef std::map<Type, Type> cont_type;
-    typedef std::pair<Type, Type> val_type;
-
-    static val_type
-    make_val(Type val)
-    { return val_type(val, val); }
-
-    template<typename Iter>
-      static void
-      insert(cont_type& cont, Iter first, Iter last)
-      { cont.insert(first, last); }
-  };
diff --git a/libstdc++-v3/testsuite/23_containers/map/debug/debug_cont_traits.h b/libstdc++-v3/testsuite/23_containers/map/debug/debug_cont_traits.h
deleted file mode 100644
index 34acf372c38..00000000000
--- a/libstdc++-v3/testsuite/23_containers/map/debug/debug_cont_traits.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (C) 2010 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-//
-
-#include <debug/map>
-
-template<typename Type>
-  struct cont_traits
-  {
-    typedef __gnu_debug::map<Type, Type> cont_type;
-    typedef std::pair<Type, Type> val_type;
-
-    static val_type
-    make_val(Type val)
-    { return val_type(val, val); }
-
-    template<typename Iter>
-      static void
-      insert(cont_type& cont, Iter first, Iter last)
-      { cont.insert(first, last); }
-  };
diff --git a/libstdc++-v3/testsuite/23_containers/map/debug/insert1_neg.cc b/libstdc++-v3/testsuite/23_containers/map/debug/insert1_neg.cc
index d04b44148ee..7b868a7aff6 100644
--- a/libstdc++-v3/testsuite/23_containers/map/debug/insert1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/debug/insert1_neg.cc
@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/insert_neg.h>
-#include "cont_traits.h"
+#include <map>
+#include <debug/checks.h>
 
 void test01()
 {
-  check1<cont_traits>();
+  __gnu_test::check_insert1<std::map<int, int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/map/debug/insert2_neg.cc b/libstdc++-v3/testsuite/23_containers/map/debug/insert2_neg.cc
index 106c64adb29..93c6c7ef51a 100644
--- a/libstdc++-v3/testsuite/23_containers/map/debug/insert2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/debug/insert2_neg.cc
@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/insert_neg.h>
-#include "cont_traits.h"
+#include <map>
+#include <debug/checks.h>
 
 void test01()
 {
-  check2<cont_traits>();
+  __gnu_test::check_insert2<std::map<int, int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/map/debug/insert3_neg.cc b/libstdc++-v3/testsuite/23_containers/map/debug/insert3_neg.cc
index 9d3d7b1ad85..2802a0de5bc 100644
--- a/libstdc++-v3/testsuite/23_containers/map/debug/insert3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/debug/insert3_neg.cc
@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/insert_neg.h>
-#include "cont_traits.h"
+#include <map>
+#include <debug/checks.h>
 
 void test01()
 {
-  check3<cont_traits>();
+  __gnu_test::check_insert3<std::map<int, int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/map/debug/insert4_neg.cc b/libstdc++-v3/testsuite/23_containers/map/debug/insert4_neg.cc
index fc49ae65558..a68d601089b 100644
--- a/libstdc++-v3/testsuite/23_containers/map/debug/insert4_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/debug/insert4_neg.cc
@@ -17,12 +17,12 @@
 //
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/insert_neg.h>
-#include "debug_cont_traits.h"
+#include <debug/map>
+#include <debug/checks.h>
 
 void test01()
 {
-  debug_check1<cont_traits>();
+  __gnu_test::check_insert1<__gnu_debug::map<int, int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/multimap/debug/construct1_neg.cc b/libstdc++-v3/testsuite/23_containers/multimap/debug/construct1_neg.cc
index 791c1a296a1..13f5763fb84 100644
--- a/libstdc++-v3/testsuite/23_containers/multimap/debug/construct1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/multimap/debug/construct1_neg.cc
@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "cont_traits.h"
+#include <map>
+#include <debug/checks.h>
 
 void test01()
 {
-  check1<cont_traits>();
+  __gnu_test::check_construct1<std::multimap<int, int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/multimap/debug/construct2_neg.cc b/libstdc++-v3/testsuite/23_containers/multimap/debug/construct2_neg.cc
index 6cac9f03147..9c389e199fb 100644
--- a/libstdc++-v3/testsuite/23_containers/multimap/debug/construct2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/multimap/debug/construct2_neg.cc
@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "cont_traits.h"
+#include <map>
+#include <debug/checks.h>
 
 void test01()
 {
-  check2<cont_traits>();
+  __gnu_test::check_construct2<std::multimap<int, int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/multimap/debug/construct3_neg.cc b/libstdc++-v3/testsuite/23_containers/multimap/debug/construct3_neg.cc
index 752c95c671f..b5a5288f530 100644
--- a/libstdc++-v3/testsuite/23_containers/multimap/debug/construct3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/multimap/debug/construct3_neg.cc
@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "cont_traits.h"
+#include <map>
+#include <debug/checks.h>
 
 void test01()
 {
-  check3<cont_traits>();
+  __gnu_test::check_construct3<std::multimap<int, int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/multimap/debug/construct4_neg.cc b/libstdc++-v3/testsuite/23_containers/multimap/debug/construct4_neg.cc
index 9ee467e0f0f..7c267f41831 100644
--- a/libstdc++-v3/testsuite/23_containers/multimap/debug/construct4_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/multimap/debug/construct4_neg.cc
@@ -17,12 +17,12 @@
 //
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "debug_cont_traits.h"
+#include <debug/map>
+#include <debug/checks.h>
 
 void test01()
 {
-  debug_check1<cont_traits>();
+  __gnu_test::check_construct1<__gnu_debug::multimap<int, int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/multimap/debug/cont_traits.h b/libstdc++-v3/testsuite/23_containers/multimap/debug/cont_traits.h
deleted file mode 100644
index 495e3e4861a..00000000000
--- a/libstdc++-v3/testsuite/23_containers/multimap/debug/cont_traits.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (C) 2010 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-//
-
-#include <map>
-
-template<typename Type>
-  struct cont_traits
-  {
-    typedef std::multimap<Type, Type> cont_type;
-    typedef std::pair<Type, Type> val_type;
-
-    static val_type
-    make_val(Type val)
-    { return val_type(val, val); }
-
-    template<typename Iter>
-      static void
-      insert(cont_type& cont, Iter first, Iter last)
-      { cont.insert(first, last); }
-  };
diff --git a/libstdc++-v3/testsuite/23_containers/multimap/debug/debug_cont_traits.h b/libstdc++-v3/testsuite/23_containers/multimap/debug/debug_cont_traits.h
deleted file mode 100644
index 98bd1f2f9e6..00000000000
--- a/libstdc++-v3/testsuite/23_containers/multimap/debug/debug_cont_traits.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (C) 2010 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-//
-
-#include <debug/map>
-
-template<typename Type>
-  struct cont_traits
-  {
-    typedef __gnu_debug::multimap<Type, Type> cont_type;
-    typedef std::pair<Type, Type> val_type;
-
-    static val_type
-    make_val(Type val)
-    { return val_type(val, val); }
-
-    template<typename Iter>
-      static void
-      insert(cont_type& cont, Iter first, Iter last)
-      { cont.insert(first, last); }
-  };
diff --git a/libstdc++-v3/testsuite/23_containers/multimap/debug/insert1_neg.cc b/libstdc++-v3/testsuite/23_containers/multimap/debug/insert1_neg.cc
index d04b44148ee..879af771c82 100644
--- a/libstdc++-v3/testsuite/23_containers/multimap/debug/insert1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/multimap/debug/insert1_neg.cc
@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/insert_neg.h>
-#include "cont_traits.h"
+#include <map>
+#include <debug/checks.h>
 
 void test01()
 {
-  check1<cont_traits>();
+  __gnu_test::check_insert1<std::multimap<int, int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/multimap/debug/insert2_neg.cc b/libstdc++-v3/testsuite/23_containers/multimap/debug/insert2_neg.cc
index 106c64adb29..883ff148a46 100644
--- a/libstdc++-v3/testsuite/23_containers/multimap/debug/insert2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/multimap/debug/insert2_neg.cc
@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/insert_neg.h>
-#include "cont_traits.h"
+#include <map>
+#include <debug/checks.h>
 
 void test01()
 {
-  check2<cont_traits>();
+  __gnu_test::check_insert2<std::multimap<int, int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/multimap/debug/insert3_neg.cc b/libstdc++-v3/testsuite/23_containers/multimap/debug/insert3_neg.cc
index 9d3d7b1ad85..f75efb58b56 100644
--- a/libstdc++-v3/testsuite/23_containers/multimap/debug/insert3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/multimap/debug/insert3_neg.cc
@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/insert_neg.h>
-#include "cont_traits.h"
+#include <map>
+#include <debug/checks.h>
 
 void test01()
 {
-  check3<cont_traits>();
+  __gnu_test::check_insert3<std::multimap<int, int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/multimap/debug/insert4_neg.cc b/libstdc++-v3/testsuite/23_containers/multimap/debug/insert4_neg.cc
index fc49ae65558..0e5102b74b7 100644
--- a/libstdc++-v3/testsuite/23_containers/multimap/debug/insert4_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/multimap/debug/insert4_neg.cc
@@ -17,12 +17,12 @@
 //
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/insert_neg.h>
-#include "debug_cont_traits.h"
+#include <debug/map>
+#include <debug/checks.h>
 
 void test01()
 {
-  debug_check1<cont_traits>();
+  __gnu_test::check_insert1<__gnu_debug::multimap<int, int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/debug/construct1_neg.cc b/libstdc++-v3/testsuite/23_containers/multiset/debug/construct1_neg.cc
index 791c1a296a1..04b0e33f9de 100644
--- a/libstdc++-v3/testsuite/23_containers/multiset/debug/construct1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/multiset/debug/construct1_neg.cc
@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "cont_traits.h"
+#include <set>
+#include <debug/checks.h>
 
 void test01()
 {
-  check1<cont_traits>();
+  __gnu_test::check_construct1<std::multiset<int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/debug/construct2_neg.cc b/libstdc++-v3/testsuite/23_containers/multiset/debug/construct2_neg.cc
index 6cac9f03147..d7dd965d30d 100644
--- a/libstdc++-v3/testsuite/23_containers/multiset/debug/construct2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/multiset/debug/construct2_neg.cc
@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "cont_traits.h"
+#include <set>
+#include <debug/checks.h>
 
 void test01()
 {
-  check2<cont_traits>();
+  __gnu_test::check_construct2<std::multiset<int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/debug/construct3_neg.cc b/libstdc++-v3/testsuite/23_containers/multiset/debug/construct3_neg.cc
index 752c95c671f..cc3e1471d11 100644
--- a/libstdc++-v3/testsuite/23_containers/multiset/debug/construct3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/multiset/debug/construct3_neg.cc
@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "cont_traits.h"
+#include <set>
+#include <debug/checks.h>
 
 void test01()
 {
-  check3<cont_traits>();
+  __gnu_test::check_construct3<std::multiset<int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/debug/construct4_neg.cc b/libstdc++-v3/testsuite/23_containers/multiset/debug/construct4_neg.cc
index 9ee467e0f0f..181f4f902fc 100644
--- a/libstdc++-v3/testsuite/23_containers/multiset/debug/construct4_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/multiset/debug/construct4_neg.cc
@@ -17,12 +17,12 @@
 //
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "debug_cont_traits.h"
+#include <debug/set>
+#include <debug/checks.h>
 
 void test01()
 {
-  debug_check1<cont_traits>();
+  __gnu_test::check_construct1<__gnu_debug::multiset<int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/debug/cont_traits.h b/libstdc++-v3/testsuite/23_containers/multiset/debug/cont_traits.h
deleted file mode 100644
index 4e06da23c3a..00000000000
--- a/libstdc++-v3/testsuite/23_containers/multiset/debug/cont_traits.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (C) 2010 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-//
-
-#include <set>
-
-template<typename Type>
-  struct cont_traits
-  {
-    typedef std::multiset<Type> cont_type;
-    typedef Type val_type;
-
-    static val_type
-    make_val(Type val)
-    { return val; }
-
-    template<typename Iter>
-      static void
-      insert(cont_type& cont, Iter first, Iter last)
-      { cont.insert(first, last); }
-  };
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/debug/debug_cont_traits.h b/libstdc++-v3/testsuite/23_containers/multiset/debug/debug_cont_traits.h
deleted file mode 100644
index d5bafe40185..00000000000
--- a/libstdc++-v3/testsuite/23_containers/multiset/debug/debug_cont_traits.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (C) 2010 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-//
-
-#include <debug/set>
-
-template<typename Type>
-  struct cont_traits
-  {
-    typedef __gnu_debug::multiset<Type> cont_type;
-    typedef Type val_type;
-
-    static val_type
-    make_val(Type val)
-    { return val; }
-
-    template<typename Iter>
-      static void
-      insert(cont_type& cont, Iter first, Iter last)
-      { cont.insert(first, last); }
-  };
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/debug/insert1_neg.cc b/libstdc++-v3/testsuite/23_containers/multiset/debug/insert1_neg.cc
index d04b44148ee..32f20a90b76 100644
--- a/libstdc++-v3/testsuite/23_containers/multiset/debug/insert1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/multiset/debug/insert1_neg.cc
@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/insert_neg.h>
-#include "cont_traits.h"
+#include <set>
+#include <debug/checks.h>
 
 void test01()
 {
-  check1<cont_traits>();
+  __gnu_test::check_insert1<std::multiset<int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/debug/insert2_neg.cc b/libstdc++-v3/testsuite/23_containers/multiset/debug/insert2_neg.cc
index 106c64adb29..699f0dd4710 100644
--- a/libstdc++-v3/testsuite/23_containers/multiset/debug/insert2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/multiset/debug/insert2_neg.cc
@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/insert_neg.h>
-#include "cont_traits.h"
+#include <set>
+#include <debug/checks.h>
 
 void test01()
 {
-  check2<cont_traits>();
+  __gnu_test::check_insert2<std::multiset<int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/debug/insert3_neg.cc b/libstdc++-v3/testsuite/23_containers/multiset/debug/insert3_neg.cc
index 9d3d7b1ad85..92f864d6071 100644
--- a/libstdc++-v3/testsuite/23_containers/multiset/debug/insert3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/multiset/debug/insert3_neg.cc
@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/insert_neg.h>
-#include "cont_traits.h"
+#include <set>
+#include <debug/checks.h>
 
 void test01()
 {
-  check3<cont_traits>();
+  __gnu_test::check_insert3<std::multiset<int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/debug/insert4_neg.cc b/libstdc++-v3/testsuite/23_containers/multiset/debug/insert4_neg.cc
index fc49ae65558..a0881075fdb 100644
--- a/libstdc++-v3/testsuite/23_containers/multiset/debug/insert4_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/multiset/debug/insert4_neg.cc
@@ -17,12 +17,12 @@
 //
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/insert_neg.h>
-#include "debug_cont_traits.h"
+#include <debug/set>
+#include <debug/checks.h>
 
 void test01()
 {
-  debug_check1<cont_traits>();
+  __gnu_test::check_insert1<__gnu_debug::multiset<int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/set/debug/construct1_neg.cc b/libstdc++-v3/testsuite/23_containers/set/debug/construct1_neg.cc
index 791c1a296a1..424eb8be20e 100644
--- a/libstdc++-v3/testsuite/23_containers/set/debug/construct1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/set/debug/construct1_neg.cc
@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "cont_traits.h"
+#include <set>
+#include <debug/checks.h>
 
 void test01()
 {
-  check1<cont_traits>();
+  __gnu_test::check_construct1<std::set<int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/set/debug/construct2_neg.cc b/libstdc++-v3/testsuite/23_containers/set/debug/construct2_neg.cc
index 6cac9f03147..d5819925b50 100644
--- a/libstdc++-v3/testsuite/23_containers/set/debug/construct2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/set/debug/construct2_neg.cc
@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "cont_traits.h"
+#include <set>
+#include <debug/checks.h>
 
 void test01()
 {
-  check2<cont_traits>();
+  __gnu_test::check_construct2<std::set<int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/set/debug/construct3_neg.cc b/libstdc++-v3/testsuite/23_containers/set/debug/construct3_neg.cc
index 752c95c671f..1cc7dd2345d 100644
--- a/libstdc++-v3/testsuite/23_containers/set/debug/construct3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/set/debug/construct3_neg.cc
@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "cont_traits.h"
+#include <set>
+#include <debug/checks.h>
 
 void test01()
 {
-  check3<cont_traits>();
+  __gnu_test::check_construct3<std::set<int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/set/debug/construct4_neg.cc b/libstdc++-v3/testsuite/23_containers/set/debug/construct4_neg.cc
index 9ee467e0f0f..d464aabfbab 100644
--- a/libstdc++-v3/testsuite/23_containers/set/debug/construct4_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/set/debug/construct4_neg.cc
@@ -17,12 +17,12 @@
 //
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "debug_cont_traits.h"
+#include <debug/set>
+#include <debug/checks.h>
 
 void test01()
 {
-  debug_check1<cont_traits>();
+  __gnu_test::check_construct1<__gnu_debug::set<int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/set/debug/cont_traits.h b/libstdc++-v3/testsuite/23_containers/set/debug/cont_traits.h
deleted file mode 100644
index fbcc0ff3eb2..00000000000
--- a/libstdc++-v3/testsuite/23_containers/set/debug/cont_traits.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (C) 2010 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-//
-
-#include <set>
-
-template<typename Type>
-  struct cont_traits
-  {
-    typedef std::set<Type> cont_type;
-    typedef Type val_type;
-
-    static val_type
-    make_val(Type val)
-    { return val; }
-
-    template<typename Iter>
-      static void
-      insert(cont_type& cont, Iter first, Iter last)
-      { cont.insert(first, last); }
-  };
diff --git a/libstdc++-v3/testsuite/23_containers/set/debug/debug_cont_traits.h b/libstdc++-v3/testsuite/23_containers/set/debug/debug_cont_traits.h
deleted file mode 100644
index 5f693769128..00000000000
--- a/libstdc++-v3/testsuite/23_containers/set/debug/debug_cont_traits.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (C) 2010 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-//
-
-#include <debug/set>
-
-template<typename Type>
-  struct cont_traits
-  {
-    typedef __gnu_debug::set<Type> cont_type;
-    typedef Type val_type;
-
-    static val_type
-    make_val(Type val)
-    { return val; }
-
-    template<typename Iter>
-      static void
-      insert(cont_type& cont, Iter first, Iter last)
-      { cont.insert(first, last); }
-  };
diff --git a/libstdc++-v3/testsuite/23_containers/set/debug/insert1_neg.cc b/libstdc++-v3/testsuite/23_containers/set/debug/insert1_neg.cc
index d04b44148ee..3192ff9594f 100644
--- a/libstdc++-v3/testsuite/23_containers/set/debug/insert1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/set/debug/insert1_neg.cc
@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/insert_neg.h>
-#include "cont_traits.h"
+#include <set>
+#include <debug/checks.h>
 
 void test01()
 {
-  check1<cont_traits>();
+  __gnu_test::check_insert1<std::set<int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/set/debug/insert2_neg.cc b/libstdc++-v3/testsuite/23_containers/set/debug/insert2_neg.cc
index 106c64adb29..d0d16cfb9dd 100644
--- a/libstdc++-v3/testsuite/23_containers/set/debug/insert2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/set/debug/insert2_neg.cc
@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/insert_neg.h>
-#include "cont_traits.h"
+#include <set>
+#include <debug/checks.h>
 
 void test01()
 {
-  check2<cont_traits>();
+  __gnu_test::check_insert2<std::set<int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/set/debug/insert3_neg.cc b/libstdc++-v3/testsuite/23_containers/set/debug/insert3_neg.cc
index 9d3d7b1ad85..9eaf6f82bed 100644
--- a/libstdc++-v3/testsuite/23_containers/set/debug/insert3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/set/debug/insert3_neg.cc
@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/insert_neg.h>
-#include "cont_traits.h"
+#include <set>
+#include <debug/checks.h>
 
 void test01()
 {
-  check3<cont_traits>();
+  __gnu_test::check_insert3<std::set<int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/set/debug/insert4_neg.cc b/libstdc++-v3/testsuite/23_containers/set/debug/insert4_neg.cc
index fc49ae65558..c2424d2a370 100644
--- a/libstdc++-v3/testsuite/23_containers/set/debug/insert4_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/set/debug/insert4_neg.cc
@@ -17,12 +17,12 @@
 //
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/insert_neg.h>
-#include "debug_cont_traits.h"
+#include <debug/set>
+#include <debug/checks.h>
 
 void test01()
 {
-  debug_check1<cont_traits>();
+  __gnu_test::check_insert1<__gnu_debug::set<int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/construct1_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/construct1_neg.cc
index a939d9e90a9..31961f7ce94 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/construct1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/construct1_neg.cc
@@ -15,15 +15,16 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-options "-std=gnu++0x" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "cont_traits.h"
+#include <unordered_map>
+#include <debug/checks.h>
 
 void test01()
 {
-  check1<cont_traits>();
+  __gnu_test::check_construct1<std::unordered_map<int, int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/construct2_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/construct2_neg.cc
index 697db52eaa3..560651a46cc 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/construct2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/construct2_neg.cc
@@ -15,15 +15,16 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-options "-std=gnu++0x" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "cont_traits.h"
+#include <unordered_map>
+#include <debug/checks.h>
 
 void test01()
 {
-  check2<cont_traits>();
+  __gnu_test::check_construct2<std::unordered_map<int, int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/construct3_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/construct3_neg.cc
index 899f2958d5f..7d57272f1f0 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/construct3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/construct3_neg.cc
@@ -15,15 +15,16 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-options "-std=gnu++0x" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "cont_traits.h"
+#include <unordered_map>
+#include <debug/checks.h>
 
 void test01()
 {
-  check3<cont_traits>();
+  __gnu_test::check_construct3<std::unordered_map<int, int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/construct4_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/construct4_neg.cc
index e2d0efde3a4..e37cab21aa9 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/construct4_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/construct4_neg.cc
@@ -18,12 +18,12 @@
 // { dg-options "-std=gnu++0x" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "debug_cont_traits.h"
+#include <debug/unordered_map>
+#include <debug/checks.h>
 
 void test01()
 {
-  debug_check1<cont_traits>();
+  __gnu_test::check_construct1<__gnu_debug::unordered_map<int, int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/cont_traits.h b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/cont_traits.h
deleted file mode 100644
index 262b3585454..00000000000
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/cont_traits.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (C) 2010 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-//
-
-#include <unordered_map>
-
-template<typename Type>
-  struct cont_traits
-  {
-    typedef std::unordered_map<Type, Type> cont_type;
-    typedef std::pair<Type, Type> val_type;
-
-    static val_type
-    make_val(Type val)
-    { return val_type(val, val); }
-
-    template<typename Iter>
-      static void
-      insert(cont_type& cont, Iter first, Iter last)
-      { cont.insert(first, last); }
-  };
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/debug_cont_traits.h b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/debug_cont_traits.h
deleted file mode 100644
index 7b3b8c393d7..00000000000
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/debug_cont_traits.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (C) 2010 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-//
-
-#include <debug/unordered_map>
-
-template<typename Type>
-  struct cont_traits
-  {
-    typedef __gnu_debug::unordered_map<Type, Type> cont_type;
-    typedef std::pair<Type, Type> val_type;
-
-    static val_type
-    make_val(Type val)
-    { return val_type(val, val); }
-
-    template<typename Iter>
-      static void
-      insert(cont_type& cont, Iter first, Iter last)
-      { cont.insert(first, last); }
-  };
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/insert1_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/insert1_neg.cc
index e9bb1cfe0e7..f3d06bf744b 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/insert1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/insert1_neg.cc
@@ -15,15 +15,16 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-options "-std=gnu++0x" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/insert_neg.h>
-#include "cont_traits.h"
+#include <unordered_map>
+#include <debug/checks.h>
 
 void test01()
 {
-  check1<cont_traits>();
+  __gnu_test::check_insert1<std::unordered_map<int, int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/insert2_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/insert2_neg.cc
index c42b8b5696f..09d55e19056 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/insert2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/insert2_neg.cc
@@ -15,15 +15,16 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-options "-std=gnu++0x" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/insert_neg.h>
-#include "cont_traits.h"
+#include <unordered_map>
+#include <debug/checks.h>
 
 void test01()
 {
-  check2<cont_traits>();
+  __gnu_test::check_insert2<std::unordered_map<int, int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/insert3_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/insert3_neg.cc
index e8d9e9b6714..41af7591772 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/insert3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/insert3_neg.cc
@@ -15,15 +15,16 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-options "-std=gnu++0x" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/insert_neg.h>
-#include "cont_traits.h"
+#include <unordered_map>
+#include <debug/checks.h>
 
 void test01()
 {
-  check3<cont_traits>();
+  __gnu_test::check_insert3<std::unordered_map<int, int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/insert4_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/insert4_neg.cc
index 9f3d567714b..6239431bbaf 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/debug/insert4_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/debug/insert4_neg.cc
@@ -18,12 +18,12 @@
 // { dg-options "-std=gnu++0x" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/insert_neg.h>
-#include "debug_cont_traits.h"
+#include <debug/unordered_map>
+#include <debug/checks.h>
 
 void test01()
 {
-  debug_check1<cont_traits>();
+  __gnu_test::check_insert1<__gnu_debug::unordered_map<int, int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/construct1_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/construct1_neg.cc
index a939d9e90a9..7a17e4c0e92 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/construct1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/construct1_neg.cc
@@ -15,15 +15,16 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-options "-std=gnu++0x" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "cont_traits.h"
+#include <unordered_map>
+#include <debug/checks.h>
 
 void test01()
 {
-  check1<cont_traits>();
+  __gnu_test::check_construct1<std::unordered_multimap<int, int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/construct2_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/construct2_neg.cc
index 697db52eaa3..8f2c1a6d95e 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/construct2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/construct2_neg.cc
@@ -15,15 +15,16 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-options "-std=gnu++0x" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "cont_traits.h"
+#include <unordered_map>
+#include <debug/checks.h>
 
 void test01()
 {
-  check2<cont_traits>();
+  __gnu_test::check_construct2<std::unordered_multimap<int, int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/construct3_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/construct3_neg.cc
index 899f2958d5f..3fb4be737b3 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/construct3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/construct3_neg.cc
@@ -15,15 +15,16 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-options "-std=gnu++0x" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "cont_traits.h"
+#include <unordered_map>
+#include <debug/checks.h>
 
 void test01()
 {
-  check3<cont_traits>();
+  __gnu_test::check_construct3<std::unordered_multimap<int, int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/construct4_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/construct4_neg.cc
index e2d0efde3a4..000745e75d5 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/construct4_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/construct4_neg.cc
@@ -18,12 +18,12 @@
 // { dg-options "-std=gnu++0x" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "debug_cont_traits.h"
+#include <debug/unordered_map>
+#include <debug/checks.h>
 
 void test01()
 {
-  debug_check1<cont_traits>();
+  __gnu_test::check_construct1<__gnu_debug::unordered_multimap<int, int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/cont_traits.h b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/cont_traits.h
deleted file mode 100644
index 1212274c5fa..00000000000
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/cont_traits.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (C) 2010 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-//
-
-#include <unordered_map>
-
-template<typename Type>
-  struct cont_traits
-  {
-    typedef std::unordered_multimap<Type, Type> cont_type;
-    typedef std::pair<Type, Type> val_type;
-
-    static val_type
-    make_val(Type val)
-    { return val_type(val, val); }
-
-    template<typename Iter>
-      static void
-      insert(cont_type& cont, Iter first, Iter last)
-      { cont.insert(first, last); }
-  };
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/debug_cont_traits.h b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/debug_cont_traits.h
deleted file mode 100644
index d66594dcaf5..00000000000
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/debug_cont_traits.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (C) 2010 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-//
-
-#include <debug/unordered_map>
-
-template<typename Type>
-  struct cont_traits
-  {
-    typedef __gnu_debug::unordered_multimap<Type, Type> cont_type;
-    typedef std::pair<Type, Type> val_type;
-
-    static val_type
-    make_val(Type val)
-    { return std::pair<Type, Type>(val, val); }
-
-    template<typename Iter>
-      static void
-      insert(cont_type& cont, Iter first, Iter last)
-      { cont.insert(first, last); }
-  };
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/insert1_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/insert1_neg.cc
index e9bb1cfe0e7..e36a0a17033 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/insert1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/insert1_neg.cc
@@ -15,15 +15,16 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-options "-std=gnu++0x" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/insert_neg.h>
-#include "cont_traits.h"
+#include <unordered_map>
+#include <debug/checks.h>
 
 void test01()
 {
-  check1<cont_traits>();
+  __gnu_test::check_insert1<std::unordered_multimap<int, int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/insert2_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/insert2_neg.cc
index c42b8b5696f..04a488be112 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/insert2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/insert2_neg.cc
@@ -15,15 +15,16 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-options "-std=gnu++0x" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/insert_neg.h>
-#include "cont_traits.h"
+#include <unordered_map>
+#include <debug/checks.h>
 
 void test01()
 {
-  check2<cont_traits>();
+  __gnu_test::check_insert2<std::unordered_multimap<int, int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/insert3_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/insert3_neg.cc
index e8d9e9b6714..1c7f60f93cc 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/insert3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/insert3_neg.cc
@@ -15,15 +15,16 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-options "-std=gnu++0x" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/insert_neg.h>
-#include "cont_traits.h"
+#include <unordered_map>
+#include <debug/checks.h>
 
 void test01()
 {
-  check3<cont_traits>();
+  __gnu_test::check_insert3<std::unordered_multimap<int, int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/insert4_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/insert4_neg.cc
index 9f3d567714b..988c3129354 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/insert4_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/debug/insert4_neg.cc
@@ -18,12 +18,12 @@
 // { dg-options "-std=gnu++0x" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/insert_neg.h>
-#include "debug_cont_traits.h"
+#include <debug/unordered_map>
+#include <debug/checks.h>
 
 void test01()
 {
-  debug_check1<cont_traits>();
+  __gnu_test::check_insert1<__gnu_debug::unordered_multimap<int, int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/construct1_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/construct1_neg.cc
index a939d9e90a9..7d8989074f3 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/construct1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/construct1_neg.cc
@@ -15,15 +15,16 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-options "-std=gnu++0x" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "cont_traits.h"
+#include <unordered_set>
+#include <debug/checks.h>
 
 void test01()
 {
-  check1<cont_traits>();
+  __gnu_test::check_construct1<std::unordered_multiset<int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/construct2_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/construct2_neg.cc
index 697db52eaa3..ea6857aa212 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/construct2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/construct2_neg.cc
@@ -15,15 +15,16 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-options "-std=gnu++0x" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "cont_traits.h"
+#include <unordered_set>
+#include <debug/checks.h>
 
 void test01()
 {
-  check2<cont_traits>();
+  __gnu_test::check_construct2<std::unordered_multiset<int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/construct3_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/construct3_neg.cc
index 899f2958d5f..20a4659629d 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/construct3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/construct3_neg.cc
@@ -15,15 +15,16 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-options "-std=gnu++0x" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "cont_traits.h"
+#include <unordered_set>
+#include <debug/checks.h>
 
 void test01()
 {
-  check3<cont_traits>();
+  __gnu_test::check_construct3<std::unordered_multiset<int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/construct4_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/construct4_neg.cc
index e2d0efde3a4..4fbb4fad6c4 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/construct4_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/construct4_neg.cc
@@ -18,12 +18,12 @@
 // { dg-options "-std=gnu++0x" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "debug_cont_traits.h"
+#include <debug/unordered_set>
+#include <debug/checks.h>
 
 void test01()
 {
-  debug_check1<cont_traits>();
+  __gnu_test::check_construct1<__gnu_debug::unordered_multiset<int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/cont_traits.h b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/cont_traits.h
deleted file mode 100644
index b82d737483c..00000000000
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/cont_traits.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (C) 2010 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-//
-
-#include <unordered_set>
-
-template<typename Type>
-  struct cont_traits
-  {
-    typedef std::unordered_multiset<Type> cont_type;
-    typedef Type val_type;
-
-    static val_type
-    make_val(Type val)
-    { return val; }
-
-    template<typename Iter>
-      static void
-      insert(cont_type& cont, Iter first, Iter last)
-      { cont.insert(first, last); }
-  };
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/debug_cont_traits.h b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/debug_cont_traits.h
deleted file mode 100644
index 7053683e506..00000000000
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/debug_cont_traits.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (C) 2010 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-//
-
-#include <debug/unordered_set>
-
-template<typename Type>
-  struct cont_traits
-  {
-    typedef __gnu_debug::unordered_multiset<Type> cont_type;
-    typedef Type val_type;
-
-    static val_type
-    make_val(Type val)
-    { return val; }
-
-    template<typename Iter>
-      static void
-      insert(cont_type& cont, Iter first, Iter last)
-      { cont.insert(first, last); }
-  };
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/insert1_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/insert1_neg.cc
index e9bb1cfe0e7..c65c6083d75 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/insert1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/insert1_neg.cc
@@ -15,15 +15,16 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-options "-std=gnu++0x" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/insert_neg.h>
-#include "cont_traits.h"
+#include <unordered_set>
+#include <debug/checks.h>
 
 void test01()
 {
-  check1<cont_traits>();
+  __gnu_test::check_insert1<std::unordered_multiset<int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/insert2_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/insert2_neg.cc
index c42b8b5696f..6496624ee66 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/insert2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/insert2_neg.cc
@@ -15,15 +15,16 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-options "-std=gnu++0x" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/insert_neg.h>
-#include "cont_traits.h"
+#include <unordered_set>
+#include <debug/checks.h>
 
 void test01()
 {
-  check2<cont_traits>();
+  __gnu_test::check_insert2<std::unordered_multiset<int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/insert3_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/insert3_neg.cc
index e8d9e9b6714..b12fe5764cc 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/insert3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/insert3_neg.cc
@@ -15,15 +15,16 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-options "-std=gnu++0x" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/insert_neg.h>
-#include "cont_traits.h"
+#include <unordered_set>
+#include <debug/checks.h>
 
 void test01()
 {
-  check3<cont_traits>();
+  __gnu_test::check_insert3<std::unordered_multiset<int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/insert4_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/insert4_neg.cc
index 9f3d567714b..0f2acea40e2 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/insert4_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/debug/insert4_neg.cc
@@ -18,12 +18,12 @@
 // { dg-options "-std=gnu++0x" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/insert_neg.h>
-#include "debug_cont_traits.h"
+#include <debug/unordered_set>
+#include <debug/checks.h>
 
 void test01()
 {
-  debug_check1<cont_traits>();
+  __gnu_test::check_insert1<__gnu_debug::unordered_multiset<int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/construct1_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/construct1_neg.cc
index a939d9e90a9..e37e5209d7f 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/construct1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/construct1_neg.cc
@@ -15,15 +15,16 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-options "-std=gnu++0x" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "cont_traits.h"
+#include <unordered_set>
+#include <debug/checks.h>
 
 void test01()
 {
-  check1<cont_traits>();
+  __gnu_test::check_construct1<std::unordered_set<int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/construct2_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/construct2_neg.cc
index 697db52eaa3..90e5d55a4fb 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/construct2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/construct2_neg.cc
@@ -15,15 +15,16 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-options "-std=gnu++0x" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "cont_traits.h"
+#include <unordered_set>
+#include <debug/checks.h>
 
 void test01()
 {
-  check2<cont_traits>();
+  __gnu_test::check_construct2<std::unordered_set<int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/construct3_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/construct3_neg.cc
index 899f2958d5f..e7222a9c275 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/construct3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/construct3_neg.cc
@@ -15,15 +15,16 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-options "-std=gnu++0x" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "cont_traits.h"
+#include <unordered_set>
+#include <debug/checks.h>
 
 void test01()
 {
-  check3<cont_traits>();
+  __gnu_test::check_construct3<std::unordered_set<int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/construct4_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/construct4_neg.cc
index e2d0efde3a4..8eb0304292c 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/construct4_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/construct4_neg.cc
@@ -18,12 +18,12 @@
 // { dg-options "-std=gnu++0x" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "debug_cont_traits.h"
+#include <debug/unordered_set>
+#include <debug/checks.h>
 
 void test01()
 {
-  debug_check1<cont_traits>();
+  __gnu_test::check_construct1<__gnu_debug::unordered_set<int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/cont_traits.h b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/cont_traits.h
deleted file mode 100644
index 7709f49124e..00000000000
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/cont_traits.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (C) 2010 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-//
-
-#include <unordered_set>
-
-template<typename Type>
-  struct cont_traits
-  {
-    typedef std::unordered_set<Type> cont_type;
-    typedef Type val_type;
-
-    static val_type
-    make_val(Type val)
-    { return val; }
-
-    template<typename Iter>
-      static void
-      insert(cont_type& cont, Iter first, Iter last)
-      { cont.insert(first, last); }
-  };
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/debug_cont_traits.h b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/debug_cont_traits.h
deleted file mode 100644
index f4d6e9bb5be..00000000000
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/debug_cont_traits.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (C) 2010 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-//
-
-#include <debug/unordered_set>
-
-template<typename Type>
-  struct cont_traits
-  {
-    typedef __gnu_debug::unordered_set<Type> cont_type;
-    typedef Type val_type;
-
-    static val_type
-    make_val(Type val)
-    { return val; }
-
-    template<typename Iter>
-      static void
-      insert(cont_type& cont, Iter first, Iter last)
-      { cont.insert(first, last); }
-  };
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/insert1_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/insert1_neg.cc
index e9bb1cfe0e7..ab6942ccaf3 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/insert1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/insert1_neg.cc
@@ -15,15 +15,16 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-options "-std=gnu++0x" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/insert_neg.h>
-#include "cont_traits.h"
+#include <unordered_set>
+#include <debug/checks.h>
 
 void test01()
 {
-  check1<cont_traits>();
+  __gnu_test::check_insert1<std::unordered_set<int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/insert2_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/insert2_neg.cc
index c42b8b5696f..81be39da9d9 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/insert2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/insert2_neg.cc
@@ -15,15 +15,16 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-options "-std=gnu++0x" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/insert_neg.h>
-#include "cont_traits.h"
+#include <unordered_set>
+#include <debug/checks.h>
 
 void test01()
 {
-  check2<cont_traits>();
+  __gnu_test::check_insert2<std::unordered_set<int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/insert3_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/insert3_neg.cc
index e8d9e9b6714..2d3b7e472c6 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/insert3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/insert3_neg.cc
@@ -15,15 +15,16 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-options "-std=gnu++0x" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/insert_neg.h>
-#include "cont_traits.h"
+#include <unordered_set>
+#include <debug/checks.h>
 
 void test01()
 {
-  check3<cont_traits>();
+  __gnu_test::check_insert3<std::unordered_set<int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/insert4_neg.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/insert4_neg.cc
index 9f3d567714b..96d6a2a05a4 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/debug/insert4_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/debug/insert4_neg.cc
@@ -18,12 +18,12 @@
 // { dg-options "-std=gnu++0x" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/insert_neg.h>
-#include "debug_cont_traits.h"
+#include <debug/unordered_set>
+#include <debug/checks.h>
 
 void test01()
 {
-  debug_check1<cont_traits>();
+  __gnu_test::check_insert1<__gnu_debug::unordered_set<int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/vector/debug/assign1_neg.cc b/libstdc++-v3/testsuite/23_containers/vector/debug/assign1_neg.cc
index b28e987108f..ff9c5a24b18 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/debug/assign1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/debug/assign1_neg.cc
@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/assign_neg.h>
-#include "cont_traits.h"
+#include <vector>
+#include <debug/checks.h>
 
 void test01()
 {
-  check1<cont_traits>();
+  __gnu_test::check_assign1<std::vector<int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/vector/debug/assign2_neg.cc b/libstdc++-v3/testsuite/23_containers/vector/debug/assign2_neg.cc
index cfff8ac9454..4384a97bd26 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/debug/assign2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/debug/assign2_neg.cc
@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/assign_neg.h>
-#include "cont_traits.h"
+#include <vector>
+#include <debug/checks.h>
 
 void test01()
 {
-  check2<cont_traits>();
+  __gnu_test::check_assign2<std::vector<int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/vector/debug/assign3_neg.cc b/libstdc++-v3/testsuite/23_containers/vector/debug/assign3_neg.cc
index cfd0bb02332..9cb7ea6f9bc 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/debug/assign3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/debug/assign3_neg.cc
@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/assign_neg.h>
-#include "cont_traits.h"
+#include <vector>
+#include <debug/checks.h>
 
 void test01()
 {
-  check3<cont_traits>();
+  __gnu_test::check_assign3<std::vector<int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/vector/debug/assign4_neg.cc b/libstdc++-v3/testsuite/23_containers/vector/debug/assign4_neg.cc
index 115580defc9..8e3d3be9c01 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/debug/assign4_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/debug/assign4_neg.cc
@@ -17,12 +17,12 @@
 //
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/assign_neg.h>
-#include "debug_cont_traits.h"
+#include <debug/vector>
+#include <debug/checks.h>
 
 void test01()
 {
-  debug_check1<cont_traits>();
+  __gnu_test::check_assign1<__gnu_debug::vector<int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/vector/debug/construct1_neg.cc b/libstdc++-v3/testsuite/23_containers/vector/debug/construct1_neg.cc
index 791c1a296a1..dc0b4a22eb7 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/debug/construct1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/debug/construct1_neg.cc
@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "cont_traits.h"
+#include <vector>
+#include <debug/checks.h>
 
 void test01()
 {
-  check1<cont_traits>();
+  __gnu_test::check_construct1<std::vector<int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/vector/debug/construct2_neg.cc b/libstdc++-v3/testsuite/23_containers/vector/debug/construct2_neg.cc
index 6cac9f03147..13757a1fa5e 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/debug/construct2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/debug/construct2_neg.cc
@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "cont_traits.h"
+#include <vector>
+#include <debug/checks.h>
 
 void test01()
 {
-  check2<cont_traits>();
+  __gnu_test::check_construct2<std::vector<int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/vector/debug/construct3_neg.cc b/libstdc++-v3/testsuite/23_containers/vector/debug/construct3_neg.cc
index 752c95c671f..661af4382d8 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/debug/construct3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/debug/construct3_neg.cc
@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "cont_traits.h"
+#include <vector>
+#include <debug/checks.h>
 
 void test01()
 {
-  check3<cont_traits>();
+  __gnu_test::check_construct3<std::vector<int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/vector/debug/construct4_neg.cc b/libstdc++-v3/testsuite/23_containers/vector/debug/construct4_neg.cc
index 9ee467e0f0f..ec33a581340 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/debug/construct4_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/debug/construct4_neg.cc
@@ -17,12 +17,12 @@
 //
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/construct_neg.h>
-#include "debug_cont_traits.h"
+#include <debug/vector>
+#include <debug/checks.h>
 
 void test01()
 {
-  debug_check1<cont_traits>();
+  __gnu_test::check_construct1<__gnu_debug::vector<int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/vector/debug/cont_traits.h b/libstdc++-v3/testsuite/23_containers/vector/debug/cont_traits.h
deleted file mode 100644
index cdd9a08b444..00000000000
--- a/libstdc++-v3/testsuite/23_containers/vector/debug/cont_traits.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (C) 2010 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-//
-
-#include <vector>
-
-template<typename Type>
-  struct cont_traits
-  {
-    typedef std::vector<Type> cont_type;
-    typedef Type val_type;
-
-    static val_type
-    make_val(Type val)
-    { return val; }
-
-    template<typename Iter>
-      static void
-      insert(cont_type& cont, Iter first, Iter last)
-      { cont.insert(cont.begin(), first, last); }
-  };
diff --git a/libstdc++-v3/testsuite/23_containers/vector/debug/debug_cont_traits.h b/libstdc++-v3/testsuite/23_containers/vector/debug/debug_cont_traits.h
deleted file mode 100644
index 204caff25c9..00000000000
--- a/libstdc++-v3/testsuite/23_containers/vector/debug/debug_cont_traits.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (C) 2010 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-//
-
-#include <debug/vector>
-
-template<typename Type>
-  struct cont_traits
-  {
-    typedef __gnu_debug::vector<Type> cont_type;
-    typedef Type val_type;
-
-    static val_type
-    make_val(Type val)
-    { return val; }
-
-    template<typename Iter>
-      static void
-      insert(cont_type& cont, Iter first, Iter last)
-      { cont.insert(cont.begin(), first, last); }
-  };
diff --git a/libstdc++-v3/testsuite/23_containers/vector/debug/insert1_neg.cc b/libstdc++-v3/testsuite/23_containers/vector/debug/insert1_neg.cc
index d04b44148ee..2ec0d9e02a9 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/debug/insert1_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/debug/insert1_neg.cc
@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/insert_neg.h>
-#include "cont_traits.h"
+#include <vector>
+#include <debug/checks.h>
 
 void test01()
 {
-  check1<cont_traits>();
+  __gnu_test::check_insert1<std::vector<int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/vector/debug/insert2_neg.cc b/libstdc++-v3/testsuite/23_containers/vector/debug/insert2_neg.cc
index 106c64adb29..011ad4c0c31 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/debug/insert2_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/debug/insert2_neg.cc
@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/insert_neg.h>
-#include "cont_traits.h"
+#include <vector>
+#include <debug/checks.h>
 
 void test01()
 {
-  check2<cont_traits>();
+  __gnu_test::check_insert2<std::vector<int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/vector/debug/insert3_neg.cc b/libstdc++-v3/testsuite/23_containers/vector/debug/insert3_neg.cc
index 9d3d7b1ad85..4dab133b571 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/debug/insert3_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/debug/insert3_neg.cc
@@ -15,14 +15,15 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 //
+// { dg-require-debug-mode "" }
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/insert_neg.h>
-#include "cont_traits.h"
+#include <vector>
+#include <debug/checks.h>
 
 void test01()
 {
-  check3<cont_traits>();
+  __gnu_test::check_insert3<std::vector<int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/23_containers/vector/debug/insert4_neg.cc b/libstdc++-v3/testsuite/23_containers/vector/debug/insert4_neg.cc
index fc49ae65558..684ebb598c1 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/debug/insert4_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/debug/insert4_neg.cc
@@ -17,12 +17,12 @@
 //
 // { dg-do run { xfail *-*-* } }
 
-#include <debug/insert_neg.h>
-#include "debug_cont_traits.h"
+#include <debug/vector>
+#include <debug/checks.h>
 
 void test01()
 {
-  debug_check1<cont_traits>();
+  __gnu_test::check_insert1<__gnu_debug::vector<int> >();
 }
 
 int main()
diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp
index 33dc120a0b2..13dad49ffc4 100644
--- a/libstdc++-v3/testsuite/lib/libstdc++.exp
+++ b/libstdc++-v3/testsuite/lib/libstdc++.exp
@@ -947,21 +947,20 @@ proc check_v3_target_debug_mode { } {
 	set et_debug_mode 0
 
 	# Set up and compile a C++ test program that depends
-	# on debug mode working.
+	# on debug mode activated.
 	set src debug_mode[pid].cc
 	set exe debug_mode[pid].exe
 
 	set f [open $src "w"]
 	puts $f "#include <string>"
-	puts $f "using namespace std;"	
+	puts $f "#ifndef _GLIBCXX_DEBUG"
+	puts $f "#  error No debug mode"
+	puts $f "#endif"
 	puts $f "int main()"
 	puts $f "{ return 0; }"
 	close $f
 
-	set cxxflags_saved $cxxflags
-	set cxxflags "$cxxflags -Werror -O0 -D_GLIBCXX_DEBUG"
 	set lines [v3_target_compile $src $exe executable ""]
-	set cxxflags $cxxflags_saved
 	file delete $src
 
 	if [string match "" $lines] {
diff --git a/libstdc++-v3/testsuite/util/debug/assign_neg.h b/libstdc++-v3/testsuite/util/debug/assign_neg.h
deleted file mode 100644
index 332c716c297..00000000000
--- a/libstdc++-v3/testsuite/util/debug/assign_neg.h
+++ /dev/null
@@ -1,136 +0,0 @@
-// Copyright (C) 2010 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-//
-
-#include <vector>
-#include <list>
-#include <testsuite_hooks.h>
-
-// Check that invalid range of pointers is detected
-template<template <typename> class ContTraits>
-  void
-  debug_check1()
-  {
-    bool test __attribute__((unused)) = true;
-
-    typedef ContTraits<int> Traits;
-    typedef typename Traits::cont_type cont_type;
-    typedef typename Traits::val_type val_type;
-    typedef std::vector<val_type> vector_type;
-
-    vector_type v;
-    for (int i = 0; i != 5; ++i)
-      v.push_back(Traits::make_val(i));
-    VERIFY(v.size() == 5);
-
-    const val_type* first = &v.front() + 1;
-    const val_type* last = first + 2;
-
-    cont_type c1;
-    c1.assign(first, last);
-    VERIFY(c1.size() == 2);
-
-    cont_type c2;
-    c2.assign(last, first); // Expected failure
-  }
-
-template <template <typename> class ContTraits>
-  void
-  check1()
-  {
-#ifdef _GLIBCXX_DEBUG
-    debug_check1<ContTraits>();
-#else
-    __builtin_abort();
-#endif
-  }
-
-// Check that invalid range of debug random iterators is detected
-template<template <typename> class ContTraits>
-  void
-  debug_check2()
-  {
-    bool test __attribute__((unused)) = true;
-
-    typedef ContTraits<int> Traits;
-    typedef typename Traits::cont_type cont_type;
-    typedef typename Traits::val_type val_type;
-    typedef std::vector<val_type> vector_type;
-
-    vector_type v;
-    for (int i = 0; i != 5; ++i)
-      v.push_back(Traits::make_val(i));
-    VERIFY(v.size() == 5);
-
-    typename vector_type::iterator first = v.begin() + 1;
-    typename vector_type::iterator last = first + 2;
-    cont_type c1;
-    c1.assign(first, last);
-    VERIFY(c1.size() == 2);
-
-    cont_type c2;
-    c2.assign(last, first); // Expected failure
-  }
-
-template<template <typename> class ContTraits>
-  void
-  check2()
-  {
-#ifdef _GLIBCXX_DEBUG
-    debug_check2<ContTraits>();
-#else
-    __builtin_abort();
-#endif
-  }
-
-// Check that invalid range of debug !random debug iterators is detected
-template<template <typename> class ContTraits>
-  void
-  debug_check3()
-  {
-    bool test __attribute__((unused)) = true;
-
-    typedef ContTraits<int> Traits;
-    typedef typename Traits::cont_type cont_type;
-    typedef typename Traits::val_type val_type;
-    typedef std::list<val_type> list_type;
-
-    list_type l;
-    for (int i = 0; i != 5; ++i)
-      l.push_back(Traits::make_val(i));
-    VERIFY(l.size() == 5);
-
-    typename list_type::iterator first = l.begin(); ++first;
-    typename list_type::iterator last = first; ++last; ++last;
-    cont_type c1;
-    c1.assign(first, last);
-    VERIFY(c1.size() == 2);
-
-    cont_type c2;
-    c2.assign(last, first); // Expected failure
-  }
-
-template<template <typename> class ContTraits>
-  void
-  check3()
-  {
-#ifdef _GLIBCXX_DEBUG
-    debug_check3<ContTraits>();
-#else
-    __builtin_abort();
-#endif
-  }
diff --git a/libstdc++-v3/testsuite/util/debug/checks.h b/libstdc++-v3/testsuite/util/debug/checks.h
new file mode 100644
index 00000000000..b42ef1a44c4
--- /dev/null
+++ b/libstdc++-v3/testsuite/util/debug/checks.h
@@ -0,0 +1,379 @@
+// Copyright (C) 2010 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+//
+
+#include <vector>
+#include <deque>
+#include <list>
+#ifndef _GLIBCXX_DEBUG
+#  include <debug/vector>
+#  include <debug/deque>
+#  include <debug/list>
+#endif
+#include <testsuite_hooks.h>
+
+namespace __gnu_test
+{
+  template<typename _Tp>
+    struct CopyableValueType
+    {
+      typedef _Tp value_type;
+    };
+
+  template<typename _Tp1, typename _Tp2>
+    struct CopyableValueType<std::pair<const _Tp1, _Tp2> >
+    {
+      typedef std::pair<_Tp1, _Tp2> value_type;
+    };
+
+  template<typename _Tp>
+    struct generate_unique
+    {
+      typedef _Tp value_type;
+
+      operator value_type()
+      {
+	static value_type _S_;
+	++_S_;
+	return _S_;
+      }
+    };
+
+  template<typename _Tp1, typename _Tp2>
+    struct generate_unique<std::pair<_Tp1, _Tp2> >
+    {
+      typedef _Tp1 first_type;
+      typedef _Tp2 second_type;
+      typedef std::pair<_Tp1, _Tp2> pair_type;
+      
+      operator pair_type()
+      {
+	static first_type _S_1;
+	static second_type _S_2;
+	++_S_1;
+	++_S_2;
+	return pair_type(_S_1, _S_2);
+      }
+    };
+
+  // Check that invalid range of pointers is detected
+  template<typename _Tp>
+    void
+    check_assign1()
+    {
+      bool test __attribute__((unused)) = true;
+
+      typedef _Tp cont_type;
+      typedef typename cont_type::value_type cont_val_type;
+      typedef typename CopyableValueType<cont_val_type>::value_type val_type;
+      typedef std::vector<val_type> vector_type;
+
+      generate_unique<val_type> gu;
+
+      vector_type v;
+      for (int i = 0; i != 5; ++i)
+        v.push_back(gu);
+      VERIFY(v.size() == 5);
+
+      const val_type* first = &v.front() + 1;
+      const val_type* last = first + 2;
+
+      cont_type c1;
+      c1.assign(first, last);
+      VERIFY(c1.size() == 2);
+
+      cont_type c2;
+      c2.assign(last, first); // Expected failure
+    }
+
+  // Check that invalid range of debug random iterators is detected
+  template<typename _Tp>
+    void
+    check_assign2()
+    {
+      bool test __attribute__((unused)) = true;
+
+      typedef _Tp cont_type;
+      typedef typename cont_type::value_type cont_val_type;
+      typedef typename CopyableValueType<cont_val_type>::value_type val_type;
+      typedef std::vector<val_type> vector_type;
+
+      generate_unique<val_type> gu;
+
+      vector_type v;
+      for (int i = 0; i != 5; ++i)
+        v.push_back(gu);
+      VERIFY(v.size() == 5);
+
+      typename vector_type::iterator first = v.begin() + 1;
+      typename vector_type::iterator last = first + 2;
+      cont_type c1;
+      c1.assign(first, last);
+      VERIFY(c1.size() == 2);
+
+      cont_type c2;
+      c2.assign(last, first); // Expected failure
+    }
+
+  // Check that invalid range of debug !random debug iterators is detected
+  template<typename _Tp>
+    void
+    check_assign3()
+    {
+      bool test __attribute__((unused)) = true;
+
+      typedef _Tp cont_type;
+      typedef typename cont_type::value_type cont_val_type;
+      typedef typename CopyableValueType<cont_val_type>::value_type val_type;
+      typedef std::list<val_type> list_type;
+
+      generate_unique<val_type> gu;
+
+      list_type l;
+      for (int i = 0; i != 5; ++i)
+        l.push_back(gu);
+      VERIFY(l.size() == 5);
+
+      typename list_type::iterator first = l.begin(); ++first;
+      typename list_type::iterator last = first; ++last; ++last;
+      cont_type c1;
+      c1.assign(first, last);
+      VERIFY(c1.size() == 2);
+
+      cont_type c2;
+      c2.assign(last, first); // Expected failure
+    }
+
+  // Check that invalid range of pointers is detected
+  template<typename _Tp>
+    void
+    check_construct1()
+    {
+      bool test __attribute__((unused)) = true;
+
+      typedef _Tp cont_type;
+      typedef typename cont_type::value_type cont_val_type;
+      typedef typename CopyableValueType<cont_val_type>::value_type val_type;
+      typedef std::vector<val_type> vector_type;
+
+      generate_unique<val_type> gu;
+
+      vector_type v;
+      for (int i = 0; i != 5; ++i)
+        v.push_back(gu);
+      VERIFY(v.size() == 5);
+
+      val_type *first = &v.front() + 1;
+      val_type *last = first + 2;
+      cont_type c1(first, last);
+      VERIFY(c1.size() == 2);
+
+      cont_type c2(last, first); // Expected failure
+    } 
+
+  // Check that invalid range of debug random iterators is detected
+  template<typename _Tp>
+    void
+    check_construct2()
+    {
+      bool test __attribute__((unused)) = true;
+
+      typedef _Tp cont_type;
+      typedef typename cont_type::value_type cont_val_type;
+      typedef typename CopyableValueType<cont_val_type>::value_type val_type;
+      typedef std::vector<val_type> vector_type;
+
+      generate_unique<val_type> gu;
+
+      vector_type v;
+      for (int i = 0; i != 5; ++i)
+        v.push_back(gu);
+      VERIFY(v.size() == 5);
+
+      typename vector_type::iterator first = v.begin() + 1;
+      typename vector_type::iterator last = first + 2;
+      cont_type c1(first, last);
+      VERIFY(c1.size() == 2);
+
+      cont_type c2(last, first); // Expected failure
+    }
+
+  // Check that invalid range of debug not random iterators is detected
+  template<typename _Tp>
+    void
+    check_construct3()
+    {
+      bool test __attribute__((unused)) = true;
+
+      typedef _Tp cont_type;
+      typedef typename cont_type::value_type cont_val_type;
+      typedef typename CopyableValueType<cont_val_type>::value_type val_type;
+      typedef std::list<val_type> list_type;
+
+      generate_unique<val_type> gu;
+
+      list_type l;
+      for (int i = 0; i != 5; ++i)
+        l.push_back(gu);
+      VERIFY(l.size() == 5);
+
+      typename list_type::iterator first = l.begin(); ++first;
+      typename list_type::iterator last = first; ++last; ++last;
+      cont_type c1(first, last);
+      VERIFY(c1.size() == 2);
+
+      cont_type c2(last, first); // Expected failure
+    }
+
+  template <typename _Cont>
+    struct InsertRangeHelper
+    {
+      template <typename _It>
+        static void
+        Insert(_Cont& cont, _It first, _It last)
+	{ cont.insert(first, last); }
+    };
+
+  template <typename _Cont>
+    struct InsertRangeHelperAux
+    {
+      template <typename _It>
+        static void
+        Insert(_Cont& cont, _It first, _It last)
+	{ cont.insert(cont.begin(), first, last); }
+    };
+
+  template <typename _Tp1, typename _Tp2>
+    struct InsertRangeHelper<std::vector<_Tp1, _Tp2> >
+    : InsertRangeHelperAux<std::vector<_Tp1, _Tp2> >
+    { };
+
+  template <typename _Tp1, typename _Tp2>
+    struct InsertRangeHelper<std::deque<_Tp1, _Tp2> >
+    : InsertRangeHelperAux<std::deque<_Tp1, _Tp2> >
+    { };
+
+  template <typename _Tp1, typename _Tp2>
+    struct InsertRangeHelper<std::list<_Tp1, _Tp2> >
+    : InsertRangeHelperAux<std::list<_Tp1, _Tp2> >
+    { };
+
+#ifndef _GLIBCXX_DEBUG
+  template <typename _Tp1, typename _Tp2>
+    struct InsertRangeHelper<__gnu_debug::vector<_Tp1, _Tp2> >
+    : InsertRangeHelperAux<__gnu_debug::vector<_Tp1, _Tp2> >
+    { };
+
+  template <typename _Tp1, typename _Tp2>
+    struct InsertRangeHelper<__gnu_debug::deque<_Tp1, _Tp2> >
+    : InsertRangeHelperAux<__gnu_debug::deque<_Tp1, _Tp2> >
+    { };
+
+  template <typename _Tp1, typename _Tp2>
+    struct InsertRangeHelper<__gnu_debug::list<_Tp1, _Tp2> >
+    : InsertRangeHelperAux<__gnu_debug::list<_Tp1, _Tp2> >
+    { };
+#endif
+
+  template<typename _Tp>
+    void
+    check_insert1()
+    {
+      bool test __attribute__((unused)) = true;
+
+      typedef _Tp cont_type;
+      typedef typename cont_type::value_type cont_val_type;
+      typedef typename CopyableValueType<cont_val_type>::value_type val_type;
+      typedef std::vector<val_type> vector_type;
+
+      generate_unique<val_type> gu;
+
+      vector_type v;
+      for (int i = 0; i != 5; ++i)
+        v.push_back(gu);
+      VERIFY(v.size() == 5);
+
+      const val_type* first = &v.front() + 1;
+      const val_type* last = first + 2;
+
+      cont_type c1;
+      InsertRangeHelper<cont_type>::Insert(c1, first, last);
+      VERIFY(c1.size() == 2);
+
+      cont_type c2;
+      InsertRangeHelper<cont_type>::Insert(c2, last, first); // Expected failure
+    }
+
+  template<typename _Tp>
+    void
+    check_insert2()
+    {
+      bool test __attribute__((unused)) = true;
+
+      typedef _Tp cont_type;
+      typedef typename cont_type::value_type cont_val_type;
+      typedef typename CopyableValueType<cont_val_type>::value_type val_type;
+      typedef std::vector<val_type> vector_type;
+
+      generate_unique<val_type> gu;
+
+      vector_type v;
+      for (int i = 0; i != 5; ++i)
+        v.push_back(gu);
+      VERIFY(v.size() == 5);
+
+      typename vector_type::iterator first = v.begin() + 1;
+      typename vector_type::iterator last = first + 2;
+
+      cont_type c1;
+      InsertRangeHelper<cont_type>::Insert(c1, first, last);
+      VERIFY(c1.size() == 2);
+
+      cont_type c2;
+      InsertRangeHelper<cont_type>::Insert(c2, last, first); // Expected failure
+    }
+
+  template<typename _Tp>
+    void
+    check_insert3()
+    {
+      bool test __attribute__((unused)) = true;
+
+      typedef _Tp cont_type;
+      typedef typename cont_type::value_type cont_val_type;
+      typedef typename CopyableValueType<cont_val_type>::value_type val_type;
+      typedef std::list<val_type> list_type;
+
+      generate_unique<val_type> gu;
+
+      list_type l;
+      for (int i = 0; i != 5; ++i)
+        l.push_back(gu);
+      VERIFY(l.size() == 5);
+
+      typename list_type::iterator first = l.begin(); ++first;
+      typename list_type::iterator last = first; ++last; ++last;
+
+      cont_type c1;
+      InsertRangeHelper<cont_type>::Insert(c1, first, last);
+      VERIFY(c1.size() == 2);
+
+      cont_type c2;
+      InsertRangeHelper<cont_type>::Insert(c2, last, first); // Expected failure
+    }
+}
+
diff --git a/libstdc++-v3/testsuite/util/debug/construct_neg.h b/libstdc++-v3/testsuite/util/debug/construct_neg.h
deleted file mode 100644
index 78736d367ed..00000000000
--- a/libstdc++-v3/testsuite/util/debug/construct_neg.h
+++ /dev/null
@@ -1,128 +0,0 @@
-// Copyright (C) 2010 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-//
-
-#include <vector>
-#include <list>
-#include <testsuite_hooks.h>
-
-// Check that invalid range of pointers is detected
-template<template<typename> class ContTraits>
-  void
-  debug_check1()
-  {
-    bool test __attribute__((unused)) = true;
-
-    typedef ContTraits<int> Traits;
-    typedef typename Traits::cont_type cont_type;
-    typedef typename Traits::val_type val_type;
-    typedef std::vector<val_type> vector_type;
-
-    vector_type v;
-    for (int i = 0; i != 5; ++i)
-      v.push_back(Traits::make_val(i));
-    VERIFY(v.size() == 5);
-
-    val_type *first = &v.front() + 1;
-    val_type *last = first + 2;
-    cont_type c1(first, last);
-    VERIFY(c1.size() == 2);
-
-    cont_type c2(last, first); // Expected failure
-  }
-
-template<template<typename> class ContTraits>
-  void
-  check1()
-  {
-#ifdef _GLIBCXX_DEBUG
-    debug_check1<ContTraits>();
-#else
-    __builtin_abort();
-#endif
-  }
-
-// Check that invalid range of debug random iterators is detected
-template<template<typename> class ContTraits>
-  void
-  debug_check2()
-  {
-    bool test __attribute__((unused)) = true;
-
-    typedef ContTraits<int> Traits;
-    typedef typename Traits::cont_type cont_type;
-    typedef typename Traits::val_type val_type;
-    typedef std::vector<val_type> vector_type;
-
-    vector_type v;
-    for (int i = 0; i != 5; ++i)
-      v.push_back(Traits::make_val(i));
-    VERIFY(v.size() == 5);
-
-    typename vector_type::iterator first = v.begin() + 1;
-    typename vector_type::iterator last = first + 2;
-    cont_type c1(first, last);
-    VERIFY(c1.size() == 2);
-
-    cont_type c2(last, first); // Expected failure
-  }
-
-template<template<typename> class ContTraits>
-  void
-  check2()
-  {
-#ifdef _GLIBCXX_DEBUG
-    debug_check2<ContTraits>();
-#else
-    __builtin_abort();
-#endif
-  }
-
-// Check that invalid range of debug not random iterators is detected
-template<template<typename> class ContTraits>
-  void
-  debug_check3()
-  {
-    bool test __attribute__((unused)) = true;
-
-    typedef ContTraits<int> Traits;
-    typedef typename Traits::cont_type cont_type;
-    typedef typename Traits::val_type val_type;
-    typedef std::list<val_type> list_type;
-    list_type l;
-    for (int i = 0; i != 5; ++i)
-      l.push_back(Traits::make_val(i));
-    VERIFY(l.size() == 5);
-
-    typename list_type::iterator first = l.begin(); ++first;
-    typename list_type::iterator last = first; ++last; ++last;
-    cont_type c1(first, last);
-    VERIFY(c1.size() == 2);
-
-    cont_type c2(last, first); // Expected failure
-  }
-
-template<template<typename> class ContTraits>
-  void
-  check3()
-  {
-#ifdef _GLIBCXX_DEBUG
-    debug_check3<ContTraits>();
-#else
-    __builtin_abort();
-#endif
-  }
diff --git a/libstdc++-v3/testsuite/util/debug/insert_neg.h b/libstdc++-v3/testsuite/util/debug/insert_neg.h
deleted file mode 100644
index 7c2634d9fc0..00000000000
--- a/libstdc++-v3/testsuite/util/debug/insert_neg.h
+++ /dev/null
@@ -1,132 +0,0 @@
-// Copyright (C) 2010 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-
-#include <vector>
-#include <list>
-#include <testsuite_hooks.h>
-
-template<template <typename> class ContTraits>
-  void
-  debug_check1()
-  {
-    bool test __attribute__((unused)) = true;
-
-    typedef ContTraits<int> Traits;
-    typedef typename Traits::cont_type cont_type;
-    typedef typename Traits::val_type val_type;
-    typedef std::vector<val_type> vector_type;
-
-    vector_type v;
-    for (int i = 0; i != 5; ++i)
-      v.push_back(Traits::make_val(i));
-    VERIFY(v.size() == 5);
-
-    const val_type* first = &v.front() + 1;
-    const val_type* last = first + 2;
-
-    cont_type c1;
-    Traits::insert(c1, first, last);
-    VERIFY(c1.size() == 2);
-
-    cont_type c2;
-    Traits::insert(c2, last, first);  // Expected failure
-  }
-
-template<template <typename> class ContTraits>
-  void
-  check1()
-  {
-#ifdef _GLIBCXX_DEBUG
-    debug_check1<ContTraits>();
-#else
-    __builtin_abort();
-#endif
-  }
-
-template<template <typename> class ContTraits>
-  void
-  debug_check2()
-  {
-    bool test __attribute__((unused)) = true;
-
-    typedef ContTraits<int> Traits;
-    typedef typename Traits::cont_type cont_type;
-    typedef typename Traits::val_type val_type;
-    typedef std::vector<val_type> vector_type;
-
-    vector_type v;
-    for (int i = 0; i != 5; ++i)
-      v.push_back(Traits::make_val(i));
-    VERIFY(v.size() == 5);
-
-    typename vector_type::iterator first = v.begin() + 1;
-    typename vector_type::iterator last = first + 2;
-    cont_type c1;
-    Traits::insert(c1, first, last);
-    VERIFY(c1.size() == 2);
-
-    cont_type c2;
-    Traits::insert(c2, last, first); // Expected failure
-  }
-
-template<template <typename> class ContTraits>
-  void
-  check2()
-  {
-#ifdef _GLIBCXX_DEBUG
-    debug_check2<ContTraits>();
-#else
-    __builtin_abort();
-#endif
-  }
-
-template<template <typename> class ContTraits>
-  void
-  debug_check3()
-  {
-    bool test __attribute__((unused)) = true;
-
-    typedef ContTraits<int> Traits;
-    typedef typename Traits::cont_type cont_type;
-    typedef typename Traits::val_type val_type;
-    typedef std::list<val_type> list_type;
-
-    list_type l;
-    for (int i = 0; i != 5; ++i)
-      l.push_back(Traits::make_val(i));
-    VERIFY(l.size() == 5);
-
-    typename list_type::iterator first = l.begin(); ++first;
-    typename list_type::iterator last = first; ++last; ++last;
-    cont_type c1;
-    Traits::insert(c1, first, last);
-    VERIFY(c1.size() == 2);
-
-    cont_type c2;
-    Traits::insert(c2, last, first); // Expected failure
-  }
-
-template<template <typename> class ContTraits>
-  void
-  check3()
-  {
-#ifdef _GLIBCXX_DEBUG
-    debug_check3<ContTraits>();
-#else
-    __builtin_abort();
-#endif
-  }