diff --git a/Makefile b/Makefile
index 18919052815a86fb23d1a5454cbf6aead932873a..e59d6dd8a653902615f3450e3f289aa57c00c989 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ all: $(HPROGS)
 $(HALLPROGS): %: %.hs Ganeti/HTools/Version.hs $(HSRCS) Makefile
 	$(GHC) --make $(HFLAGS) $(HEXTRA) $@
 
-test: HEXTRA=-fhpc -Wwarn -fno-warn-missing-signatures \
+test live-test: HEXTRA=-fhpc -Wwarn -fno-warn-missing-signatures \
 	-fno-warn-monomorphism-restriction -fno-warn-orphans \
 	-fno-warn-missing-methods -fno-warn-unused-imports
 
@@ -94,6 +94,18 @@ else
 	hpc report test $(HPCEXCL)
 endif
 
+live-test: all
+	rm -f *.tix *.mix
+	./live-test.sh
+	# combine the tix files
+	hpc sum $(HPCEXCL) $(addsuffix .tix,$(HPROGS)) --output=live-test.tix
+ifeq ($(T),markup)
+	mkdir -p coverage
+	hpc markup --destdir=coverage live-test $(HPCEXCL)
+else
+	hpc report live-test $(HPCEXCL)
+endif
+
 tags:
 	find -name '*.hs' | xargs hasktags -e