diff --git a/Makefile b/Makefile
index ddc4670e8cf379b6e636a430b74e835f5882ec85..c1475b8981e87126f9da9bb0357f8e5df296ae06 100644
--- a/Makefile
+++ b/Makefile
@@ -57,15 +57,24 @@ format:
 
 build-debug: conan-install-debug
 	# cmake --preset conan-debug && cmake --build build/Debug # for CMake >= 3.23
+	@command -v iwyu || command include-what-you-use || \
+	  (echo "Could not find 'iwyu', exiting."; exit 1)
+	@command -v clang-tidy || command -v clang-tidy-16 || \
+	  (echo "Could not find 'clang-tidy'(-16), exiting."; exit 1)
 	cd build/Debug &&\
 	cmake -S ../.. -G "Unix Makefiles" -DCMAKE_TOOLCHAIN_FILE=generators/conan_toolchain.cmake  -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_BUILD_TYPE=Debug &&\
 	cmake --build .
 
 build-release: conan-install-release
 	# cmake --preset conan-release # for CMake >= 3.23
+	@command -v iwyu || command include-what-you-use || \
+	  (echo "Could not find 'iwyu', exiting."; exit 1)
+	@command -v clang-tidy || command -v clang-tidy-16 || \
+	  (echo "Could not find 'clang-tidy'(-16), exiting."; exit 1)
 	cd build/Release &&\
-	cmake -S ../.. -G "Unix Makefiles" -DCMAKE_TOOLCHAIN_FILE=generators/conan_toolchain.cmake  -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_BUILD_TYPE=Release &&\
-	cmake -DCMAKE_VERBOSE_MAKEFILE --build .
+	  cmake -S ../.. -G "Unix Makefiles" -DCMAKE_TOOLCHAIN_FILE=generators/conan_toolchain.cmake  -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_BUILD_TYPE=Release &&\
+	  cmake --build .
+	# cmake --build . --verbose
 
 
 test-debug: build-debug
diff --git a/README.md b/README.md
index e1680f34fb9064245ffe386a692a14a6d54a7f8f..510518c88a4dcb99280f6fea260229ba6ba8e3b6 100644
--- a/README.md
+++ b/README.md
@@ -4,9 +4,9 @@ Integration tests for linkahead-cpplib and the linkahead-server
 
 # Dependencies
 
-* clang-tidy
+* clang-tidy-16
 * clang-format
-* include-what-you-use
+* iwyu / include-what-you-use
 * cmake
 * conan
 
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 4c10d0de2c46c7738048404f04242eefa118afd7..9fcfff044d98b4b5129aa2db057e6caa4f8f809a 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -80,7 +80,7 @@ if(LINTING)
             "-Xiwyu" "--cxx17ns")
     endif()
 
-    find_program(clang_tidy NAMES clang-tidy clang-tidy-11)
+    find_program(clang_tidy NAMES clang-tidy clang-tidy-16)
     if(NOT clang_tidy)
         message(WARNING "clang-tidy: Not found")
     else()