diff --git a/tests/data/test900 b/tests/data/test900
index 2b6681b9e..e71fa94fd 100644
--- a/tests/data/test900
+++ b/tests/data/test900
@@ -20,10 +20,10 @@ smtp
SMTP
-From: different
-To: another
-
-body
+From: different
+To: another
+
+body
smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 900@foo --mail-rcpt 900@foobar.example --mail-from 900@from -T -
@@ -42,10 +42,10 @@ DATA
QUIT
-From: different
-To: another
-
-body
+From: different
+To: another
+
+body
.
diff --git a/tests/data/test901 b/tests/data/test901
index 5617c6d73..cc3409990 100644
--- a/tests/data/test901
+++ b/tests/data/test901
@@ -20,16 +20,16 @@ smtp
SMTP with CRLF-dot-CRLF in data
-From: different
-To: another
-
+From: different
+To: another
+
.
.
.
-
-body
+
+body
smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 901@foo --mail-from '<901@from>' -T -
@@ -47,16 +47,16 @@ DATA
QUIT
-From: different
-To: another
-
+From: different
+To: another
+
..
..
..
-
-body
+
+body
.
diff --git a/tests/data/test902 b/tests/data/test902
index 5cb920c78..c3b9fb442 100644
--- a/tests/data/test902
+++ b/tests/data/test902
@@ -26,10 +26,10 @@ smtp
RFC821-only SMTP server (EHLO not supported)
-From: different
-To: another
-
-body
+From: different
+To: another
+
+body
smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 902@foo --mail-from 902@from -T -
@@ -48,10 +48,10 @@ DATA
QUIT
-From: different
-To: another
-
-body
+From: different
+To: another
+
+body
.
diff --git a/tests/data/test903 b/tests/data/test903
index 35bac4567..defadf903 100644
--- a/tests/data/test903
+++ b/tests/data/test903
@@ -28,7 +28,7 @@ smtp
SMTP plain authentication
-mail body
+mail body
smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 903@foo --mail-from 903@from -u test:1234 -T -
@@ -48,7 +48,7 @@ DATA
QUIT
-mail body
+mail body
.
diff --git a/tests/data/test904 b/tests/data/test904
index 9c32a25e0..19e6f2226 100644
--- a/tests/data/test904
+++ b/tests/data/test904
@@ -28,7 +28,7 @@ smtp
SMTP login authentication
-mail body
+mail body
smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 904@foo --mail-from 904@from -u test:1234 -T -
@@ -49,7 +49,7 @@ DATA
QUIT
-mail body
+mail body
.
diff --git a/tests/data/test905 b/tests/data/test905
index d58361903..451a73d49 100644
--- a/tests/data/test905
+++ b/tests/data/test905
@@ -31,7 +31,7 @@ crypto
SMTP CRAM-MD5 authentication
-mail body
+mail body
smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 905@foo --mail-from 905@from -u tim:tanstaaftanstaaf -T -
@@ -51,7 +51,7 @@ DATA
QUIT
-mail body
+mail body
.
diff --git a/tests/data/test906 b/tests/data/test906
index da196009e..80c1e7ee6 100644
--- a/tests/data/test906
+++ b/tests/data/test906
@@ -20,10 +20,10 @@ smtp
SMTP without --mail-from
-From: different
-To: another
-
-body
+From: different
+To: another
+
+body
smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 906@foo -T -
@@ -41,10 +41,10 @@ DATA
QUIT
-From: different
-To: another
-
-body
+From: different
+To: another
+
+body
.
diff --git a/tests/data/test907 b/tests/data/test907
index f86bc8dca..45e453db0 100644
--- a/tests/data/test907
+++ b/tests/data/test907
@@ -27,7 +27,7 @@ smtp
SMTP plain authentication with initial response
-mail body
+mail body
smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 907@foo --mail-from 907@from -u test:1234 --sasl-ir -T -
@@ -46,7 +46,7 @@ DATA
QUIT
-mail body
+mail body
.
diff --git a/tests/data/test908 b/tests/data/test908
index ec14d3934..c1689287f 100644
--- a/tests/data/test908
+++ b/tests/data/test908
@@ -27,7 +27,7 @@ smtp
SMTP login authentication with initial response
-mail body
+mail body
smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 908@foo --mail-from 908@from -u test:1234 --sasl-ir -T -
@@ -47,7 +47,7 @@ DATA
QUIT
-mail body
+mail body
.