diff --git a/libcxx/test/std/input.output/string.streams/stringstream.cons/stringstream.assign/member_swap.pass.cpp b/libcxx/test/std/input.output/string.streams/stringstream/stringstream.assign/member_swap.pass.cpp
rename from libcxx/test/std/input.output/string.streams/stringstream.cons/stringstream.assign/member_swap.pass.cpp
rename to libcxx/test/std/input.output/string.streams/stringstream/stringstream.assign/member_swap.pass.cpp
diff --git a/libcxx/test/std/input.output/string.streams/stringstream.cons/stringstream.assign/move.pass.cpp b/libcxx/test/std/input.output/string.streams/stringstream/stringstream.assign/move.pass.cpp
rename from libcxx/test/std/input.output/string.streams/stringstream.cons/stringstream.assign/move.pass.cpp
rename to libcxx/test/std/input.output/string.streams/stringstream/stringstream.assign/move.pass.cpp
diff --git a/libcxx/test/std/input.output/string.streams/stringstream.cons/stringstream.assign/nonmember_swap.pass.cpp b/libcxx/test/std/input.output/string.streams/stringstream/stringstream.assign/nonmember_swap.pass.cpp
rename from libcxx/test/std/input.output/string.streams/stringstream.cons/stringstream.assign/nonmember_swap.pass.cpp
rename to libcxx/test/std/input.output/string.streams/stringstream/stringstream.assign/nonmember_swap.pass.cpp
diff --git a/libcxx/test/std/input.output/string.streams/stringstream.cons/default.pass.cpp b/libcxx/test/std/input.output/string.streams/stringstream/stringstream.cons/default.pass.cpp
rename from libcxx/test/std/input.output/string.streams/stringstream.cons/default.pass.cpp
rename to libcxx/test/std/input.output/string.streams/stringstream/stringstream.cons/default.pass.cpp
diff --git a/libcxx/test/std/input.output/string.streams/stringstream.cons/move.pass.cpp b/libcxx/test/std/input.output/string.streams/stringstream/stringstream.cons/move.pass.cpp
rename from libcxx/test/std/input.output/string.streams/stringstream.cons/move.pass.cpp
rename to libcxx/test/std/input.output/string.streams/stringstream/stringstream.cons/move.pass.cpp
diff --git a/libcxx/test/std/input.output/string.streams/stringstream.cons/move2.pass.cpp b/libcxx/test/std/input.output/string.streams/stringstream/stringstream.cons/move2.pass.cpp
rename from libcxx/test/std/input.output/string.streams/stringstream.cons/move2.pass.cpp
rename to libcxx/test/std/input.output/string.streams/stringstream/stringstream.cons/move2.pass.cpp
diff --git a/libcxx/test/std/input.output/string.streams/stringstream.cons/string.pass.cpp b/libcxx/test/std/input.output/string.streams/stringstream/stringstream.cons/string.pass.cpp
rename from libcxx/test/std/input.output/string.streams/stringstream.cons/string.pass.cpp
rename to libcxx/test/std/input.output/string.streams/stringstream/stringstream.cons/string.pass.cpp
diff --git a/libcxx/test/std/input.output/string.streams/stringstream.members/gcount.pass.cpp b/libcxx/test/std/input.output/string.streams/stringstream/stringstream.members/gcount.pass.cpp
rename from libcxx/test/std/input.output/string.streams/stringstream.members/gcount.pass.cpp
rename to libcxx/test/std/input.output/string.streams/stringstream/stringstream.members/gcount.pass.cpp
diff --git a/libcxx/test/std/input.output/string.streams/stringstream.members/str.pass.cpp b/libcxx/test/std/input.output/string.streams/stringstream/stringstream.members/str.pass.cpp
rename from libcxx/test/std/input.output/string.streams/stringstream.members/str.pass.cpp
rename to libcxx/test/std/input.output/string.streams/stringstream/stringstream.members/str.pass.cpp
diff --git a/libcxx/test/std/input.output/string.streams/stringstream.members/view.pass.cpp b/libcxx/test/std/input.output/string.streams/stringstream/stringstream.members/view.pass.cpp
rename from libcxx/test/std/input.output/string.streams/stringstream.members/view.pass.cpp
rename to libcxx/test/std/input.output/string.streams/stringstream/stringstream.members/view.pass.cpp