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,14 +14,16 @@
 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"
 touch "${DEBUG_LOG}"
-chmod +x bitcoind
+
+: "${BITCOIND_BINARY:=${TOPLEVEL}/build/src/bitcoind}"
 
 # Launch bitcoind using this script's parameters
-./bitcoind "-datadir=${DATA_DIR}" "$@" &
+"${BITCOIND_BINARY}" "-datadir=${DATA_DIR}" "$@" &
 BITCOIND_PID=$!
 
 cleanup() {