diff --git a/test/Makefile b/test/Makefile
index 1408d0c49..4d824a88e 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,11 +1,13 @@
 
 BINS = bin/random bin/multihash bin/ipfs bin/pollEndpoint bin/iptb bin/go-sleep
+BINS += bin/go-timeout
 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
 POLLENDPOINT_SRC= ../thirdparty/pollEndpoint
 GOSLEEP_SRC = ./dependencies/go-sleep
+GOTIMEOUT_SRC = ./dependencies/go-timeout
 
 export PATH := ../bin:${PATH}
 
@@ -48,6 +50,10 @@ bin/go-sleep: $(call find_go_files, $(GOSLEEP_SRC)) IPFS-BUILD-OPTIONS
 	@echo "*** installing $@ ***"
 	go build $(GOFLAGS) -o bin/go-sleep $(GOSLEEP_SRC)
 
+bin/go-timeout: $(call find_go_files, $(GOTIMEOUT_SRC)) IPFS-BUILD-OPTIONS
+	@echo "*** installing $@ ***"
+	go build $(GOFLAGS) -o bin/go-timeout $(GOTIMEOUT_SRC)
+
 # gx dependencies
 
 multihash_src:
diff --git a/test/sharness/Makefile b/test/sharness/Makefile
index 4e6d2a940..2c5488dcb 100644
--- a/test/sharness/Makefile
+++ b/test/sharness/Makefile
@@ -8,7 +8,7 @@
 
 T = $(sort $(wildcard t[0-9][0-9][0-9][0-9]-*.sh))
 BINS = bin/random bin/multihash bin/ipfs bin/pollEndpoint \
-	   bin/iptb bin/go-sleep bin/random-files
+	   bin/iptb bin/go-sleep bin/random-files bin/go-timeout
 SHARNESS = lib/sharness/sharness.sh
 IPFS_ROOT = ../..