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
@@ -72,7 +72,8 @@
 BOT_PREFIX="[Automated]"
 TOPLEVEL=$(git rev-parse --show-toplevel)
 
-CHAINPARAMS_SCRIPTS_DIR="${TOPLEVEL}"/contrib/devtools/chainparams
+DEVTOOLS_DIR="${TOPLEVEL}"/contrib/devtools
+CHAINPARAMS_SCRIPTS_DIR="${DEVTOOLS_DIR}"/chainparams
 TEAMCITY_SCRIPTS_DIR="${TOPLEVEL}"/contrib/teamcity
 
 # Make sure tree is clean
@@ -96,9 +97,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"
     ;;
 
@@ -120,6 +118,14 @@
   exit 20
 fi
 
+# Smoke tests to give some confidence that master won't be put into a bad state
+BUILD_DIR="${TOPLEVEL}"/build
+pushd "${BUILD_DIR}"
+BUILD_DIR="${BUILD_DIR}" "${DEVTOOLS_DIR}"/build_cmake.sh
+ninja test_bitcoin
+ninja check-functional
+popd
+
 echo "Pushing automated commit '${COMMIT_TYPE}'..."
 
 # Make sure master is up-to-date. If there is a merge conflict, this script