diff --git a/.gitignore b/.gitignore
index 060178d..3ba63aa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,30 +3,18 @@
 /rfc/[0-9][0-9]*
 /local/
 /testdata/check/
-/testdata/ctl/data/
+/testdata/*/data/
 /testdata/ctl/dkim/
-/testdata/dmarcdb/data/
 /testdata/empty/
 /testdata/exportmaildir/
 /testdata/exportmbox/
-/testdata/httpaccount/data/
 /testdata/imap/data/
-/testdata/imapserverfuzz/data/
-/testdata/imaptest/data/
 /testdata/junk/*.bloom
 /testdata/junk/*.db
-/testdata/queue/data/
 /testdata/sent/
-/testdata/smtp/data/
 /testdata/smtp/datajunk/
-/testdata/smtp/sendlimit/data/
-/testdata/smtp/catchall/data/
 /testdata/smtp/postmaster/
-/testdata/smtpserverfuzz/data/
-/testdata/store/data/
-/testdata/tlsrptsend/data/
 /testdata/train/
-/testdata/webmail/data/
 /testdata/upgradetest.mbox.gz
 /testdata/integration/example-integration.zone
 /testdata/integration/tmp-pebble-ca.pem
diff --git a/smtpserver/server_test.go b/smtpserver/server_test.go
index 74225b1..1f28f6a 100644
--- a/smtpserver/server_test.go
+++ b/smtpserver/server_test.go
@@ -1193,7 +1193,7 @@ func TestNonSMTP(t *testing.T) {
 
 // Test limits on outgoing messages.
 func TestLimitOutgoing(t *testing.T) {
-	ts := newTestServer(t, filepath.FromSlash("../testdata/smtp/sendlimit/mox.conf"), dns.MockResolver{})
+	ts := newTestServer(t, filepath.FromSlash("../testdata/smtpserversendlimit/mox.conf"), dns.MockResolver{})
 	defer ts.close()
 
 	ts.user = "mjl@mox.example"
@@ -1237,7 +1237,7 @@ func TestCatchall(t *testing.T) {
 			"127.0.0.10": {"other.example."},
 		},
 	}
-	ts := newTestServer(t, filepath.FromSlash("../testdata/smtp/catchall/mox.conf"), resolver)
+	ts := newTestServer(t, filepath.FromSlash("../testdata/smtpservercatchall/mox.conf"), resolver)
 	defer ts.close()
 
 	testDeliver := func(rcptTo string, expErr *smtpclient.Error) {
diff --git a/testdata/smtp/catchall/domains.conf b/testdata/smtpservercatchall/domains.conf
similarity index 100%
rename from testdata/smtp/catchall/domains.conf
rename to testdata/smtpservercatchall/domains.conf
diff --git a/testdata/smtp/catchall/mox.conf b/testdata/smtpservercatchall/mox.conf
similarity index 100%
rename from testdata/smtp/catchall/mox.conf
rename to testdata/smtpservercatchall/mox.conf
diff --git a/testdata/smtp/sendlimit/domains.conf b/testdata/smtpserversendlimit/domains.conf
similarity index 100%
rename from testdata/smtp/sendlimit/domains.conf
rename to testdata/smtpserversendlimit/domains.conf
diff --git a/testdata/smtp/sendlimit/mox.conf b/testdata/smtpserversendlimit/mox.conf
similarity index 100%
rename from testdata/smtp/sendlimit/mox.conf
rename to testdata/smtpserversendlimit/mox.conf