diff --git a/clang/tools/CMakeLists.txt b/clang/tools/CMakeLists.txt
index 2f2ac95d3317d..ee101580f490e 100644
--- a/clang/tools/CMakeLists.txt
+++ b/clang/tools/CMakeLists.txt
@@ -25,10 +25,12 @@ endif()
 if(CLANG_INCLUDE_TESTS)
   add_clang_subdirectory(c-index-test)
   add_clang_subdirectory(apinotes-test)
-  add_clang_subdirectory(clang-cas-test)
   add_clang_subdirectory(clang-refactor-test)
 endif()
 
+# Add clang-cas-test unconditionally, as it is not only used by tests.
+add_clang_subdirectory(clang-cas-test)
+
 add_clang_subdirectory(IndexStore)
 
 add_clang_subdirectory(clang-refactor)