diff --git a/libcxx/test/std/thread/thread.barrier/version.pass.cpp b/libcxx/test/libcxx/thread/thread.barrier/version.compile.pass.cpp
similarity index 100%
rename from libcxx/test/std/thread/thread.barrier/version.pass.cpp
rename to libcxx/test/libcxx/thread/thread.barrier/version.compile.pass.cpp
diff --git a/libcxx/test/std/thread/thread.latch/version.pass.cpp b/libcxx/test/libcxx/thread/thread.latch/version.compile.pass.cpp
similarity index 100%
rename from libcxx/test/std/thread/thread.latch/version.pass.cpp
rename to libcxx/test/libcxx/thread/thread.latch/version.compile.pass.cpp
diff --git a/libcxx/test/std/thread/thread.semaphore/version.pass.cpp b/libcxx/test/libcxx/thread/thread.semaphore/version.compile.pass.cpp
similarity index 100%
rename from libcxx/test/std/thread/thread.semaphore/version.pass.cpp
rename to libcxx/test/libcxx/thread/thread.semaphore/version.compile.pass.cpp
diff --git a/libcxx/test/std/utilities/format/version.compile.pass.cpp b/libcxx/test/libcxx/utilities/format/version.compile.pass.cpp
similarity index 100%
rename from libcxx/test/std/utilities/format/version.compile.pass.cpp
rename to libcxx/test/libcxx/utilities/format/version.compile.pass.cpp