diff --git a/tools/dbtest-prepare-env.sh b/tools/dbtest-prepare-env.sh
index 6e8c5f9f13..09d369f09e 100755
--- a/tools/dbtest-prepare-env.sh
+++ b/tools/dbtest-prepare-env.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-pushd $(mktemp -d)
+pushd "$(mktemp -d)" || exit 1
 go mod init temp
 go install github.com/jackc/tern@latest
-popd
+popd || exit
diff --git a/tools/dbtest-run-migrations.sh b/tools/dbtest-run-migrations.sh
index d3c44ea988..7be4d81ca8 100755
--- a/tools/dbtest-run-migrations.sh
+++ b/tools/dbtest-run-migrations.sh
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
 WORKDIR=$(readlink -f pkg/jobqueue/dbjobqueue/schemas)
-$(go env GOPATH)/bin/tern migrate -m "$WORKDIR"
+"$(go env GOPATH)"/bin/tern migrate -m "$WORKDIR"