diff --git a/lldb/CMakeLists.txt b/lldb/CMakeLists.txt
index 573b8556989e..00b06119d64a 100644
--- a/lldb/CMakeLists.txt
+++ b/lldb/CMakeLists.txt
@@ -92,8 +92,7 @@ option(LLDB_INCLUDE_TESTS "Generate build targets for the LLDB unit tests." ${LL
 if(LLDB_INCLUDE_TESTS)
   add_subdirectory(test)
   add_subdirectory(unittests)
-  add_subdirectory(utils/lit-cpuid)
-  add_subdirectory(utils/lldb-dotest)
+  add_subdirectory(utils)
 endif()
 
 if (LLDB_ENABLE_PYTHON)
diff --git a/lldb/utils/CMakeLists.txt b/lldb/utils/CMakeLists.txt
new file mode 100644
index 000000000000..d08f66f7b6c5
--- /dev/null
+++ b/lldb/utils/CMakeLists.txt
@@ -0,0 +1,2 @@
+add_subdirectory(lit-cpuid)
+add_subdirectory(lldb-dotest)