diff --git a/contrib/teamcity/builds/build-asan.sh b/contrib/teamcity/builds/build-asan.sh
index 9935554b6..df4f7b67a 100755
--- a/contrib/teamcity/builds/build-asan.sh
+++ b/contrib/teamcity/builds/build-asan.sh
@@ -1,30 +1,26 @@
 #!/usr/bin/env bash
 
 export LC_ALL=C.UTF-8
 
 set -euxo pipefail
 
 # shellcheck source=../ci-fixture.sh
 source "${TOPLEVEL}/contrib/teamcity/ci-fixture.sh"
 
 # Build with the address sanitizer, then run unit tests and functional tests.
 CMAKE_FLAGS=(
   "-DCMAKE_CXX_FLAGS=-DARENA_DEBUG"
   "-DCMAKE_BUILD_TYPE=Debug"
   # ASAN does not support assembly code: https://github.com/google/sanitizers/issues/192
   # This will trigger a segfault if the SSE4 implementation is selected for SHA256.
   # Disabling the assembly works around the issue.
   "-DCRYPTO_USE_ASM=OFF"
   "-DENABLE_SANITIZERS=address"
 )
 build_with_cmake --Werror --clang
 
 run_test_bitcoin "with address sanitizer"
 
-# Libs and utils tests
-ninja \
-  check-bitcoin-qt \
-  check-seeder \
-  check-bitcoin-util \
+ninja check check-secp256k1
 
 ninja check-functional
diff --git a/contrib/teamcity/builds/build-clang-10.sh b/contrib/teamcity/builds/build-clang-10.sh
index f0af6621a..d56f2da50 100755
--- a/contrib/teamcity/builds/build-clang-10.sh
+++ b/contrib/teamcity/builds/build-clang-10.sh
@@ -1,26 +1,21 @@
 #!/usr/bin/env bash
 
 export LC_ALL=C.UTF-8
 
 set -euxo pipefail
 
 # shellcheck source=../ci-fixture.sh
 source "${TOPLEVEL}/contrib/teamcity/ci-fixture.sh"
 
 # Use clang-10 for this build instead of the default clang-8.
 # This allow for checking that no warning is introduced for newer versions
 # of the compiler
 CMAKE_FLAGS=(
   "-DCMAKE_C_COMPILER=clang-10"
   "-DCMAKE_CXX_COMPILER=clang++-10"
 )
 build_with_cmake --Werror
 
-ninja \
-  test_bitcoin \
-  test_bitcoin-qt \
-  test-seeder \
-  secp256k1-tests \
-  secp256k1-exhaustive_tests
+ninja check check-secp256k1
 
 # TODO do the same with the latest GCC
diff --git a/contrib/teamcity/builds/build-diff.sh b/contrib/teamcity/builds/build-diff.sh
index 9e4bdf562..44dbc2008 100755
--- a/contrib/teamcity/builds/build-diff.sh
+++ b/contrib/teamcity/builds/build-diff.sh
@@ -1,33 +1,26 @@
 #!/usr/bin/env bash
 
 export LC_ALL=C.UTF-8
 
 set -euxo pipefail
 
 # shellcheck source=../ci-fixture.sh
 source "${TOPLEVEL}/contrib/teamcity/ci-fixture.sh"
 
 # Build, run unit tests and functional tests.
 build_with_cmake --Werror
 
 # Unit tests
 run_test_bitcoin
 run_test_bitcoin "with next upgrade activated" -phononactivationtime=1575158400
 
 # Libs and tools tests
 # The leveldb tests need to run alone or they will sometimes fail with
 # garbage output, see:
 # https://build.bitcoinabc.org/viewLog.html?buildId=29713&guest=1
 ninja check-leveldb
-ninja \
-  check-bitcoin-qt \
-  check-seeder \
-  check-bitcoin-util \
-  check-devtools \
-  check-rpcauth \
-  check-secp256k1 \
-  check-univalue \
+ninja check check-secp256k1 check-univalue
 
 # Functional tests
 ninja check-functional
 ninja check-functional-upgrade-activated
