diff --git a/libc/test/src/__support/CMakeLists.txt b/libc/test/src/__support/CMakeLists.txt
index 20d0e2d75745..923db635c8a5 100644
--- a/libc/test/src/__support/CMakeLists.txt
+++ b/libc/test/src/__support/CMakeLists.txt
@@ -49,4 +49,5 @@ add_custom_command(TARGET libc_str_to_float_comparison_test
                    COMMENT "Test the strtof and strtod implementations against precomputed results." 
                    VERBATIM)
 
+add_subdirectory(CPP)
 add_subdirectory(OSUtil)
diff --git a/libc/test/utils/CPP/CMakeLists.txt b/libc/test/src/__support/CPP/CMakeLists.txt
similarity index 100%
rename from libc/test/utils/CPP/CMakeLists.txt
rename to libc/test/src/__support/CPP/CMakeLists.txt
diff --git a/libc/test/utils/CPP/arrayref_test.cpp b/libc/test/src/__support/CPP/arrayref_test.cpp
similarity index 100%
rename from libc/test/utils/CPP/arrayref_test.cpp
rename to libc/test/src/__support/CPP/arrayref_test.cpp
diff --git a/libc/test/utils/CPP/bitset_test.cpp b/libc/test/src/__support/CPP/bitset_test.cpp
similarity index 100%
rename from libc/test/utils/CPP/bitset_test.cpp
rename to libc/test/src/__support/CPP/bitset_test.cpp
diff --git a/libc/test/utils/CPP/limits_test.cpp b/libc/test/src/__support/CPP/limits_test.cpp
similarity index 100%
rename from libc/test/utils/CPP/limits_test.cpp
rename to libc/test/src/__support/CPP/limits_test.cpp
diff --git a/libc/test/utils/CPP/stringview_test.cpp b/libc/test/src/__support/CPP/stringview_test.cpp
similarity index 100%
rename from libc/test/utils/CPP/stringview_test.cpp
rename to libc/test/src/__support/CPP/stringview_test.cpp
diff --git a/libc/test/utils/CPP/vector_test.cpp b/libc/test/src/__support/CPP/vector_test.cpp
similarity index 100%
rename from libc/test/utils/CPP/vector_test.cpp
rename to libc/test/src/__support/CPP/vector_test.cpp
diff --git a/libc/test/utils/CMakeLists.txt b/libc/test/utils/CMakeLists.txt
index ae00987eeda4..d98c401f18a8 100644
--- a/libc/test/utils/CMakeLists.txt
+++ b/libc/test/utils/CMakeLists.txt
@@ -1,5 +1,4 @@
 add_subdirectory(FPUtil)
-add_subdirectory(CPP)
 add_subdirectory(UnitTest)
 
 if(NOT LLVM_LIBC_FULL_BUILD)