diff --git a/scripts/run_adminfront_ci_tests.sh b/scripts/run_adminfront_ci_tests.sh
index e26dc42c..e6e46101 100755
--- a/scripts/run_adminfront_ci_tests.sh
+++ b/scripts/run_adminfront_ci_tests.sh
@@ -7,11 +7,12 @@ tmp_dir=""
 
 cleanup() {
   if [ -n "${tmp_dir:-}" ] && [ -d "$tmp_dir" ]; then
-    rm -rf "$tmp_dir"
+    rm -rf "$tmp_dir" || true
   fi
 }
 
-trap cleanup EXIT INT TERM
+trap "cleanup; exit" INT TERM
+trap cleanup EXIT
 
 mkdir -p reports
 rm -rf adminfront/node_modules