Index: clangd/test/CMakeLists.txt
===================================================================
--- clangd/test/CMakeLists.txt
+++ clangd/test/CMakeLists.txt
@@ -8,6 +8,7 @@
 
 if(CLANGD_BUILD_XPC)
   list(APPEND CLANGD_TEST_DEPS clangd-xpc-test-client)
+  list(APPEND CLANGD_TEST_DEPS ClangdXpcUnitTests)
 endif()
 
 foreach(dep FileCheck count not)
Index: clangd/unittests/xpc/CMakeLists.txt
===================================================================
--- clangd/unittests/xpc/CMakeLists.txt
+++ clangd/unittests/xpc/CMakeLists.txt
@@ -8,7 +8,8 @@
   ${CLANGD_SOURCE_DIR}
   )
 
-add_extra_unittest(ClangdXpcTests
+add_custom_target(ClangdXpcUnitTests)
+add_unittest(ClangdXpcUnitTests ClangdXpcTests
   ConversionTests.cpp
   )