diff --git a/gentestdata.go b/gentestdata.go
index f3af437..03aa744 100644
--- a/gentestdata.go
+++ b/gentestdata.go
@@ -234,8 +234,7 @@ Accounts:
 	prefix := []byte{}
 	mf := tempfile()
 	xcheckf(err, "temp file for queue message")
-	defer os.Remove(mf.Name())
-	defer mf.Close()
+	defer store.CloseRemoveTempFile(c.log, mf, "test message")
 	const qmsg = "From: <test0@mox.example>\r\nTo: <other@remote.example>\r\nSubject: test\r\n\r\nthe message...\r\n"
 	_, err = fmt.Fprint(mf, qmsg)
 	xcheckf(err, "writing message")
@@ -289,17 +288,11 @@ Accounts:
 		}
 		mf := tempfile()
 		xcheckf(err, "creating temp file for delivery")
+		defer store.CloseRemoveTempFile(c.log, mf, "test message")
 		_, err = fmt.Fprint(mf, msg)
 		xcheckf(err, "writing deliver message to file")
 		err = accTest1.DeliverMessage(c.log, tx, &m, mf, false, true, false, true)
 
-		mfname := mf.Name()
-		xcheckf(err, "add message to account test1")
-		err = mf.Close()
-		xcheckf(err, "closing file")
-		err = os.Remove(mfname)
-		xcheckf(err, "removing temp message file")
-
 		err = tx.Get(&inbox)
 		xcheckf(err, "get inbox")
 		inbox.Add(m.MailboxCounts())
@@ -349,17 +342,12 @@ Accounts:
 		}
 		mf0 := tempfile()
 		xcheckf(err, "creating temp file for delivery")
+		defer store.CloseRemoveTempFile(c.log, mf0, "test message")
 		_, err = fmt.Fprint(mf0, msg0)
 		xcheckf(err, "writing deliver message to file")
 		err = accTest2.DeliverMessage(c.log, tx, &m0, mf0, false, false, false, true)
 		xcheckf(err, "add message to account test2")
 
-		mf0name := mf0.Name()
-		err = mf0.Close()
-		xcheckf(err, "closing file")
-		err = os.Remove(mf0name)
-		xcheckf(err, "removing temp message file")
-
 		err = tx.Get(&inbox)
 		xcheckf(err, "get inbox")
 		inbox.Add(m0.MailboxCounts())
@@ -380,17 +368,12 @@ Accounts:
 		}
 		mf1 := tempfile()
 		xcheckf(err, "creating temp file for delivery")
+		defer store.CloseRemoveTempFile(c.log, mf1, "test message")
 		_, err = fmt.Fprint(mf1, msg1)
 		xcheckf(err, "writing deliver message to file")
 		err = accTest2.DeliverMessage(c.log, tx, &m1, mf1, false, false, false, true)
 		xcheckf(err, "add message to account test2")
 
-		mf1name := mf1.Name()
-		err = mf1.Close()
-		xcheckf(err, "closing file")
-		err = os.Remove(mf1name)
-		xcheckf(err, "removing temp message file")
-
 		err = tx.Get(&sent)
 		xcheckf(err, "get sent")
 		sent.Add(m1.MailboxCounts())