diff --git a/.ci/common/test.sh b/.ci/common/test.sh
index 4137472385..b28e46a4df 100644
--- a/.ci/common/test.sh
+++ b/.ci/common/test.sh
@@ -109,10 +109,6 @@ run_oldtests() {
   check_core_dumps
 }
 
-run_single_includes_tests() {
-  ${MAKE_CMD} -C "${BUILD_DIR}" check-single-includes
-}
-
 install_nvim() {
   ${MAKE_CMD} -C "${BUILD_DIR}" install
 
diff --git a/.ci/run_tests.sh b/.ci/run_tests.sh
index d994db471f..6347ac15d4 100755
--- a/.ci/run_tests.sh
+++ b/.ci/run_tests.sh
@@ -10,7 +10,6 @@ source "${CI_DIR}/common/test.sh"
 check_core_dumps --delete quiet
 
 prepare_build
-run_single_includes_tests
 build_nvim
 
 if [ "$CLANG_SANITIZER" != "TSAN" ]; then
diff --git a/Makefile b/Makefile
index 47fb1e5edd..d2f6c11b19 100644
--- a/Makefile
+++ b/Makefile
@@ -132,9 +132,9 @@ clint:
 		-DLINT_SUPPRESS_URL="$(DOC_DOWNLOAD_URL_BASE)$(CLINT_ERRORS_FILE_PATH)" \
 		-P cmake/RunLint.cmake
 
-lint: clint testlint
-
 check-single-includes: build/.ran-cmake
 	+$(BUILD_CMD) -C build check-single-includes
 
+lint: check-single-includes clint testlint
+
 .PHONY: test testlint functionaltest unittest lint clint clean distclean nvim libnvim cmake deps install