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
@@ -95,6 +95,26 @@
     make -j "${THREADS}" check-java
     ;;
 
+  build-extended-tests-3)
+    # Build and run all functional tests. Note that not all extended tests are
+    # run in build-default because some tests take a long time to complete.
+    "${CI_SCRIPTS_DIR}"/build.sh
+
+    TEST_RUNNER_FLAGS="${TEST_RUNNER_FLAGS} --extended --jobs 3"
+    ./test/functional/test_runner.py -J=junit_results_default.xml ${TEST_RUNNER_FLAGS}
+    ./test/functional/test_runner.py -J=junit_results_next_upgrade.xml --with-gravitonactivation ${TEST_RUNNER_FLAGS}
+    ;;
+
+  build-extended-tests-4)
+    # Build and run all functional tests. Note that not all extended tests are
+    # run in build-default because some tests take a long time to complete.
+    "${CI_SCRIPTS_DIR}"/build.sh
+
+    TEST_RUNNER_FLAGS="${TEST_RUNNER_FLAGS} --extended --jobs 4"
+    ./test/functional/test_runner.py -J=junit_results_default.xml ${TEST_RUNNER_FLAGS}
+    ./test/functional/test_runner.py -J=junit_results_next_upgrade.xml --with-gravitonactivation ${TEST_RUNNER_FLAGS}
+    ;;
+
   build-without-wallet)
     # Build without wallet and run the unit tests.
     CONFIGURE_FLAGS="--disable-wallet" "${CI_SCRIPTS_DIR}"/build.sh