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