diff --git a/contrib/source-control-tools/automated-commits.sh b/contrib/source-control-tools/automated-commits.sh
--- a/contrib/source-control-tools/automated-commits.sh
+++ b/contrib/source-control-tools/automated-commits.sh
@@ -84,9 +84,6 @@
     git add "${CHAINPARAMS_CONSTANTS}"
     popd
 
-    # Sanity check that the new chainparams build
-    ABC_BUILD_NAME=build-werror "${TEAMCITY_SCRIPTS_DIR}"/build-configurations.sh
-
     git commit -m "${BOT_PREFIX} Update chainparams"
     ;;
 
@@ -108,6 +105,9 @@
   exit 3
 fi
 
+# Smoke tests to give some confidence that master won't be put into a bad state
+ABC_BUILD_NAME=build-smoke-tests "${TEAMCITY_SCRIPTS_DIR}"/build-configurations.sh
+
 echo "Pushing automated commit '${COMMIT_TYPE}'..."
 
 GIT_PUSH_OPTIONS=("--verbose")
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
@@ -200,6 +200,18 @@
     ninja check-functional-upgrade-activated-extended
     ;;
 
+  build-smoke-tests)
+    # Build and run some quick tests. This build does not need perfect test
+    # coverage, but should detect basic failures in happy paths.
+    "${CI_SCRIPTS_DIR}"/build_cmake.sh
+
+    # Unit tests
+    run_test_bitcoin
+
+    # Functional tests
+    ninja check-functional
+    ;;
+
   build-without-wallet)
     # Build without wallet and run the unit tests.
     CMAKE_FLAGS=(