diff --git a/tests/data/test805 b/tests/data/test805
index 87039518c..d84658b87 100644
--- a/tests/data/test805
+++ b/tests/data/test805
@@ -19,7 +19,7 @@ UPLOAD
 imap
 </server>
  <name>
-IMAP APPEND
+IMAP APPEND message
  </name>
  <command>
 -u user:secret -T log/upload805 'imap://%HOSTIP:%IMAPPORT/805'
diff --git a/tests/data/test806 b/tests/data/test806
index 59f6b1ec0..876a7f5fd 100644
--- a/tests/data/test806
+++ b/tests/data/test806
@@ -23,7 +23,7 @@ LIST
 imap
 </server>
  <name>
-IMAP LIST
+IMAP LIST mailbox
  </name>
  <command>
 -u user:secret 'imap://%HOSTIP:%IMAPPORT/806/'
diff --git a/tests/data/test808 b/tests/data/test808
index 52ecb841f..60d0ba74f 100644
--- a/tests/data/test808
+++ b/tests/data/test808
@@ -28,10 +28,10 @@ CUSTOMREQUEST
 imap
 </server>
  <name>
-IMAP EXAMINE (CUSTOMREQUEST)
+IMAP EXAMINE mailbox (CUSTOMREQUEST)
  </name>
  <command>
-'imap://%HOSTIP:%IMAPPORT' -u user:secret -X 'EXAMINE 808'
+imap://%HOSTIP:%IMAPPORT -u user:secret -X 'EXAMINE 808'
 </command>
 </client>
 
diff --git a/tests/data/test809 b/tests/data/test809
index 099dd3322..1ef631322 100644
--- a/tests/data/test809
+++ b/tests/data/test809
@@ -22,7 +22,7 @@ CUSTOMREQUEST
 imap
 </server>
  <name>
-IMAP STATUS (CUSTOMREQUEST)
+IMAP mailbox STATUS (CUSTOMREQUEST)
  </name>
  <command>
 imap://%HOSTIP:%IMAPPORT -u user:secret -X 'STATUS 809 (UIDNEXT MESSAGES)'
diff --git a/tests/data/test810 b/tests/data/test810
index 6eee2be5b..ab5e6e10f 100644
--- a/tests/data/test810
+++ b/tests/data/test810
@@ -22,7 +22,7 @@ CUSTOMREQUEST
 imap
 </server>
  <name>
-IMAP SEARCH (CUSTOMREQUEST)
+IMAP SEARCH for NEW messages (CUSTOMREQUEST)
  </name>
  <command>
 imap://%HOSTIP:%IMAPPORT/810 -u user:secret -X 'SEARCH NEW'
diff --git a/tests/data/test811 b/tests/data/test811
index 9d9469433..8a4d06bc2 100644
--- a/tests/data/test811
+++ b/tests/data/test811
@@ -19,7 +19,7 @@ CUSTOMREQUEST
 imap
 </server>
  <name>
-IMAP CREATE Mailbox (CUSTOMREQUEST)
+IMAP CREATE mailbox (CUSTOMREQUEST)
  </name>
  <command>
 imap://%HOSTIP:%IMAPPORT -u user:secret -X 'CREATE 811'
diff --git a/tests/data/test812 b/tests/data/test812
index 586ed759b..a4b8db5f8 100644
--- a/tests/data/test812
+++ b/tests/data/test812
@@ -19,7 +19,7 @@ CUSTOMREQUEST
 imap
 </server>
  <name>
-IMAP DELETE Mailbox (CUSTOMREQUEST)
+IMAP DELETE mailbox (CUSTOMREQUEST)
  </name>
  <command>
 imap://%HOSTIP:%IMAPPORT -u user:secret -X 'DELETE 812'
diff --git a/tests/data/test813 b/tests/data/test813
index f157919a0..06514c2c4 100644
--- a/tests/data/test813
+++ b/tests/data/test813
@@ -19,7 +19,7 @@ CUSTOMREQUEST
 imap
 </server>
  <name>
-IMAP RENAME Mailbox (CUSTOMREQUEST)
+IMAP RENAME mailbox (CUSTOMREQUEST)
  </name>
  <command>
 imap://%HOSTIP:%IMAPPORT -u user:secret -X 'RENAME 666 813'
diff --git a/tests/data/test814 b/tests/data/test814
index 53ae75fe2..8d653aba4 100644
--- a/tests/data/test814
+++ b/tests/data/test814
@@ -19,7 +19,7 @@ CUSTOMREQUEST
 imap
 </server>
  <name>
-IMAP CHECK Mailbox (CUSTOMREQUEST)
+IMAP CHECK mailbox (CUSTOMREQUEST)
  </name>
  <command>
 imap://%HOSTIP:%IMAPPORT/814 -u user:secret -X 'CHECK'