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
@@ -35,6 +35,18 @@
     ./build.sh
     ;;
 
+  build-ibd)
+    export DISABLE_TESTS=1
+    ./build.sh
+    ./ibd.sh -disablewallet
+    ;;
+
+  build-ibd-no-assumevalid-checkpoint)
+    export DISABLE_TESTS=1
+    ./build.sh
+    ./ibd.sh -disablewallet -assumevalid=0 -checkpoints=0
+    ;;
+
   *)
     echo "Error: Invalid build name '${ABC_BUILD_NAME}'"
     exit 2
diff --git a/contrib/teamcity/ibd.sh b/contrib/teamcity/ibd.sh
--- a/contrib/teamcity/ibd.sh
+++ b/contrib/teamcity/ibd.sh
@@ -14,10 +14,10 @@
 MYPID=$$
 
 # Setup
-DATA_DIR="ibd"
+TOPLEVEL=$(git rev-parse --show-toplevel)
+DATA_DIR="${TOPLEVEL}/ibd"
 mkdir -p "${DATA_DIR}"
 DEBUG_LOG="${DATA_DIR}/debug.log"
-chmod +x bitcoind
 
 cleanup() {
   # Cleanup background processes spawned by this script.
@@ -31,10 +31,9 @@
 callback() {
   echo "Initial block download complete."
 
-  # TODO Add more checks to see if IBD completed as expected,
+  # TODO Add more checks to see if IBD completed as expected.
   # These checks will exit the subshell with a non-zero exit code.
 }
 export -f callback
 
-TOPLEVEL=$(git rev-parse --show-toplevel)
 LOG_FILE="${DEBUG_LOG}" "${TOPLEVEL}/contrib/devtools/bitcoind-exit-on-log.sh" --grep 'progress=1.000000' --params "-datadir=${DATA_DIR}" --callback callback