Index: lldb/test/CMakeLists.txt
===================================================================
--- lldb/test/CMakeLists.txt
+++ lldb/test/CMakeLists.txt
@@ -40,9 +40,16 @@
   endforeach()
 endfunction(add_lldb_test_dependency)
 
-# lldb itself and lldb-test is an hard dependency for the testsuites.
+# lldb itselt, lldb-test and the different debugservers are an hard dependency
+# for the testsuites.
 add_lldb_test_dependency(lldb)
 add_lldb_test_dependency(lldb-test)
+if(TARGET debugserver)
+  add_lldb_test_dependency(debugserver)
+endif()
+if(TARGET lldb-server)
+  add_lldb_test_dependency(lldb-server)
+endif()
 
 # On Darwin, darwin-debug is an hard dependency for the testsuites.
 if (CMAKE_SYSTEM_NAME MATCHES "Darwin")