diff --git a/test/Makefile b/test/Makefile
index 58a45deff..ae898c51b 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -19,7 +19,14 @@ bin/random: $(RANDOM_SRC)/**/*.go
 bin/ipfs: $(IPFS_ROOT)/**/*.go
 	go build -o bin/ipfs $(IPFS_CMD)
 
-test_sharness:
+test: test_expensive
+
+test_expensive:
+	cd sharness && make TEST_EXPENSIVE=1
+	cd 3nodetest && make
+
+test_cheap:
 	cd sharness && make
+	cd 3nodetest && make
 
 .PHONY: all clean