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
@@ -104,7 +104,7 @@
       "-DSECP256K1_ENABLE_JNI=ON"
     )
     CMAKE_FLAGS="${CMAKE_FLAGS[*]}" "${CI_SCRIPTS_DIR}"/build_cmake.sh
-    ninja check check-secp256k1 check-functional check-functional-upgrade-activated
+    ninja check-all check-upgrade-activated
     ;;
 
   build-master)
@@ -114,7 +114,7 @@
       "-DSECP256K1_ENABLE_JNI=ON"
     )
     CMAKE_FLAGS="${CMAKE_FLAGS[*]}" "${CI_SCRIPTS_DIR}"/build_cmake.sh
-    ninja check check-secp256k1 check-functional-extended check-functional-upgrade-activated-extended
+    ninja check-extended check-upgrade-activated-extended
     ;;
 
   build-without-wallet)
@@ -146,15 +146,6 @@
     CMAKE_FLAGS="${CMAKE_FLAGS[*]}" "${CI_SCRIPTS_DIR}"/build_cmake.sh
     ;;
 
-  build-check-all)
-    CMAKE_FLAGS=(
-      "-DSECP256K1_ENABLE_MODULE_ECDH=ON"
-      "-DSECP256K1_ENABLE_JNI=ON"
-    )
-    CMAKE_FLAGS="${CMAKE_FLAGS[*]}" "${CI_SCRIPTS_DIR}"/build_cmake.sh
-    ninja check-all
-    ;;
-
   build-autotools)
     # Ensure that the build using autotools is not broken
     "${CI_SCRIPTS_DIR}"/build_autotools.sh