diff --git a/maint/mctest b/maint/mctest
index ca977838d..c51d97a4a 100755
--- a/maint/mctest
+++ b/maint/mctest
@@ -5,6 +5,8 @@
 
 set -e
 
+trap 'echo >&2 "ERROR: Test not completed, exit with code $?"; exit 1' exit
+
 distcheck() {
     id="$1"
     shift
@@ -70,4 +72,5 @@ else
 	echo "rpmbuild not found"
 fi
 
+trap - exit
 echo "All done.  No fatal errors.  Please check test*.err files."