diff --git a/build/teamcity-nightly-roachtest.sh b/build/teamcity-nightly-roachtest.sh
index 507cafe50fe2..0a5f8938440a 100755
--- a/build/teamcity-nightly-roachtest.sh
+++ b/build/teamcity-nightly-roachtest.sh
@@ -8,11 +8,6 @@ source "$(dirname "${0}")/teamcity-support.sh"
 # apologies, you're going to have to dig around for them below or even better
 # yet, look at the job).
 
-# Note that when this script is called, the cockroach binary to be tested
-# already exists in the current directory.
-COCKROACH_BINARY="${PWD}/cockroach.linux-2.6.32-gnu-amd64"
-chmod +x "${COCKROACH_BINARY}"
-
 if [[ ! -f ~/.ssh/id_rsa.pub ]]; then
   ssh-keygen -q -C "roachtest-nightly $(date)" -N "" -f ~/.ssh/id_rsa
 fi
@@ -25,7 +20,8 @@ chmod o+rwx "${artifacts}"
 # Disable global -json flag.
 export PATH=$PATH:$(GOFLAGS=; go env GOPATH)/bin
 
-build/builder/mkrelease.sh amd64-linux-gnu bin/workload bin/roachtest bin/roachprod > "${artifacts}/build.txt" 2>&1 || cat "${artifacts}/build.txt"
+build/builder/mkrelease.sh amd64-linux-gnu build bin/workload bin/roachtest bin/roachprod \
+  > "${artifacts}/build.txt" 2>&1 || (cat "${artifacts}/build.txt"; false)
 
 # Set up Google credentials. Note that we need this for all clouds since we upload
 # perf artifacts to Google Storage at the end.
@@ -117,7 +113,7 @@ timeout -s INT $((1200*60)) "build/teamcity-roachtest-invoke.sh" \
   --cpu-quota="${CPUQUOTA}" \
   --cluster-id="${TC_BUILD_ID}" \
   --build-tag="${BUILD_TAG}" \
-  --cockroach="${COCKROACH_BINARY}" \
+  --cockroach="${PWD}/cockroach-linux-2.6.32-gnu-amd64" \
   --artifacts="${artifacts}" \
   --slack-token="${SLACK_TOKEN}" \
   "${TESTS}"