diff --git a/libcxx/test/std/ranges/range.access/range.access.begin/begin.pass.cpp b/libcxx/test/std/ranges/range.access/begin.pass.cpp
rename from libcxx/test/std/ranges/range.access/range.access.begin/begin.pass.cpp
rename to libcxx/test/std/ranges/range.access/begin.pass.cpp
diff --git a/libcxx/test/std/ranges/range.access/range.prim/data.pass.cpp b/libcxx/test/std/ranges/range.access/data.pass.cpp
rename from libcxx/test/std/ranges/range.access/range.prim/data.pass.cpp
rename to libcxx/test/std/ranges/range.access/data.pass.cpp
diff --git a/libcxx/test/std/ranges/range.access/range.prim/empty.pass.cpp b/libcxx/test/std/ranges/range.access/empty.pass.cpp
rename from libcxx/test/std/ranges/range.access/range.prim/empty.pass.cpp
rename to libcxx/test/std/ranges/range.access/empty.pass.cpp
diff --git a/libcxx/test/std/ranges/range.access/range.access.end/end.pass.cpp b/libcxx/test/std/ranges/range.access/end.pass.cpp
rename from libcxx/test/std/ranges/range.access/range.access.end/end.pass.cpp
rename to libcxx/test/std/ranges/range.access/end.pass.cpp
diff --git a/libcxx/test/std/ranges/range.access/range.access.cbegin/cbegin.compile.pass.cpp b/libcxx/test/std/ranges/range.access/range.access.cbegin/cbegin.compile.pass.cpp
deleted file mode 100644
--- a/libcxx/test/std/ranges/range.access/range.access.cbegin/cbegin.compile.pass.cpp
+++ /dev/null
@@ -1 +0,0 @@
-// Tested in begin.pass.cpp.
diff --git a/libcxx/test/std/ranges/range.access/range.access.cend/cend.compile.pass.cpp b/libcxx/test/std/ranges/range.access/range.access.cend/cend.compile.pass.cpp
deleted file mode 100644
--- a/libcxx/test/std/ranges/range.access/range.access.cend/cend.compile.pass.cpp
+++ /dev/null
@@ -1 +0,0 @@
-// Tested in end.pass.cpp.
diff --git a/libcxx/test/std/ranges/range.access/range.prim/size.pass.cpp b/libcxx/test/std/ranges/range.access/size.pass.cpp
rename from libcxx/test/std/ranges/range.access/range.prim/size.pass.cpp
rename to libcxx/test/std/ranges/range.access/size.pass.cpp
diff --git a/libcxx/test/std/ranges/range.access/range.prim/ssize.pass.cpp b/libcxx/test/std/ranges/range.access/ssize.pass.cpp
rename from libcxx/test/std/ranges/range.access/range.prim/ssize.pass.cpp
rename to libcxx/test/std/ranges/range.access/ssize.pass.cpp