diff --git a/libstdc++-v3/testsuite/23_containers/bitset/18604.cc b/libstdc++-v3/testsuite/20_util/bitset/18604.cc
similarity index 100%
rename from libstdc++-v3/testsuite/23_containers/bitset/18604.cc
rename to libstdc++-v3/testsuite/20_util/bitset/18604.cc
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/45713.cc b/libstdc++-v3/testsuite/20_util/bitset/45713.cc
similarity index 100%
rename from libstdc++-v3/testsuite/23_containers/bitset/45713.cc
rename to libstdc++-v3/testsuite/20_util/bitset/45713.cc
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/to_string/dr396.cc b/libstdc++-v3/testsuite/20_util/bitset/access/dr396.cc
similarity index 100%
rename from libstdc++-v3/testsuite/23_containers/bitset/to_string/dr396.cc
rename to libstdc++-v3/testsuite/20_util/bitset/access/dr396.cc
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/to_string/1.cc b/libstdc++-v3/testsuite/20_util/bitset/access/to_string.cc
similarity index 100%
rename from libstdc++-v3/testsuite/23_containers/bitset/to_string/1.cc
rename to libstdc++-v3/testsuite/20_util/bitset/access/to_string.cc
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/to_ullong/1.cc b/libstdc++-v3/testsuite/20_util/bitset/access/to_ullong.cc
similarity index 100%
rename from libstdc++-v3/testsuite/23_containers/bitset/to_ullong/1.cc
rename to libstdc++-v3/testsuite/20_util/bitset/access/to_ullong.cc
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/to_ulong/1.cc b/libstdc++-v3/testsuite/20_util/bitset/access/to_ulong.cc
similarity index 100%
rename from libstdc++-v3/testsuite/23_containers/bitset/to_ulong/1.cc
rename to libstdc++-v3/testsuite/20_util/bitset/access/to_ulong.cc
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/cons/1.cc b/libstdc++-v3/testsuite/20_util/bitset/cons/1.cc
similarity index 100%
rename from libstdc++-v3/testsuite/23_containers/bitset/cons/1.cc
rename to libstdc++-v3/testsuite/20_util/bitset/cons/1.cc
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/cons/16020.cc b/libstdc++-v3/testsuite/20_util/bitset/cons/16020.cc
similarity index 100%
rename from libstdc++-v3/testsuite/23_containers/bitset/cons/16020.cc
rename to libstdc++-v3/testsuite/20_util/bitset/cons/16020.cc
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/cons/2.cc b/libstdc++-v3/testsuite/20_util/bitset/cons/2.cc
similarity index 100%
rename from libstdc++-v3/testsuite/23_containers/bitset/cons/2.cc
rename to libstdc++-v3/testsuite/20_util/bitset/cons/2.cc
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/cons/3.cc b/libstdc++-v3/testsuite/20_util/bitset/cons/3.cc
similarity index 100%
rename from libstdc++-v3/testsuite/23_containers/bitset/cons/3.cc
rename to libstdc++-v3/testsuite/20_util/bitset/cons/3.cc
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/cons/38244.cc b/libstdc++-v3/testsuite/20_util/bitset/cons/38244.cc
similarity index 100%
rename from libstdc++-v3/testsuite/23_containers/bitset/cons/38244.cc
rename to libstdc++-v3/testsuite/20_util/bitset/cons/38244.cc
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/cons/50268.cc b/libstdc++-v3/testsuite/20_util/bitset/cons/50268.cc
similarity index 100%
rename from libstdc++-v3/testsuite/23_containers/bitset/cons/50268.cc
rename to libstdc++-v3/testsuite/20_util/bitset/cons/50268.cc
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/cons/6282.cc b/libstdc++-v3/testsuite/20_util/bitset/cons/6282.cc
similarity index 100%
rename from libstdc++-v3/testsuite/23_containers/bitset/cons/6282.cc
rename to libstdc++-v3/testsuite/20_util/bitset/cons/6282.cc
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/cons/constexpr.cc b/libstdc++-v3/testsuite/20_util/bitset/cons/constexpr.cc
similarity index 100%
rename from libstdc++-v3/testsuite/23_containers/bitset/cons/constexpr.cc
rename to libstdc++-v3/testsuite/20_util/bitset/cons/constexpr.cc
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/cons/dr1325-1.cc b/libstdc++-v3/testsuite/20_util/bitset/cons/dr1325-1.cc
similarity index 100%
rename from libstdc++-v3/testsuite/23_containers/bitset/cons/dr1325-1.cc
rename to libstdc++-v3/testsuite/20_util/bitset/cons/dr1325-1.cc
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/cons/dr1325-2.cc b/libstdc++-v3/testsuite/20_util/bitset/cons/dr1325-2.cc
similarity index 100%
rename from libstdc++-v3/testsuite/23_containers/bitset/cons/dr1325-2.cc
rename to libstdc++-v3/testsuite/20_util/bitset/cons/dr1325-2.cc
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/cons/dr396.cc b/libstdc++-v3/testsuite/20_util/bitset/cons/dr396.cc
similarity index 100%
rename from libstdc++-v3/testsuite/23_containers/bitset/cons/dr396.cc
rename to libstdc++-v3/testsuite/20_util/bitset/cons/dr396.cc
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/debug/invalidation/1.cc b/libstdc++-v3/testsuite/20_util/bitset/debug/invalidation/1.cc
similarity index 100%
rename from libstdc++-v3/testsuite/23_containers/bitset/debug/invalidation/1.cc
rename to libstdc++-v3/testsuite/20_util/bitset/debug/invalidation/1.cc
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/ext/15361.cc b/libstdc++-v3/testsuite/20_util/bitset/ext/15361.cc
similarity index 100%
rename from libstdc++-v3/testsuite/23_containers/bitset/ext/15361.cc
rename to libstdc++-v3/testsuite/20_util/bitset/ext/15361.cc
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/hash/1.cc b/libstdc++-v3/testsuite/20_util/bitset/hash/1.cc
similarity index 100%
rename from libstdc++-v3/testsuite/23_containers/bitset/hash/1.cc
rename to libstdc++-v3/testsuite/20_util/bitset/hash/1.cc
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/input/1.cc b/libstdc++-v3/testsuite/20_util/bitset/io/input.cc
similarity index 100%
rename from libstdc++-v3/testsuite/23_containers/bitset/input/1.cc
rename to libstdc++-v3/testsuite/20_util/bitset/io/input.cc
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/count/6124.cc b/libstdc++-v3/testsuite/20_util/bitset/observers/6124.cc
similarity index 100%
rename from libstdc++-v3/testsuite/23_containers/bitset/count/6124.cc
rename to libstdc++-v3/testsuite/20_util/bitset/observers/6124.cc
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/all/1.cc b/libstdc++-v3/testsuite/20_util/bitset/observers/all.cc
similarity index 100%
rename from libstdc++-v3/testsuite/23_containers/bitset/all/1.cc
rename to libstdc++-v3/testsuite/20_util/bitset/observers/all.cc
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/test/1.cc b/libstdc++-v3/testsuite/20_util/bitset/observers/test.cc
similarity index 100%
rename from libstdc++-v3/testsuite/23_containers/bitset/test/1.cc
rename to libstdc++-v3/testsuite/20_util/bitset/observers/test.cc
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/operations/1.cc b/libstdc++-v3/testsuite/20_util/bitset/operations/1.cc
similarity index 100%
rename from libstdc++-v3/testsuite/23_containers/bitset/operations/1.cc
rename to libstdc++-v3/testsuite/20_util/bitset/operations/1.cc
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/operations/13838.cc b/libstdc++-v3/testsuite/20_util/bitset/operations/13838.cc
similarity index 100%
rename from libstdc++-v3/testsuite/23_containers/bitset/operations/13838.cc
rename to libstdc++-v3/testsuite/20_util/bitset/operations/13838.cc
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/operations/2.cc b/libstdc++-v3/testsuite/20_util/bitset/operations/2.cc
similarity index 100%
rename from libstdc++-v3/testsuite/23_containers/bitset/operations/2.cc
rename to libstdc++-v3/testsuite/20_util/bitset/operations/2.cc
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/operations/96303.cc b/libstdc++-v3/testsuite/20_util/bitset/operations/96303.cc
similarity index 100%
rename from libstdc++-v3/testsuite/23_containers/bitset/operations/96303.cc
rename to libstdc++-v3/testsuite/20_util/bitset/operations/96303.cc
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/operations/constexpr-2.cc b/libstdc++-v3/testsuite/20_util/bitset/operations/constexpr-2.cc
similarity index 100%
rename from libstdc++-v3/testsuite/23_containers/bitset/operations/constexpr-2.cc
rename to libstdc++-v3/testsuite/20_util/bitset/operations/constexpr-2.cc
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/operations/constexpr.cc b/libstdc++-v3/testsuite/20_util/bitset/operations/constexpr.cc
similarity index 100%
rename from libstdc++-v3/testsuite/23_containers/bitset/operations/constexpr.cc
rename to libstdc++-v3/testsuite/20_util/bitset/operations/constexpr.cc
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/requirements/constexpr_functions.cc b/libstdc++-v3/testsuite/20_util/bitset/requirements/constexpr_functions.cc
similarity index 100%
rename from libstdc++-v3/testsuite/23_containers/bitset/requirements/constexpr_functions.cc
rename to libstdc++-v3/testsuite/20_util/bitset/requirements/constexpr_functions.cc
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/requirements/explicit_instantiation/1.cc b/libstdc++-v3/testsuite/20_util/bitset/requirements/explicit_instantiation/1.cc
similarity index 100%
rename from libstdc++-v3/testsuite/23_containers/bitset/requirements/explicit_instantiation/1.cc
rename to libstdc++-v3/testsuite/20_util/bitset/requirements/explicit_instantiation/1.cc
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/requirements/explicit_instantiation/1_c++0x.cc b/libstdc++-v3/testsuite/20_util/bitset/requirements/explicit_instantiation/1_c++0x.cc
similarity index 100%
rename from libstdc++-v3/testsuite/23_containers/bitset/requirements/explicit_instantiation/1_c++0x.cc
rename to libstdc++-v3/testsuite/20_util/bitset/requirements/explicit_instantiation/1_c++0x.cc
diff --git a/libstdc++-v3/testsuite/23_containers/headers/bitset/synopsis.cc b/libstdc++-v3/testsuite/20_util/headers/bitset/synopsis.cc
similarity index 100%
rename from libstdc++-v3/testsuite/23_containers/headers/bitset/synopsis.cc
rename to libstdc++-v3/testsuite/20_util/headers/bitset/synopsis.cc