diff --git a/test/docker/Dockerfile b/test/docker/Dockerfile
index 4e98ecc7a..a168cfb1d 100644
--- a/test/docker/Dockerfile
+++ b/test/docker/Dockerfile
@@ -17,7 +17,7 @@ WORKDIR $REPO
 ADD glide.yaml glide.yaml
 ADD glide.lock glide.lock
 ADD Makefile Makefile
-RUN make tools
+RUN make get_tools
 RUN make get_vendor_deps
 
 # Install the apps
diff --git a/test/run_test.sh b/test/run_test.sh
index cecd2c72b..ae2ff6b41 100644
--- a/test/run_test.sh
+++ b/test/run_test.sh
@@ -7,8 +7,7 @@ BRANCH=$(git rev-parse --abbrev-ref HEAD)
 echo "Current branch: $BRANCH"
 
 # run the linter
-# TODO: drop the `_test` once we're ballin' enough
-make metalinter_test
+make metalinter
 
 # run the go unit tests with coverage
 bash test/test_cover.sh
@@ -20,8 +19,8 @@ bash test/app/test.sh
 bash test/persist/test.sh
 
 if [[ "$BRANCH" == "master" || $(echo "$BRANCH" | grep "release-") != "" ]]; then
-    echo ""
-    echo "* branch $BRANCH; testing libs"
-    # checkout every github.com/tendermint dir and run its tests
-    bash test/test_libs.sh
+	echo ""
+	echo "* branch $BRANCH; testing libs"
+	# checkout every github.com/tendermint dir and run its tests
+	bash test/test_libs.sh
 fi