diff --git a/CMakeLists.txt b/CMakeLists.txt
index f0df878..592417a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -76,6 +76,13 @@
     COMMAND tests/scripts/test-ref-configs.pl
     )
 
+ADD_CUSTOM_TARGET(covtest
+    COMMAND make test
+    COMMAND programs/test/selftest
+    COMMAND cd tests && ./compat.sh
+    COMMAND cd tests && ./ssl-opt.sh
+    )
+
 ADD_CUSTOM_TARGET(lcov
     COMMAND lcov --capture --directory . -o polarssl.info
     COMMAND genhtml --title PolarSSL --legend --no-branch-coverage -o ../../../Coverage polarssl.info
diff --git a/Makefile b/Makefile
index f48fd66..e9eb11f 100644
--- a/Makefile
+++ b/Makefile
@@ -56,6 +56,12 @@
 test-ref-configs:
 	tests/scripts/test-ref-configs.pl
 
+testcov:
+	make check
+	programs/test/selftest
+	( cd tests && ./compat.sh )
+	( cd tests && ./ssl-opt.sh )
+
 lcov:
 	rm -rf Coverage
 	( cd library && lcov --capture --directory . -o polarssl.info )