diff --git a/.travis.yml b/.travis.yml
index 8d8a18f..47db786 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,7 @@ addons:
       - ubuntu-toolchain-r-test
     packages:
       - gcc-7
+      - cppcheck
 script:
   - export CC=gcc-7
   - make test
diff --git a/Makefile b/Makefile
index d72d90f..99beef4 100644
--- a/Makefile
+++ b/Makefile
@@ -45,9 +45,6 @@ cbor: $(LIBCBOR)
 $(LIBCBOR): tinycbor/Makefile
 	cd tinycbor/ && $(MAKE) clean && $(MAKE) -j8
 
-test:
-	$(MAKE) -C . main
-
 .PHONY: efm8prog
 efm8prog:
 	cd './targets/efm8\Keil 8051 v9.53 - Debug' && $(MAKE) all
@@ -92,6 +89,16 @@ wink3: env3
 fido2-test: env3
 	env3/bin/python tools/ctap_test.py
 
+CPPCHECK_FLAGS=--quiet --error-exitcode=2
+
+cppcheck:
+	cppcheck $(CPPCHECK_FLAGS) crypto/aes-gcm
+	cppcheck $(CPPCHECK_FLAGS) crypto/sha256
+	cppcheck $(CPPCHECK_FLAGS) fido2
+	cppcheck $(CPPCHECK_FLAGS) pc
+
+test: main cppcheck
+
 clean:
 	rm -f *.o main.exe main $(obj)
 	rm -rf env2 env3