diff --git a/ci_presubmit.sh b/ci_presubmit.sh
index 1739e5d1..76199383 100755
--- a/ci_presubmit.sh
+++ b/ci_presubmit.sh
@@ -6,19 +6,12 @@
 
 set -e -o pipefail
 
-if [ -z "$hscloud_root" ]; then
-    echo 2>&1 "Please first source env.sh"
-    exit 1
-fi
+# Build some things  that should always build - ie. critical codebases.
+bazel build //tools/... //cluster/...
 
-cd $hscloud_root
-
-# Test critical tools.
-tools/install.sh
-kubectl version --client=true
-kubecfg version
-prodaccess --help 2>/dev/null
+# Run some critical tools that are needed to access clusters.
 bazel run //cluster/clustercfg smoketest
+bazel run //cluster/tools:kubectl -- version --client=true
+bazel run //cluster/tools:kubecfg -- version
+bazel run //cluster/prodaccess -- --help 2>/dev/null
 
-# Test critical services.
-bazel build //cluster/prodvider