diff --git a/test/Makefile b/test/Makefile
index 1408d0c49..ecca6c71f 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -71,18 +71,18 @@ bin/iptb: iptb_src $(call find_go_files, $(IPTB_SRC)) IPFS-BUILD-OPTIONS
 test: test_expensive
 
 test_expensive: verify_gofmt
-	cd sharness && make TEST_EXPENSIVE=1
-	cd 3nodetest && make
-	cd dependencies && make
+	make -C sharness TEST_EXPENSIVE=1
+	make -C 3nodetest
+	make -C dependencies
 
 test_cheap: verify_gofmt
-	cd sharness && make
-	cd 3nodetest && make
+	make -C sharness
+	make -C 3nodetest
 
 test_race: verify_gofmt
-	cd sharness && make GOFLAGS=-race TEST_EXPENSIVE=1
-	cd 3nodetest && make GOFLAGS=-race
-	cd dependencies && make GOFLAGS=-race
+	make -C sharness GOFLAGS=-race TEST_EXPENSIVE=1
+	make -C 3nodetest GOFLAGS=-race
+	make -C dependencies GOFLAGS=-race
 
 # Misc
 
diff --git a/test/sharness/Makefile b/test/sharness/Makefile
index 4e6d2a940..97c55cb88 100644
--- a/test/sharness/Makefile
+++ b/test/sharness/Makefile
@@ -43,7 +43,7 @@ $(SHARNESS): FORCE
 	lib/install-sharness.sh
 
 bin/%: FORCE
-	cd .. && make GOFLAGS=$(GOFLAGS) $@
+	make -C .. GOFLAGS=$(GOFLAGS) $@
 
 race:
 	make GOFLAGS=-race all