diff --git a/src/auditor/generate-auditor-basedb.sh b/src/auditor/generate-auditor-basedb.sh
index 28782461f..fa693b561 100755
--- a/src/auditor/generate-auditor-basedb.sh
+++ b/src/auditor/generate-auditor-basedb.sh
@@ -15,6 +15,8 @@
 #
 set -eu
 
+trap "kill `jobs -p` &> /dev/null || true" ERR
+
 # Exit, with status code "skip" (no 'real' failure)
 function exit_skip() {
     echo $1
diff --git a/src/auditor/generate-revoke-basedb.sh b/src/auditor/generate-revoke-basedb.sh
index 8bc31fab3..ba2d15235 100755
--- a/src/auditor/generate-revoke-basedb.sh
+++ b/src/auditor/generate-revoke-basedb.sh
@@ -8,7 +8,7 @@
 set -eu
 
 
-trap "kill `jobs -p` &> /dev/null || true" EXIT
+trap "kill `jobs -p` &> /dev/null || true" ERR
 
 # Exit, with status code "skip" (no 'real' failure)
 function exit_skip() {