diff --git a/scripts/dep_utils/checkout.sh b/scripts/dep_utils/checkout.sh
index 83b7ee2f..941fb516 100644
--- a/scripts/dep_utils/checkout.sh
+++ b/scripts/dep_utils/checkout.sh
@@ -2,7 +2,9 @@
 set -u
 
 function getVendoredVersion() {
+	cd "$GOPATH/src/github.com/tendermint/tendermint" || exit
 	dep status | grep "$1" | awk '{print $4}'
+	cd - || exit
 }
 
 
diff --git a/scripts/dep_utils/parse.sh b/scripts/dep_utils/parse.sh
index 56a047ef..adaf82ec 100644
--- a/scripts/dep_utils/parse.sh
+++ b/scripts/dep_utils/parse.sh
@@ -1,6 +1,8 @@
 #! /bin/bash
 set -euo pipefail
 
+cd "$GOPATH/github.com/tendermint/tendermint" || exit
+
 LIB=$1
 
 dep status | grep "$LIB" | awk '{print $4}'
diff --git a/scripts/install_abci_apps.sh b/scripts/install_abci_apps.sh
index bd16dfa6..eb70070d 100644
--- a/scripts/install_abci_apps.sh
+++ b/scripts/install_abci_apps.sh
@@ -1,13 +1,12 @@
 #! /bin/bash
 
-go get -d github.com/tendermint/abci
-
 # get the abci commit used by tendermint
 COMMIT=$(bash scripts/dep_utils/parse.sh abci)
-
 echo "Checking out vendored commit for abci: $COMMIT"
 
+go get -d github.com/tendermint/abci
 cd "$GOPATH/src/github.com/tendermint/abci" || exit
 git checkout "$COMMIT"
+make get_tools
 make get_vendor_deps
 make install