diff --git a/cmake/FindClang.cmake b/cmake/FindClang.cmake
index 1133558dc76..a62ebb5ba4b 100644
--- a/cmake/FindClang.cmake
+++ b/cmake/FindClang.cmake
@@ -1,21 +1,12 @@
 find_package(Clang CONFIG)
 
-# silence a lot of warnings from building against llvm
-if(MSVC AND TARGET libclang)
-    target_compile_options(libclang INTERFACE /wd4267)
-endif()
-
 option(CLANGTOOLING_LINK_CLANG_DYLIB "Force linking of Clang tooling against clang-cpp" NO)
 
-if (TARGET clangTooling AND NOT CLANGTOOLING_LINK_CLANG_DYLIB)
-  set(CLANG_TOOLING_LIBS libclang clangTooling clangQuery clangIndex)
-  set(CLANG_FORMAT_LIB clangFormat)
-elseif (TARGET clang-cpp)
-  set(CLANG_TOOLING_LIBS libclang clang-cpp)
+set(CLANG_FORMAT_LIB clangFormat)
+if (TARGET clang-cpp AND CLANGTOOLING_LINK_CLANG_DYLIB)
   set(CLANG_FORMAT_LIB clang-cpp)
 endif()
 
-
 if (WIN32 AND TARGET clangTooling)
   # check that we can compile against clangTooling
   # which requires the build modes to be compatible
diff --git a/src/plugins/clangformat/CMakeLists.txt b/src/plugins/clangformat/CMakeLists.txt
index f2eff70c581..3c648da5923 100644
--- a/src/plugins/clangformat/CMakeLists.txt
+++ b/src/plugins/clangformat/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_qtc_plugin(ClangFormat
-  CONDITION TARGET libclang AND LLVM_PACKAGE_VERSION VERSION_GREATER_EQUAL 10.0.0 AND (QTC_CLANG_BUILDMODE_MATCH OR CLANGTOOLING_LINK_CLANG_DYLIB)
+  CONDITION TARGET ${CLANG_FORMAT_LIB} AND LLVM_PACKAGE_VERSION VERSION_GREATER_EQUAL 10.0.0 AND (QTC_CLANG_BUILDMODE_MATCH OR CLANGTOOLING_LINK_CLANG_DYLIB)
   DEPENDS Utils Qt5::Widgets ${CLANG_FORMAT_LIB}
   PLUGIN_DEPENDS Core TextEditor CppEditor ProjectExplorer
   SOURCES
diff --git a/src/plugins/projectexplorer/CMakeLists.txt b/src/plugins/projectexplorer/CMakeLists.txt
index e7a11d9a4bd..94e26e39432 100644
--- a/src/plugins/projectexplorer/CMakeLists.txt
+++ b/src/plugins/projectexplorer/CMakeLists.txt
@@ -191,8 +191,8 @@ extend_qtc_plugin(ProjectExplorer
   DEFINES "PROJECT_USER_FILE_EXTENSION=${PROJECT_USER_FILE_EXTENSION}"
 )
 
-if (TARGET libclang)
-  set(CLANG_BINDIR "$<TARGET_FILE_DIR:libclang>")
+if (TARGET clangd)
+  set(CLANG_BINDIR "$<TARGET_FILE_DIR:clangd>")
 endif()
 extend_qtc_plugin(ProjectExplorer
   DEFINES "CLANG_BINDIR=\"${CLANG_BINDIR}\""
diff --git a/tests/unit/unittest/CMakeLists.txt b/tests/unit/unittest/CMakeLists.txt
index dc243e75aa6..502390cedfc 100644
--- a/tests/unit/unittest/CMakeLists.txt
+++ b/tests/unit/unittest/CMakeLists.txt
@@ -1,12 +1,3 @@
-if (TARGET libclang)
-  set(HAVE_LIBCLANG ON)
-endif()
-
-if (HAVE_LIBCLANG AND NOT QTC_CLANG_BUILDMODE_MATCH)
-    message(STATUS "Disabling libclang tests due to build mode mismatch.")
-    set(HAVE_LIBCLANG OFF)
-endif()
-
 find_package(Googletest MODULE)
 find_package(GoogleBenchmark MODULE)
 
@@ -151,15 +142,9 @@ add_custom_command(TARGET unittest POST_BUILD
 )
 
 extend_qtc_test(unittest
-  CONDITION HAVE_LIBCLANG
-  INCLUDES "${CLANG_INCLUDE_DIRS}"
-  DEFINES CLANG_UNIT_TESTS
-  DEPENDS libclang
   SOURCES
     activationsequenceprocessor-test.cpp
     readexporteddiagnostics-test.cpp
-    clangcompareoperators.h
-    diagnosticcontainer-matcher.h
 )
 
 extend_qtc_test(unittest