diff --git a/test/Makefile b/test/Makefile
index 48fed0b94..689e22afa 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -4,11 +4,11 @@ IPFS_ROOT = ../
 IPFS_CMD = ../cmd/ipfs
 RANDOM_SRC = ../Godeps/_workspace/src/github.com/jbenet/go-random
 RANDOM_FILES_SRC = ../Godeps/_workspace/src/github.com/jbenet/go-random-files
-MULTIHASH_SRC = ../../../../gx/ipfs/QmYf7ng2hG5XBtJA3tN34DQ2GUN5HNksEw1rLDkmr6vGku/go-multihash
-IPTB_SRC = ../../../../gx/ipfs/QmccSTNEUYSJsDSHZj3uKS3pPYCRXCNxr4X8Ub1TQyKPsZ/iptb
 POLLENDPOINT_SRC= ../thirdparty/pollEndpoint
 GOSLEEP_SRC = ./dependencies/go-sleep
 
+GX_RELATIVE_PATH = ../../../../gx/ipfs
+
 # User might want to override those on the command line
 GOFLAGS =
 
@@ -26,6 +26,8 @@ bins: $(BINS)
 
 find_go_files = $(shell find $(1) -name "*.go")
 
+# Non gx dependencies
+
 bin/random: $(call find_go_files, $(RANDOM_SRC)) IPFS-BUILD-OPTIONS
 	@echo "*** installing $@ ***"
 	go build $(GOFLAGS) -o bin/random $(RANDOM_SRC)/random
@@ -34,10 +36,6 @@ bin/random-files:
 	@echo "*** installing $@ ***"
 	go build $(GOFLAGS) -o bin/random-files $(RANDOM_FILES_SRC)/random-files
 
-bin/multihash: $(call find_go_files, $(MULTIHASH_SRC)) IPFS-BUILD-OPTIONS
-	@echo "*** installing $@ ***"
-	go build $(GOFLAGS) -o bin/multihash $(MULTIHASH_SRC)/multihash
-
 bin/ipfs: $(call find_go_files, $(IPFS_ROOT)) IPFS-BUILD-OPTIONS
 	@echo "*** installing $@ ***"
 	go build $(GOFLAGS) -o bin/ipfs $(IPFS_CMD)
@@ -46,14 +44,30 @@ bin/pollEndpoint: $(call find_go_files, $(POLLENDPOINT_SRC)) IPFS-BUILD-OPTIONS
 	@echo "*** installing $@ ***"
 	go build $(GOFLAGS) -o bin/pollEndpoint $(POLLENDPOINT_SRC)
 
-bin/iptb: $(call find_go_files, $(IPTB_SRC)) IPFS-BUILD-OPTIONS
-	@echo "*** installing $@ ***"
-	go build $(GOFLAGS) -o bin/iptb $(IPTB_SRC)
-
 bin/go-sleep: $(call find_go_files, $(GOSLEEP_SRC)) IPFS-BUILD-OPTIONS
 	@echo "*** installing $@ ***"
 	go build $(GOFLAGS) -o bin/go-sleep $(GOSLEEP_SRC)
 
+# gx dependencies
+
+multihash_src:
+	$(eval MULTIHASH_HASH := $(shell cd .. && gx deps find go-multihash))
+	$(eval MULTIHASH_SRC := $(GX_RELATIVE_PATH)/$(MULTIHASH_HASH)/go-multihash)
+
+bin/multihash: multihash_src $(call find_go_files, $(MULTIHASH_SRC)) IPFS-BUILD-OPTIONS
+	@echo "*** installing $@ ***"
+	go build $(GOFLAGS) -o bin/multihash $(MULTIHASH_SRC)/multihash
+
+iptb_src:
+	$(eval IPTB_HASH := $(shell cd .. && gx deps find iptb))
+	$(eval IPTB_SRC := $(GX_RELATIVE_PATH)/$(IPTB_HASH)/iptb)
+
+bin/iptb: iptb_src $(call find_go_files, $(IPTB_SRC)) IPFS-BUILD-OPTIONS
+	@echo "*** installing $@ ***"
+	go build $(GOFLAGS) -o bin/iptb $(IPTB_SRC)
+
+# Tests
+
 test: test_expensive
 
 test_expensive: verify_gofmt
@@ -70,6 +84,8 @@ test_race: verify_gofmt
 	cd 3nodetest && make GOFLAGS=-race
 	cd dependencies && make GOFLAGS=-race
 
+# Misc
+
 coverage: coverage_sharness
 
 coverage_sharness: