diff --git a/libcxx/test/libcxx/containers/gnu_cxx/hash_map.pass.cpp b/libcxx/test/extensions/gnu/hash_map/hash_map.pass.cpp
similarity index 100%
rename from libcxx/test/libcxx/containers/gnu_cxx/hash_map.pass.cpp
rename to libcxx/test/extensions/gnu/hash_map/hash_map.pass.cpp
diff --git a/libcxx/test/libcxx/containers/gnu_cxx/hash_map_name_lookup.pass.cpp b/libcxx/test/extensions/gnu/hash_map/hash_map_name_lookup.pass.cpp
similarity index 100%
rename from libcxx/test/libcxx/containers/gnu_cxx/hash_map_name_lookup.pass.cpp
rename to libcxx/test/extensions/gnu/hash_map/hash_map_name_lookup.pass.cpp
diff --git a/libcxx/test/libcxx/containers/gnu_cxx/hash_set.pass.cpp b/libcxx/test/extensions/gnu/hash_set/hash_set.pass.cpp
similarity index 100%
rename from libcxx/test/libcxx/containers/gnu_cxx/hash_set.pass.cpp
rename to libcxx/test/extensions/gnu/hash_set/hash_set.pass.cpp
diff --git a/libcxx/test/libcxx/containers/gnu_cxx/hash_set_name_lookup.pass.cpp b/libcxx/test/extensions/gnu/hash_set/hash_set_name_lookup.pass.cpp
similarity index 100%
rename from libcxx/test/libcxx/containers/gnu_cxx/hash_set_name_lookup.pass.cpp
rename to libcxx/test/extensions/gnu/hash_set/hash_set_name_lookup.pass.cpp
diff --git a/libcxx/test/libcxx/atomics/atomics.flag/init_bool.pass.cpp b/libcxx/test/extensions/libcxx/atomics/atomics.flag/init_bool.pass.cpp
similarity index 100%
rename from libcxx/test/libcxx/atomics/atomics.flag/init_bool.pass.cpp
rename to libcxx/test/extensions/libcxx/atomics/atomics.flag/init_bool.pass.cpp
diff --git a/libcxx/test/libcxx/containers/associative/map/scary.compile.pass.cpp b/libcxx/test/extensions/libcxx/containers/associative/map/scary.compile.pass.cpp
similarity index 100%
rename from libcxx/test/libcxx/containers/associative/map/scary.compile.pass.cpp
rename to libcxx/test/extensions/libcxx/containers/associative/map/scary.compile.pass.cpp
diff --git a/libcxx/test/libcxx/containers/associative/set/scary.compile.pass.cpp b/libcxx/test/extensions/libcxx/containers/associative/set/scary.compile.pass.cpp
similarity index 100%
rename from libcxx/test/libcxx/containers/associative/set/scary.compile.pass.cpp
rename to libcxx/test/extensions/libcxx/containers/associative/set/scary.compile.pass.cpp
diff --git a/libcxx/test/libcxx/containers/associative/unord.map/scary.compile.pass.cpp b/libcxx/test/extensions/libcxx/containers/associative/unord.map/scary.compile.pass.cpp
similarity index 100%
rename from libcxx/test/libcxx/containers/associative/unord.map/scary.compile.pass.cpp
rename to libcxx/test/extensions/libcxx/containers/associative/unord.map/scary.compile.pass.cpp
diff --git a/libcxx/test/libcxx/containers/associative/unord.set/scary.compile.pass.cpp b/libcxx/test/extensions/libcxx/containers/associative/unord.set/scary.compile.pass.cpp
similarity index 100%
rename from libcxx/test/libcxx/containers/associative/unord.set/scary.compile.pass.cpp
rename to libcxx/test/extensions/libcxx/containers/associative/unord.set/scary.compile.pass.cpp
diff --git a/libcxx/test/libcxx/containers/sequences/deque/incomplete.pass.cpp b/libcxx/test/extensions/libcxx/containers/sequences/deque/incomplete.pass.cpp
similarity index 100%
rename from libcxx/test/libcxx/containers/sequences/deque/incomplete.pass.cpp
rename to libcxx/test/extensions/libcxx/containers/sequences/deque/incomplete.pass.cpp
diff --git a/libcxx/test/libcxx/depr/depr.c.headers/extern_c.pass.cpp b/libcxx/test/extensions/libcxx/depr/depr.c.headers/extern_c.pass.cpp
similarity index 100%
rename from libcxx/test/libcxx/depr/depr.c.headers/extern_c.pass.cpp
rename to libcxx/test/extensions/libcxx/depr/depr.c.headers/extern_c.pass.cpp
diff --git a/libcxx/test/extensions/libcxx/include_as_c.sh.cpp b/libcxx/test/extensions/libcxx/depr/depr.c.headers/include_as_c.sh.cpp
similarity index 100%
rename from libcxx/test/extensions/libcxx/include_as_c.sh.cpp
rename to libcxx/test/extensions/libcxx/depr/depr.c.headers/include_as_c.sh.cpp
diff --git a/libcxx/test/libcxx/depr/depr.c.headers/stdint_h.std_types_t.compile.pass.cpp b/libcxx/test/extensions/libcxx/depr/depr.c.headers/stdint_h.std_types_t.compile.pass.cpp
similarity index 100%
rename from libcxx/test/libcxx/depr/depr.c.headers/stdint_h.std_types_t.compile.pass.cpp
rename to libcxx/test/extensions/libcxx/depr/depr.c.headers/stdint_h.std_types_t.compile.pass.cpp
diff --git a/libcxx/test/libcxx/depr/depr.c.headers/stdint_h.xopen_source.compile.pass.cpp b/libcxx/test/extensions/libcxx/depr/depr.c.headers/stdint_h.xopen_source.compile.pass.cpp
similarity index 100%
rename from libcxx/test/libcxx/depr/depr.c.headers/stdint_h.xopen_source.compile.pass.cpp
rename to libcxx/test/extensions/libcxx/depr/depr.c.headers/stdint_h.xopen_source.compile.pass.cpp
diff --git a/libcxx/test/libcxx/depr/depr.c.headers/math_h.compile.pass.cpp b/libcxx/test/extensions/msvc/math_h.compile.pass.cpp
similarity index 100%
rename from libcxx/test/libcxx/depr/depr.c.headers/math_h.compile.pass.cpp
rename to libcxx/test/extensions/msvc/math_h.compile.pass.cpp