diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/compare/char/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operations/compare/char/1.cc
similarity index 100%
rename from libstdc++-v3/testsuite/21_strings/basic_string/compare/char/1.cc
rename to libstdc++-v3/testsuite/21_strings/basic_string/operations/compare/char/1.cc
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/compare/char/13650.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operations/compare/char/13650.cc
similarity index 100%
rename from libstdc++-v3/testsuite/21_strings/basic_string/compare/char/13650.cc
rename to libstdc++-v3/testsuite/21_strings/basic_string/operations/compare/char/13650.cc
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/compare/wchar_t/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operations/compare/wchar_t/1.cc
similarity index 100%
rename from libstdc++-v3/testsuite/21_strings/basic_string/compare/wchar_t/1.cc
rename to libstdc++-v3/testsuite/21_strings/basic_string/operations/compare/wchar_t/1.cc
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/compare/wchar_t/13650.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operations/compare/wchar_t/13650.cc
similarity index 100%
rename from libstdc++-v3/testsuite/21_strings/basic_string/compare/wchar_t/13650.cc
rename to libstdc++-v3/testsuite/21_strings/basic_string/operations/compare/wchar_t/13650.cc
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/operations/char/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operations/data/char/1.cc
similarity index 100%
rename from libstdc++-v3/testsuite/21_strings/basic_string/operations/char/1.cc
rename to libstdc++-v3/testsuite/21_strings/basic_string/operations/data/char/1.cc
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/operations/wchar_t/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operations/data/wchar_t/1.cc
similarity index 100%
rename from libstdc++-v3/testsuite/21_strings/basic_string/operations/wchar_t/1.cc
rename to libstdc++-v3/testsuite/21_strings/basic_string/operations/data/wchar_t/1.cc
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/find/char/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operations/find/char/1.cc
similarity index 100%
rename from libstdc++-v3/testsuite/21_strings/basic_string/find/char/1.cc
rename to libstdc++-v3/testsuite/21_strings/basic_string/operations/find/char/1.cc
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/find/char/2.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operations/find/char/2.cc
similarity index 100%
rename from libstdc++-v3/testsuite/21_strings/basic_string/find/char/2.cc
rename to libstdc++-v3/testsuite/21_strings/basic_string/operations/find/char/2.cc
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/find/char/3.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operations/find/char/3.cc
similarity index 100%
rename from libstdc++-v3/testsuite/21_strings/basic_string/find/char/3.cc
rename to libstdc++-v3/testsuite/21_strings/basic_string/operations/find/char/3.cc
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/find/char/4.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operations/find/char/4.cc
similarity index 100%
rename from libstdc++-v3/testsuite/21_strings/basic_string/find/char/4.cc
rename to libstdc++-v3/testsuite/21_strings/basic_string/operations/find/char/4.cc
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/find/wchar_t/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operations/find/wchar_t/1.cc
similarity index 100%
rename from libstdc++-v3/testsuite/21_strings/basic_string/find/wchar_t/1.cc
rename to libstdc++-v3/testsuite/21_strings/basic_string/operations/find/wchar_t/1.cc
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/find/wchar_t/2.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operations/find/wchar_t/2.cc
similarity index 100%
rename from libstdc++-v3/testsuite/21_strings/basic_string/find/wchar_t/2.cc
rename to libstdc++-v3/testsuite/21_strings/basic_string/operations/find/wchar_t/2.cc
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/find/wchar_t/3.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operations/find/wchar_t/3.cc
similarity index 100%
rename from libstdc++-v3/testsuite/21_strings/basic_string/find/wchar_t/3.cc
rename to libstdc++-v3/testsuite/21_strings/basic_string/operations/find/wchar_t/3.cc
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/find/wchar_t/4.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operations/find/wchar_t/4.cc
similarity index 100%
rename from libstdc++-v3/testsuite/21_strings/basic_string/find/wchar_t/4.cc
rename to libstdc++-v3/testsuite/21_strings/basic_string/operations/find/wchar_t/4.cc
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/rfind/char/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operations/rfind/char/1.cc
similarity index 100%
rename from libstdc++-v3/testsuite/21_strings/basic_string/rfind/char/1.cc
rename to libstdc++-v3/testsuite/21_strings/basic_string/operations/rfind/char/1.cc
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/rfind/char/2.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operations/rfind/char/2.cc
similarity index 100%
rename from libstdc++-v3/testsuite/21_strings/basic_string/rfind/char/2.cc
rename to libstdc++-v3/testsuite/21_strings/basic_string/operations/rfind/char/2.cc
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/rfind/char/3.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operations/rfind/char/3.cc
similarity index 100%
rename from libstdc++-v3/testsuite/21_strings/basic_string/rfind/char/3.cc
rename to libstdc++-v3/testsuite/21_strings/basic_string/operations/rfind/char/3.cc
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/rfind/wchar_t/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operations/rfind/wchar_t/1.cc
similarity index 100%
rename from libstdc++-v3/testsuite/21_strings/basic_string/rfind/wchar_t/1.cc
rename to libstdc++-v3/testsuite/21_strings/basic_string/operations/rfind/wchar_t/1.cc
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/rfind/wchar_t/2.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operations/rfind/wchar_t/2.cc
similarity index 100%
rename from libstdc++-v3/testsuite/21_strings/basic_string/rfind/wchar_t/2.cc
rename to libstdc++-v3/testsuite/21_strings/basic_string/operations/rfind/wchar_t/2.cc
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/rfind/wchar_t/3.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operations/rfind/wchar_t/3.cc
similarity index 100%
rename from libstdc++-v3/testsuite/21_strings/basic_string/rfind/wchar_t/3.cc
rename to libstdc++-v3/testsuite/21_strings/basic_string/operations/rfind/wchar_t/3.cc
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/substr/char/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operations/substr/char/1.cc
similarity index 100%
rename from libstdc++-v3/testsuite/21_strings/basic_string/substr/char/1.cc
rename to libstdc++-v3/testsuite/21_strings/basic_string/operations/substr/char/1.cc
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/substr/wchar_t/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string/operations/substr/wchar_t/1.cc
similarity index 100%
rename from libstdc++-v3/testsuite/21_strings/basic_string/substr/wchar_t/1.cc
rename to libstdc++-v3/testsuite/21_strings/basic_string/operations/substr/wchar_t/1.cc