diff --git a/contrib/teamcity/builds/build-linux64.sh b/contrib/teamcity/builds/build-linux64.sh
index 507cc5ff6..b6cf21c0c 100755
--- a/contrib/teamcity/builds/build-linux64.sh
+++ b/contrib/teamcity/builds/build-linux64.sh
@@ -1,29 +1,25 @@
 #!/usr/bin/env bash
 
 export LC_ALL=C.UTF-8
 
 set -euxo pipefail
 
 # shellcheck source=../ci-fixture.sh
 source "${TOPLEVEL}/contrib/teamcity/ci-fixture.sh"
 
 build_static_dependencies
 
 # Build, run unit tests and functional tests.
 CMAKE_FLAGS=(
   "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_PLATFORMS_DIR}/Linux64.cmake"
   "-DENABLE_PROPERTY_BASED_TESTS=ON"
 )
 build_with_cmake
 
 # Unit tests
 run_test_bitcoin "for Linux 64 bits"
 
-ninja \
-  check-bitcoin-qt \
-  check-seeder \
-  check-bitcoin-util \
-  check-secp256k1
+ninja check check-secp256k1
 
 # Functional tests
 ninja check-functional
diff --git a/contrib/teamcity/builds/build-master.sh b/contrib/teamcity/builds/build-master.sh
index f38120b45..c510fdcee 100755
--- a/contrib/teamcity/builds/build-master.sh
+++ b/contrib/teamcity/builds/build-master.sh
@@ -1,33 +1,26 @@
 #!/usr/bin/env bash
 
 export LC_ALL=C.UTF-8
 
 set -euxo pipefail
 
 # shellcheck source=../ci-fixture.sh
 source "${TOPLEVEL}/contrib/teamcity/ci-fixture.sh"
 
 # Build, run unit tests and extended functional tests.
 build_with_cmake --Werror
 
 # Unit tests
 run_test_bitcoin
 run_test_bitcoin "with next upgrade activated" -phononactivationtime=1575158400
 
 # Libs and tools tests
 # The leveldb tests need to run alone or they will sometimes fail with
 # garbage output, see:
 # https://build.bitcoinabc.org/viewLog.html?buildId=29713&guest=1
 ninja check-leveldb
-ninja \
-  check-bitcoin-qt \
-  check-seeder \
-  check-bitcoin-util \
-  check-devtools \
-  check-rpcauth \
-  check-secp256k1 \
-  check-univalue \
+ninja check check-secp256k1 check-univalue
 
 # Functional tests
 ninja check-functional-extended
 ninja check-functional-upgrade-activated-extended
diff --git a/contrib/teamcity/builds/build-tsan.sh b/contrib/teamcity/builds/build-tsan.sh
index 62543b9c9..03269d3d7 100755
--- a/contrib/teamcity/builds/build-tsan.sh
+++ b/contrib/teamcity/builds/build-tsan.sh
@@ -1,24 +1,21 @@
 #!/usr/bin/env bash
 
 export LC_ALL=C.UTF-8
 
 set -euxo pipefail
 
 # shellcheck source=../ci-fixture.sh
 source "${TOPLEVEL}/contrib/teamcity/ci-fixture.sh"
 
 # Build with the thread sanitizer, then run unit tests and functional tests.
 CMAKE_FLAGS=(
   "-DENABLE_SANITIZERS=thread"
 )
 build_with_cmake --Werror --clang
 
 run_test_bitcoin "with thread sanitizer"
 
 # Libs and utils tests
-ninja \
-  check-bitcoin-qt \
-  check-seeder \
-  check-bitcoin-util \
+ninja check
 
 ninja check-functional
diff --git a/contrib/teamcity/builds/build-ubsan.sh b/contrib/teamcity/builds/build-ubsan.sh
index 93f517abb..779d1a706 100755
--- a/contrib/teamcity/builds/build-ubsan.sh
+++ b/contrib/teamcity/builds/build-ubsan.sh
@@ -1,25 +1,22 @@
 #!/usr/bin/env bash
 
 export LC_ALL=C.UTF-8
 
 set -euxo pipefail
 
 # shellcheck source=../ci-fixture.sh
 source "${TOPLEVEL}/contrib/teamcity/ci-fixture.sh"
 
 # Build with the undefined sanitizer, then run unit tests and functional tests.
 CMAKE_FLAGS=(
   "-DCMAKE_BUILD_TYPE=Debug"
   "-DENABLE_SANITIZERS=undefined"
 )
 build_with_cmake --Werror --clang
 
 run_test_bitcoin "with undefined sanitizer"
 
 # Libs and utils tests
-ninja \
-  check-bitcoin-qt \
-  check-seeder \
-  check-bitcoin-util \
+ninja check check-secp256k1
 
 ninja check-functional