diff --git a/tests/mansyntax.sh b/tests/mansyntax.sh
index 093da36e..73a0b4b3 100755
--- a/tests/mansyntax.sh
+++ b/tests/mansyntax.sh
@@ -25,7 +25,7 @@ ec=0
 if command -v grep >/dev/null 2>&1 && \
    man --help 2>/dev/null | grep -q warnings; then
 
-  trap 'rm -f "$dstdir/man3"' EXIT
+  trap 'rm -f "$dstdir/man3"' EXIT HUP INT TERM
 
   ln -sf "$mandir" "$dstdir/man3"
 
diff --git a/tests/test_sshd.test b/tests/test_sshd.test
index b6b92848..ff09f65b 100755
--- a/tests/test_sshd.test
+++ b/tests/test_sshd.test
@@ -91,7 +91,7 @@ chmod go-rwx \
   ${SSHD_FLAGS} &
 sshdpid=$!
 
-trap 'kill "${sshdpid}"; echo "# signal killing sshd"; exit 1;' EXIT
+trap 'kill "${sshdpid}"; echo "# signal killing sshd"; exit 1;' EXIT HUP INT TERM
 
 : "started sshd (${sshdpid})"
 
@@ -160,7 +160,7 @@ done
 
 : "killing sshd (${sshdpid})"
 kill "${sshdpid}" > /dev/null 2>&1
-trap '' EXIT
+trap '' EXIT HUP INT TERM
 
 [ "${via_args}" = '1' ] && [ "${total}" != '1' ] && ec="${anyerror}"