diff --git a/contrib/teamcity/build-configurations.sh b/contrib/teamcity/build-configurations.sh
--- a/contrib/teamcity/build-configurations.sh
+++ b/contrib/teamcity/build-configurations.sh
@@ -2,7 +2,7 @@
 
 export LC_ALL=C
 
-set -e
+set -euxo pipefail
 
 if [ -z "$ABC_BUILD_NAME" ]; then
   echo "Error: Environment variable ABC_BUILD_NAME must be set"
diff --git a/contrib/teamcity/build-secp256k1.sh b/contrib/teamcity/build-secp256k1.sh
--- a/contrib/teamcity/build-secp256k1.sh
+++ b/contrib/teamcity/build-secp256k1.sh
@@ -2,7 +2,7 @@
 
 export LC_ALL=C
 
-set -eu
+set -euxo pipefail
 
 TOPLEVEL=$(git rev-parse --show-toplevel)
 if [[ -z "${TOPLEVEL}" ]]; then
diff --git a/contrib/teamcity/build.sh b/contrib/teamcity/build.sh
--- a/contrib/teamcity/build.sh
+++ b/contrib/teamcity/build.sh
@@ -2,7 +2,7 @@
 
 export LC_ALL=C
 
-set -eu
+set -euxo pipefail
 
 TOPLEVEL=$(git rev-parse --show-toplevel)
 if [[ -z "${TOPLEVEL}" ]]; then
diff --git a/contrib/teamcity/gitian.sh b/contrib/teamcity/gitian.sh
--- a/contrib/teamcity/gitian.sh
+++ b/contrib/teamcity/gitian.sh
@@ -2,7 +2,7 @@
 
 export LC_ALL=C
 
-set -e
+set -euxo pipefail
 
 cd "$(dirname "$0")"
 
diff --git a/contrib/teamcity/ibd.sh b/contrib/teamcity/ibd.sh
--- a/contrib/teamcity/ibd.sh
+++ b/contrib/teamcity/ibd.sh
@@ -2,7 +2,7 @@
 
 export LC_ALL=C
 
-set -euo pipefail
+set -euxo pipefail
 
 ###
 # Initial Block Download script.
@@ -49,7 +49,10 @@
 
 # When the IBD subshell finishes, kill bitcoind
 (
+  # Disable verbosity to avoid bloating the output with sleep prints
+  set +x
   while [ -e /proc/${IBD_PID} ]; do sleep 0.1; done
+  set -x
 
   echo "Cleaning up bitcoin daemon (PID: ${BITCOIND_PID})."
   kill ${BITCOIND_PID}