diff --git a/contrib/teamcity/build.sh b/contrib/teamcity/build.sh
index c21209f6d1..86bc8d99a6 100755
--- a/contrib/teamcity/build.sh
+++ b/contrib/teamcity/build.sh
@@ -1,34 +1,40 @@
 #!/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}
 ## Configure and build
 cd ${BUILD_DIR}
 
 rm -f build.status test_bitcoin.xml
 
 #
 ## Configure and run build
 THREADS=$(nproc || sysctl -n hw.ncpu)
 
 pushd ..
 ./autogen.sh
 popd
 
 ../configure --prefix=`pwd`
 make -j ${THREADS}
 
 # Run unit tests
 ./src/test/test_bitcoin --log_format=JUNIT > test_bitcoin.xml
 
-./test/functional/test_runner.py
+BRANCH=$(git rev-parse --abbrev-ref HEAD)
+
+if [[ "${BRANCH}" == "master" ]]; then
+	./test/functional/test_runner.py --extended
+else
+	./test/functional/test_runner.py
+fi
 
 make install
\ No newline at end of file