diff --git a/Makefile b/Makefile
index 8d462915e..8eb5928f3 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,9 @@ DEB=${PACKAGE}_${VERSION}-${PACKAGERELEASE}_${ARCH}.deb
 all: ${SUBDIRS}
 	set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i; done
 
-check:
+.PHONY: check
+check: bin tests
+	${MAKE} -C bin check
 	${MAKE} -C test check
 
 .PHONY: dinstall
diff --git a/bin/Makefile b/bin/Makefile
index 761e7f53f..d62878335 100644
--- a/bin/Makefile
+++ b/bin/Makefile
@@ -52,11 +52,12 @@ pvereport.1.pod: pvereport
 pvemailforward: pvemailforward.c
 	$(CC) $(CPPFLAGS) $(CFLAGS) -Wall -g -O2 $< -o $@
 
+.PHONY: check
+check: $(addsuffix .service-api-verified, ${SERVICES}) $(addsuffix .api-verified, ${CLITOOLS})
+	rm -f *.service-api-verified *.api-verified
+
 .PHONY: install
 install: ${SCRIPTS} ${CLI_MANS} ${SERVICE_MANS} pvemailforward ${BASH_COMPLETIONS}
-	perl -I.. ./pvesh verifyapi
-	for i in ${CLITOOLS}; do perl -I.. -T -e "use PVE::CLI::$$i; PVE::CLI::$$i->verify_api();"; done
-	for i in ${SERVICES}; do perl -I.. -T -e "use PVE::Service::$$i; PVE::Service::$$i->verify_api();"; done
 	install -d ${BINDIR}
 	install -m 0755 ${SCRIPTS} ${BINDIR}
 	install -s -m 2755 -g www-data pvemailforward ${BINDIR}
@@ -70,4 +71,4 @@ install: ${SCRIPTS} ${CLI_MANS} ${SERVICE_MANS} pvemailforward ${BASH_COMPLETION
 .PHONY: clean
 clean:
 	make cleanup-docgen
-	rm -rf *~ *.tmp ${CLI_MANS} ${SERVICE_MANS} *.1.pod *.8.pod pvemailforward *.bash-completion *.service-bash-completion
+	rm -rf *~ *.tmp ${CLI_MANS} ${SERVICE_MANS} *.1.pod *.8.pod pvemailforward *.bash-completion *.service-bash-completion *.api-verified *.service-api-verified