diff --git a/test/asm/test.sh b/test/asm/test.sh
index 2e734867..ea7b3c68 100755
--- a/test/asm/test.sh
+++ b/test/asm/test.sh
@@ -9,6 +9,8 @@ output="$(mktemp)"
 errput="$(mktemp)"
 rc=0
 
+trap "rm -f '$o' '$gb' '$input' '$output' '$errput'" EXIT
+
 bold="$(tput bold)"
 resbold="$(tput sgr0)"
 red="$(tput setaf 1)"
@@ -93,5 +95,4 @@ for i in *.asm; do
 	done
 done
 
-rm -f $o $gb $input $output
 exit $rc
diff --git a/test/link/test.sh b/test/link/test.sh
index 2245718c..45fb5321 100755
--- a/test/link/test.sh
+++ b/test/link/test.sh
@@ -7,6 +7,8 @@ gbtemp2=$(mktemp)
 outtemp=$(mktemp)
 rc=0
 
+trap "rm -f '$otemp' '$gbtemp' '$gbtemp2' '$outtemp'" EXIT
+
 bold=$(tput bold)
 resbold=$(tput sgr0)
 red=$(tput setaf 1)
@@ -112,5 +114,4 @@ for i in section-union/*.asm; do
 	rc=$(($? || $rc))
 done
 
-rm -f $otemp $gbtemp $gbtemp2 $outtemp
 exit $rc