diff --git a/Makefile b/Makefile
index 14276b6bf8..05b1988646 100644
--- a/Makefile
+++ b/Makefile
@@ -25,9 +25,15 @@ uninstall:
 test: all
 	python tools/test.py --mode=release simple message
 
+test-valgrind: all
+	python tools/test.py --mode=release --valgrind simple message
+
 test-all: all
 	python tools/test.py --mode=debug,release
 
+test-all-valgrind: all
+	python tools/test.py --mode=debug,release --valgrind
+
 test-release: all
 	python tools/test.py --mode=release