diff --git a/Makefile b/Makefile
index abdab716f..fa3723cc6 100644
--- a/Makefile
+++ b/Makefile
@@ -15,8 +15,16 @@ install:
 
 test: test_go test_sharness
 
+test_expensive: test_go_expensive test_sharness_expensive
+
 test_go:
+	go test -test.short ./...
+
+test_go_expensive:
 	go test ./...
 
 test_sharness:
 	cd test/ && make
+
+test_sharness_expensive:
+	cd test/ && make TEST_EXPENSIVE=1