diff --git a/tests/data/test802 b/tests/data/test802
index 7027c802dee215a6794c993e0754f6c2e2cbfc30..12e46c9c3c944417c97727e1d4da28479b7c26ae 100644
--- a/tests/data/test802
+++ b/tests/data/test802
@@ -35,7 +35,7 @@ smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 802@foo --mail-rcpt 802@foobar.example
 <verify>
 <protocol>
 EHLO user
-MAIL FROM:802@from
+MAIL FROM:<802@from>
 RCPT TO:<802@foo>
 RCPT TO:<802@foobar.example>
 DATA
diff --git a/tests/data/test803 b/tests/data/test803
index 24ff0d0011f17d8a08748b37bbe9c447e47a9abf..a00ed7ab6fbf0c3094f6f0e9b2102f1508d42c4b 100644
--- a/tests/data/test803
+++ b/tests/data/test803
@@ -32,7 +32,7 @@ To: another
 body
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 803@foo --mail-from 803@from -T -
+smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 803@foo --mail-from '<803@from>' -T -
 </command>
 </client>
 
@@ -41,7 +41,7 @@ smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 803@foo --mail-from 803@from -T -
 <verify>
 <protocol>
 EHLO user
-MAIL FROM:803@from
+MAIL FROM:<803@from>
 RCPT TO:<803@foo>
 DATA
 QUIT
diff --git a/tests/data/test804 b/tests/data/test804
index 3d490c52b84e9c2270f1c4bc4c07899ccfb13f33..cfacfc64f2b35a6a4e5c070af3503be9a8daf47f 100644
--- a/tests/data/test804
+++ b/tests/data/test804
@@ -42,7 +42,7 @@ smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 804@foo --mail-from 804@from -T -
 <protocol>
 EHLO user
 HELO user
-MAIL FROM:804@from
+MAIL FROM:<804@from>
 RCPT TO:<804@foo>
 DATA
 QUIT
diff --git a/tests/data/test805 b/tests/data/test805
index fba5124f3bc7bf4cea364a8077febcd126fe9609..4595221c9e0943cfc1a2bcfac376dfdf3b5cf9a9 100644
--- a/tests/data/test805
+++ b/tests/data/test805
@@ -40,7 +40,7 @@ smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 805@foo --mail-from 805@from -u test:1
 <protocol>
 EHLO user
 AUTH PLAIN dGVzdAB0ZXN0ADEyMzQ=
-MAIL FROM:805@from
+MAIL FROM:<805@from>
 RCPT TO:<805@foo>
 DATA
 QUIT
diff --git a/tests/data/test806 b/tests/data/test806
index 8ece5dc8cab2eaf1d55fb963e6cdb67959818773..b71ac5cceef77a44dcfcbd2ce0f536086867abed 100644
--- a/tests/data/test806
+++ b/tests/data/test806
@@ -41,7 +41,7 @@ smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 806@foo --mail-from 806@from -u test:1
 EHLO user
 AUTH LOGIN dGVzdA==
 MTIzNA==
-MAIL FROM:806@from
+MAIL FROM:<806@from>
 RCPT TO:<806@foo>
 DATA
 QUIT
diff --git a/tests/data/test807 b/tests/data/test807
index 6daa1d02bce71b7678e38cc03920e7c24b0a36fe..d171ffabc78cc20c5069644ea343a5cbb0d010e4 100644
--- a/tests/data/test807
+++ b/tests/data/test807
@@ -45,7 +45,7 @@ smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 807@foo --mail-from 807@from -u tim:ta
 EHLO user
 AUTH CRAM-MD5
 dGltIGI5MTNhNjAyYzdlZGE3YTQ5NWI0ZTZlNzMzNGQzODkw
-MAIL FROM:807@from
+MAIL FROM:<807@from>
 RCPT TO:<807@foo>
 DATA
 QUIT