diff --git a/Makefile b/Makefile
index b94bd3f41..7a7131955 100644
--- a/Makefile
+++ b/Makefile
@@ -30,6 +30,8 @@ go_check:
 bin/gx-v%:
 	@echo "installing gx $(@:bin/gx-%=%)"
 	@bin/dist_get gx $@ $(@:bin/gx-%=%)
+	rm -f bin/gx
+	ln -s $(@:bin/%=%) bin/gx
 
 bin/gx-go-v%:
 	@echo "installing gx-go $(@:bin/gx-go-%=%)"
diff --git a/test/Makefile b/test/Makefile
index 689e22afa..26b8b5b1b 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -9,6 +9,8 @@ GOSLEEP_SRC = ./dependencies/go-sleep
 
 GX_RELATIVE_PATH = ../../../../gx/ipfs
 
+export PATH := ../bin:${PATH}
+
 # User might want to override those on the command line
 GOFLAGS =