diff --git a/tests/golden/basic-posix-consistency b/tests/golden/basic-posix-consistency
index 3bf10ae1..e96251bc 100644
--- a/tests/golden/basic-posix-consistency
+++ b/tests/golden/basic-posix-consistency
@@ -56,3 +56,4 @@ mv: cannot move '/mnt/test/test/basic-posix-consistency/dir/c/clobber' to '/mnt/
 == inode indexes match after removing and syncing
 == concurrent creates make one file
 one-file
+== cleanup
diff --git a/tests/golden/change-devices b/tests/golden/change-devices
index 46f68e48..bd236b56 100644
--- a/tests/golden/change-devices
+++ b/tests/golden/change-devices
@@ -25,3 +25,4 @@ rc: 0
 equal_prepared
 large_prepared
 resized larger test rc: 0
+== cleanup
diff --git a/tests/golden/quota b/tests/golden/quota
index 2ab746c5..1c7333a6 100644
--- a/tests/golden/quota
+++ b/tests/golden/quota
@@ -38,3 +38,4 @@ dd: error writing '/mnt/test/test/quota/dir/file': Disk quota exceeded
 fallocate: fallocate failed: Disk quota exceeded
 == added rules work after bulk restore
 touch: cannot touch '/mnt/test/test/quota/dir/file': Disk quota exceeded
+== cleanup
diff --git a/tests/golden/stage-release-race-alloc b/tests/golden/stage-release-race-alloc
index 3b12ba08..dbeade4b 100644
--- a/tests/golden/stage-release-race-alloc
+++ b/tests/golden/stage-release-race-alloc
@@ -1,2 +1,3 @@
 == create initial files
 == race stage and release
+== cleanup
diff --git a/tests/tests/basic-posix-consistency.sh b/tests/tests/basic-posix-consistency.sh
index 8b466054..17643a61 100644
--- a/tests/tests/basic-posix-consistency.sh
+++ b/tests/tests/basic-posix-consistency.sh
@@ -210,4 +210,7 @@ done
 wait
 ls "$T_D0/concurrent"
 
+echo "== cleanup"
+rm -f "$T_TMP.0" "$T_TMP.1"
+
 t_pass
diff --git a/tests/tests/change-devices.sh b/tests/tests/change-devices.sh
index c346161f..cb1e34cd 100644
--- a/tests/tests/change-devices.sh
+++ b/tests/tests/change-devices.sh
@@ -73,4 +73,7 @@ test "$large_tot" -gt "$equal_tot" ; echo "resized larger test rc: $?"
 umount "$SCR"
 losetup -d "$scr_loop"
 
+echo "== cleanup"
+rm -f "$T_TMP.small" "$T_TMP.equal" "$T_TMP.large"
+
 t_pass
diff --git a/tests/tests/quota.sh b/tests/tests/quota.sh
index 7def9d67..394c9d05 100644
--- a/tests/tests/quota.sh
+++ b/tests/tests/quota.sh
@@ -147,4 +147,7 @@ sync_and_drop
 setpriv $SET_UID touch "$FILE" 2>&1 | t_filter_fs
 reset_all
 
+echo "== cleanup"
+rm -f "$T_TMP.lots" "$T_TMP.list"
+
 t_pass
diff --git a/tests/tests/stage-release-race-alloc.sh b/tests/tests/stage-release-race-alloc.sh
index b9c74de5..e02cec83 100644
--- a/tests/tests/stage-release-race-alloc.sh
+++ b/tests/tests/stage-release-race-alloc.sh
@@ -62,4 +62,7 @@ for r in $(seq 1 1000); do
 	done
 done
 
+echo "== cleanup"
+rm -f "$T_TMP.log"
+
 t_pass