diff --git a/bin/tests/system/run.sh.in b/bin/tests/system/run.sh.in
index 6217160357..069ccad0ab 100644
--- a/bin/tests/system/run.sh.in
+++ b/bin/tests/system/run.sh.in
@@ -187,6 +187,9 @@ if test -f "$systest/clean.sh"
 then
     if ! ( cd "${systest}" && $SHELL clean.sh "$@" ); then
 	echowarn "I:$systest:clean.sh script failed"
+	echofail "R:$systest:FAIL"
+	echoend  "E:$systest:$(date_with_args)"
+	exit 1
     fi
 
 fi
@@ -195,7 +198,10 @@ fi
 if test -f "$systest/setup.sh"
 then
     if ! ( cd "${systest}" && $SHELL setup.sh "$@" ); then
-	echowarn "I:$systest:clean.sh script failed"
+	echowarn "I:$systest:setup.sh script failed"
+	echofail "R:$systest:FAIL"
+	echoend  "E:$systest:$(date_with_args)"
+	exit 1
     fi
 fi