diff --git a/tests/data/test804 b/tests/data/test804
index 3fcf95536..7e13bb12b 100644
--- a/tests/data/test804
+++ b/tests/data/test804
@@ -27,7 +27,7 @@ imap
 IMAP doesn't perform SELECT if re-using the same mailbox
  </name>
  <command>
--u user:secret 'imap://%HOSTIP:%IMAPPORT/804/;UID=123/;SECTION=1' 'imap://%HOSTIP:%IMAPPORT/804/;UID=456/;SECTION=2.3'
+'imap://%HOSTIP:%IMAPPORT/804/;UID=123/;SECTION=1' 'imap://%HOSTIP:%IMAPPORT/804/;UID=456/;SECTION=2.3' -u user:secret
 </command>
 </client>
 
diff --git a/tests/data/test805 b/tests/data/test805
index d84658b87..3c20ff460 100644
--- a/tests/data/test805
+++ b/tests/data/test805
@@ -22,7 +22,7 @@ imap
 IMAP APPEND message
  </name>
  <command>
--u user:secret -T log/upload805 'imap://%HOSTIP:%IMAPPORT/805'
+imap://%HOSTIP:%IMAPPORT/805 -T log/upload805 -u user:secret
 </command>
 <file name="log/upload805">
 Date: Mon, 7 Feb 1994 21:52:25 -0800 (PST)
diff --git a/tests/data/test806 b/tests/data/test806
index 876a7f5fd..fafcdcce7 100644
--- a/tests/data/test806
+++ b/tests/data/test806
@@ -26,7 +26,7 @@ imap
 IMAP LIST mailbox
  </name>
  <command>
--u user:secret 'imap://%HOSTIP:%IMAPPORT/806/'
+imap://%HOSTIP:%IMAPPORT/806 -u user:secret
 </command>
 </client>