diff --git a/Makefile b/Makefile
index 6f37537..88045b4 100644
--- a/Makefile
+++ b/Makefile
@@ -65,6 +65,8 @@ env:
 	@echo "GOROOT: $(GOROOT)"
 	@echo "DEST: $(DEST)"
 	@echo "PKG: $(PKG)"
+	go version
+	go env
 
 # Get our dev/test dependencies in place
 bootstrap:
diff --git a/bindep.txt b/bindep.txt
index 5e3550e..656f435 100644
--- a/bindep.txt
+++ b/bindep.txt
@@ -1,5 +1,6 @@
 pkg-config
 build-essential
+mercurial
 golang-go
 golint
 make
diff --git a/tools/test-setup.sh b/tools/test-setup.sh
index 4ae7853..cc51bb3 100755
--- a/tools/test-setup.sh
+++ b/tools/test-setup.sh
@@ -48,7 +48,8 @@ case $OS in
         if ! which add-apt-repository 1>/dev/null; then
             sudo $APT_GET install software-properties-common
         fi
-        sudo add-apt-repository --yes ppa:masterminds/glide && sudo apt-get update
-        sudo $APT_GET install glide
+        sudo add-apt-repository --yes ppa:longsleep/golang-backports
+        sudo add-apt-repository --yes ppa:masterminds/glide
+        sudo apt-get update && sudo $APT_GET install golang-go glide
         ;;
 esac