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
@@ -125,6 +125,11 @@
     CONFIGURE_FLAGS="--enable-debug --enable-werror CC=clang CXX=clang++" "${CI_SCRIPTS_DIR}"/build_autotools.sh
     ;;
 
+  build-check-all)
+    CMAKE_FLAGS="-DSECP256K1_ENABLE_MODULE_ECDH=ON -DSECP256K1_ENABLE_JNI=ON" "${CI_SCRIPTS_DIR}"/build_cmake.sh
+    ninja check-all
+    ;;
+
   *)
     echo "Error: Invalid build name '${ABC_BUILD_NAME}'"
     exit 2
diff --git a/contrib/teamcity/build_cmake.sh b/contrib/teamcity/build_cmake.sh
new file mode 100755
--- /dev/null
+++ b/contrib/teamcity/build_cmake.sh
@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+export LC_ALL=C
+
+set -euxo pipefail
+
+: "${TOPLEVEL:=$(git rev-parse --show-toplevel)}"
+: "${BUILD_DIR:=${TOPLEVEL}/build}"
+
+# Default to nothing
+: "${CMAKE_FLAGS:=}"
+
+cd ${BUILD_DIR}
+git clean -xffd
+
+read -a CMAKE_FLAGS <<< "${CMAKE_FLAGS}"
+cmake -GNinja .. "${CMAKE_FLAGS[@]}"
+
+# Run build
+ninja