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
@@ -273,14 +273,35 @@
     ;;
 
   build-werror)
-    # Build with variable-length-array and thread-safety-analysis treated as errors.
     # Use clang-10 for this build instead of the default clang-8.
     CMAKE_FLAGS=(
-      "-DENABLE_WERROR=ON"
+      "-DCMAKE_C_FLAGS=-Werror"
+      "-DCMAKE_CXX_FLAGS=-Werror"
       "-DCMAKE_C_COMPILER=clang-10"
       "-DCMAKE_CXX_COMPILER=clang++-10"
     )
     CMAKE_FLAGS="${CMAKE_FLAGS[*]}" "${DEVTOOLS_DIR}"/build_cmake.sh
+    ninja \
+      test_bitcoin \
+      test_bitcoin-qt \
+      test_bitcoin-seeder \
+      secp256k1-tests \
+      secp256k1-exhaustive_tests
+
+    # Do the same with GCC
+    CMAKE_FLAGS=(
+      "-DCMAKE_C_FLAGS=-Werror"
+      "-DCMAKE_CXX_FLAGS=-Werror"
+      "-DCMAKE_C_COMPILER=gcc"
+      "-DCMAKE_CXX_COMPILER=g++"
+    )
+    CMAKE_FLAGS="${CMAKE_FLAGS[*]}" "${DEVTOOLS_DIR}"/build_cmake.sh
+    ninja \
+      test_bitcoin \
+      test_bitcoin-qt \
+      test_bitcoin-seeder \
+      secp256k1-tests \
+      secp256k1-exhaustive_tests
     ;;
 
   build-autotools)