diff --git a/script/tf-coverity/tf-cov-make b/script/tf-coverity/tf-cov-make
index 788ddc3..53e2b52 100755
--- a/script/tf-coverity/tf-cov-make
+++ b/script/tf-coverity/tf-cov-make
@@ -14,8 +14,8 @@
 # the project history.
 #
 
-# Bail out as soon as an error is encountered.
-set -e
+set -E
+trap 'rc=$?; error_count=$((error_count+1));' ERR INT
 
 TF_SOURCES=$1
 if [ ! -d "$TF_SOURCES" ]; then
@@ -754,4 +754,9 @@
 # Nuvoton npcm845x platform
 make PLAT=npcm845x $(common_flags) all SPD=opteed
 
+if [[ "$rc" -gt 0 ]]; then
+    echo "ERROR: tc-cov-make failed with $error_count failures"
+    exit $rc
+fi
+
 cd ..