diff --git a/Makefile b/Makefile
index 1b5c3927..0dc3d364 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@ ifneq (,$(MACHINE))
 	MACHARGS=--machine=$(MACHINE)
 endif
 
-.PHONY: run clean
+.PHONY: run clean check
 
 all: dryrun
 
@@ -57,6 +57,8 @@ unit:
 	echo "Running unit tests..."
 	nosetests3 $(PYTHONSRC)/tests
 
+check: lint unit
+
 installer/$(INSTALLIMG): installer/geninstaller installer/runinstaller $(INSTALLER_RESOURCES) probert
 	(cd installer && TOPDIR=$(TOPDIR)/installer ./geninstaller -v -r $(RELEASE) -a $(ARCH) -s $(STREAM) -b $(BOOTLOADER)) 
 	echo $(INSTALLER_RESOURCES)