diff --git a/test/p2p/kill_all/check_peers.sh b/test/p2p/kill_all/check_peers.sh
index 31f6d550..3c925079 100644
--- a/test/p2p/kill_all/check_peers.sh
+++ b/test/p2p/kill_all/check_peers.sh
@@ -4,7 +4,7 @@ set -eu
 NUM_OF_PEERS=$1
 
 # how many attempts for each peer to catch up by height
-MAX_ATTEMPTS_TO_CATCH_UP=10
+MAX_ATTEMPTS_TO_CATCH_UP=20
 
 echo "Waiting for nodes to come online"
 set +e
diff --git a/test/test.sh b/test/test.sh
index dc50501e..93908a8b 100644
--- a/test/test.sh
+++ b/test/test.sh
@@ -10,6 +10,8 @@ bash ./test/docker/build.sh
 
 echo ""
 echo "* running go tests and app tests in docker container"
+# sometimes its helpful to mount the local test folder
+# -v $GOPATH/src/github.com/tendermint/tendermint/test:/go/src/github.com/tendermint/tendermint/test
 docker run --name run_test -t tester bash test/run_test.sh
 
 # copy the coverage results out of docker container
diff --git a/test/test_libs.sh b/test/test_libs.sh
index 164cdd34..8692f5de 100644
--- a/test/test_libs.sh
+++ b/test/test_libs.sh
@@ -28,17 +28,20 @@ for lib in "${LIBS_GO_TEST[@]}"; do
 	fi
 done
 
+DIR=`pwd`
 for lib in "${LIBS_MAKE_TEST[@]}"; do
 
 	# checkout vendored version of lib
 	bash scripts/glide/checkout.sh $GLIDE $lib
 
 	echo "Testing $lib ..."
+	cd $GOPATH/src/github.com/tendermint/$lib
 	make test
 	if [[ "$?" != 0 ]]; then
 		echo "FAIL"
 		exit 1
 	fi
+	cd $DIR
 done
 
 echo ""