diff --git a/t/01_badssl.com.t b/t/31_badssl.com.t
similarity index 100%
rename from t/01_badssl.com.t
rename to t/31_badssl.com.t
diff --git a/t/02_http.t b/t/32_http.t
similarity index 100%
rename from t/02_http.t
rename to t/32_http.t
diff --git a/testssl.sh b/testssl.sh
index 22cc988..4e8ad8e 100755
--- a/testssl.sh
+++ b/testssl.sh
@@ -101,6 +101,7 @@ fi
 
 # make sure that temporary files are cleaned up after use in ANY case
 trap "cleanup" QUIT EXIT
+trap "child_error" USR1
 
 readonly VERSION="2.9dev"
 readonly SWCONTACT="dirk aet testssl dot sh"
@@ -11180,6 +11181,7 @@ EOF
      HTMLHEADER=false
      JSONHEADER=false
      #' Fix syntax highlight on sublime
+     "$CHILD_MASS_TESTING" && kill -s USR1 $PPID
      exit $1
 }
 
@@ -11391,6 +11393,11 @@ cleanup () {
      grep -q xtrace <<< "$SHELLOPTS" && ! "$DEBUG_ALLINONE" && exec 2>&42 42>&-
 }
 
+child_error() {
+     cleanup
+     exit 1
+}
+
 fatal() {
      outln
      prln_magenta "Fatal error: $1" >&2