diff --git a/ctdb/tests/run_tests.sh b/ctdb/tests/run_tests.sh
index dc9027df996..48fd0624f75 100755
--- a/ctdb/tests/run_tests.sh
+++ b/ctdb/tests/run_tests.sh
@@ -284,7 +284,8 @@ do_cleanup ()
     fi
 }
 
-trap do_cleanup SIGINT SIGTERM
+trap "do_cleanup ; exit 130" SIGINT
+trap "do_cleanup ; exit 143" SIGTERM
 
 declare -a tests
 i=0