diff --git a/contrib/teamcity/build.sh b/contrib/teamcity/build.sh
index d07071ab1..711159d36 100755
--- a/contrib/teamcity/build.sh
+++ b/contrib/teamcity/build.sh
@@ -1,77 +1,50 @@
 #!/bin/bash
 
 set -eu
 
 TOPLEVEL=`git rev-parse --show-toplevel`
 if [[ -z "${TOPLEVEL}" ]]; then
 	echo "No .git directory found, assuming pwd"
 	TOPLEVEL=`pwd -P`
 fi
 
 BUILD_DIR="${TOPLEVEL}/build"
 mkdir -p ${BUILD_DIR}
 
 ## Generate necessary autoconf files
 cd ${TOPLEVEL}
 ./autogen.sh
 cd ${BUILD_DIR}
 
 rm -f build.status test_bitcoin.xml
 
 ## Determine the number of build threads
 THREADS=$(nproc || sysctl -n hw.ncpu)
 
 # Default to nothing
 : ${DISABLE_WALLET:=}
 
 CONFIGURE_FLAGS=("--prefix=`pwd`")
 if [[ ! -z "${DISABLE_WALLET}" ]]; then
 	echo "*** Building without wallet"
 	CONFIGURE_FLAGS+=("--disable-wallet")
 fi
 
 ../configure "${CONFIGURE_FLAGS[@]}"
-make -j ${THREADS}
-make -C src/secp256k1
-make -C src/univalue
-make install
 
-BRANCH=$(git rev-parse --abbrev-ref HEAD)
-
-# Run tests
-./src/test/test_bitcoin --log_format=JUNIT > test_bitcoin.xml
-./src/qt/test/test_bitcoin-qt
-
-echo "secp256k1 tests: "
-./src/secp256k1/tests
-./src/secp256k1/exhaustive_tests
-echo "pass"
-
-# Need to CD where the data files for the univalue tests live.
-pushd ${TOPLEVEL}/src/univalue/test
-echo "Univalue tests: "
-${BUILD_DIR}/src/univalue/test/object
-${BUILD_DIR}/src/univalue/test/unitester
-${BUILD_DIR}/src/univalue/test/no_nul
-echo "pass"
-popd
-
-# Run leveldb tests
-pushd ${TOPLEVEL}/src/leveldb
-echo "Leveldb tests: "
+# Run unit tests
 make check
-echo "pass"
-popd
 
+# Run util tests
 ./test/util/bitcoin-util-test.py
 
 mkdir -p output/
-
+BRANCH=$(git rev-parse --abbrev-ref HEAD)
 if [[ ! -z "${DISABLE_WALLET}" ]]; then
 	echo "Skipping rpc testing due to disabled wallet functionality."
 elif [[ "${BRANCH}" == "master" ]]; then
 	./test/functional/test_runner.py --extended --jobs=${THREADS} --tmpdirprefix=output
 else
 	./test/functional/test_runner.py --jobs=${THREADS} --tmpdirprefix=output
 fi