diff --git a/ci-support.sh b/ci-support.sh
index 8ed6e039ba0301901be0d2859a52b6670c613bd2..ba29a46877d3e16fb1ce2d898ef874e39ac60212 100644
--- a/ci-support.sh
+++ b/ci-support.sh
@@ -85,7 +85,7 @@ with_output_group()
   local groupname="$1"
   shift
   begin_output_group "$groupname"
-  trap end_output_group "$groupname" RETURN
+  trap "end_output_group $groupname" RETURN
   "$@"
 }