diff --git a/test/docker/run.sh b/test/docker/run.sh
index b1acf87..a57780b 100755
--- a/test/docker/run.sh
+++ b/test/docker/run.sh
@@ -85,8 +85,7 @@
     usage "$MISSING, did you forget --task-plugin-jar?"
 fi
 [ -n "$GERRIT_WAR" ] && cp -f "$GERRIT_WAR" "$ARTIFACTS/gerrit.war"
-progress "Building docker images" build_images
-run_task_plugin_tests ; RESULT=$?
-cleanup
-
-exit "$RESULT"
+( trap cleanup EXIT SIGTERM
+    progress "Building docker images" build_images
+    run_task_plugin_tests
+)