diff --git a/tests/data/test1320 b/tests/data/test1320
index 15ec7bb6c2..1caa062b9e 100644
--- a/tests/data/test1320
+++ b/tests/data/test1320
@@ -35,7 +35,7 @@ To: another
 body
 </stdin>
  <command>
-smtp://smtp.1320:%SMTPPORT/user --mail-rcpt 1320@foo --mail-rcpt 1320@foobar.example --mail-from 1320@from -T - -p -x %HOSTIP:%PROXYPORT
+smtp://smtp.1320:%SMTPPORT/user --mail-rcpt 1320@foo --mail-rcpt 1320@foobar.example --mail-from 1320@example.com -T - -p -x %HOSTIP:%PROXYPORT
 </command>
 </client>
 
@@ -47,7 +47,7 @@ smtp://smtp.1320:%SMTPPORT/user --mail-rcpt 1320@foo --mail-rcpt 1320@foobar.exa
 </strip>
 <protocol>
 EHLO user
-MAIL FROM:<1320@from>
+MAIL FROM:<1320@example.com>
 RCPT TO:<1320@foo>
 RCPT TO:<1320@foobar.example>
 DATA
diff --git a/tests/data/test1406 b/tests/data/test1406
index 158d30b36b..ac98246702 100644
--- a/tests/data/test1406
+++ b/tests/data/test1406
@@ -32,7 +32,7 @@ To: another
 body
 </file>
  <command>
-smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 1406@foo --mail-rcpt 1406@foobar.example --mail-from 1406@from -T log/test1406.eml --libcurl log/test1406.c
+smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 1406@foo --mail-rcpt 1406@foobar.example --mail-from 1406@example.com -T log/test1406.eml --libcurl log/test1406.c
 </command>
 </client>
 
@@ -41,7 +41,7 @@ smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 1406@foo --mail-rcpt 1406@foobar.examp
 <verify>
 <protocol>
 EHLO user
-MAIL FROM:<1406@from> SIZE=38
+MAIL FROM:<1406@example.com> SIZE=38
 RCPT TO:<1406@foo>
 RCPT TO:<1406@foobar.example>
 DATA
@@ -80,7 +80,7 @@ int main(int argc, char *argv[])
   curl_easy_setopt(hnd, CURLOPT_MAXREDIRS, 50L);
   curl_easy_setopt(hnd, CURLOPT_VERBOSE, 1L);
   curl_easy_setopt(hnd, CURLOPT_TCP_KEEPALIVE, 1L);
-  curl_easy_setopt(hnd, CURLOPT_MAIL_FROM, "1406@from");
+  curl_easy_setopt(hnd, CURLOPT_MAIL_FROM, "1406@example.com");
   curl_easy_setopt(hnd, CURLOPT_MAIL_RCPT, slist1);
 
   /* Here is a list of options the curl code used that cannot get generated
diff --git a/tests/data/test900 b/tests/data/test900
index 749a965743..25b3f46368 100644
--- a/tests/data/test900
+++ b/tests/data/test900
@@ -26,7 +26,7 @@ To: another
 body
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 900@foo --mail-rcpt 900@foobar.example --mail-from 900@from -T -
+smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 900@foo --mail-rcpt 900@foobar.example --mail-from 900@example.com -T -
 </command>
 </client>
 
@@ -35,7 +35,7 @@ smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 900@foo --mail-rcpt 900@foobar.example
 <verify>
 <protocol>
 EHLO user
-MAIL FROM:<900@from>
+MAIL FROM:<900@example.com>
 RCPT TO:<900@foo>
 RCPT TO:<900@foobar.example>
 DATA
diff --git a/tests/data/test901 b/tests/data/test901
index ed24518241..8c512eb4ab 100644
--- a/tests/data/test901
+++ b/tests/data/test901
@@ -32,7 +32,7 @@ To: another
 body
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 901@foo --mail-from '<901@from>' -T -
+smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 901@foo --mail-from 901@example.com -T -
 </command>
 </client>
 
@@ -41,7 +41,7 @@ smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 901@foo --mail-from '<901@from>' -T -
 <verify>
 <protocol>
 EHLO user
-MAIL FROM:<901@from>
+MAIL FROM:<901@example.com>
 RCPT TO:<901@foo>
 DATA
 QUIT
diff --git a/tests/data/test902 b/tests/data/test902
index c61ab93532..89b10b5b0e 100644
--- a/tests/data/test902
+++ b/tests/data/test902
@@ -31,7 +31,7 @@ To: another
 body
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 902@foo --mail-from 902@from -T -
+smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 902@foo --mail-from 902@example.com -T -
 </command>
 </client>
 
@@ -41,7 +41,7 @@ smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 902@foo --mail-from 902@from -T -
 <protocol>
 EHLO user
 HELO user
-MAIL FROM:<902@from>
+MAIL FROM:<902@example.com>
 RCPT TO:<902@foo>
 DATA
 QUIT
diff --git a/tests/data/test903 b/tests/data/test903
index 157bd48cbe..c41ff3d569 100644
--- a/tests/data/test903
+++ b/tests/data/test903
@@ -31,7 +31,7 @@ SMTP plain authentication
 mail body
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 903@foo --mail-from 903@from -u test:1234 -T -
+smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 903@foo --mail-from 903@example.com -u test:1234 -T -
 </command>
 </client>
 
@@ -42,7 +42,7 @@ smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 903@foo --mail-from 903@from -u test:1
 EHLO user
 AUTH PLAIN
 dGVzdAB0ZXN0ADEyMzQ=
-MAIL FROM:<903@from>
+MAIL FROM:<903@example.com>
 RCPT TO:<903@foo>
 DATA
 QUIT
diff --git a/tests/data/test904 b/tests/data/test904
index 1a23f4157c..650181de05 100644
--- a/tests/data/test904
+++ b/tests/data/test904
@@ -31,7 +31,7 @@ SMTP login authentication
 mail body
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 904@foo --mail-from 904@from -u test:1234 -T -
+smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 904@foo --mail-from 904@example.com -u test:1234 -T -
 </command>
 </client>
 
@@ -43,7 +43,7 @@ EHLO user
 AUTH LOGIN
 dGVzdA==
 MTIzNA==
-MAIL FROM:<904@from>
+MAIL FROM:<904@example.com>
 RCPT TO:<904@foo>
 DATA
 QUIT
diff --git a/tests/data/test905 b/tests/data/test905
index fccd84baea..0068f59910 100644
--- a/tests/data/test905
+++ b/tests/data/test905
@@ -34,7 +34,7 @@ SMTP CRAM-MD5 authentication
 mail body
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 905@foo --mail-from 905@from -u tim:tanstaaftanstaaf -T -
+smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 905@foo --mail-from 905@example.com -u tim:tanstaaftanstaaf -T -
 </command>
 </client>
 
@@ -45,7 +45,7 @@ smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 905@foo --mail-from 905@from -u tim:ta
 EHLO user
 AUTH CRAM-MD5
 dGltIGI5MTNhNjAyYzdlZGE3YTQ5NWI0ZTZlNzMzNGQzODkw
-MAIL FROM:<905@from>
+MAIL FROM:<905@example.com>
 RCPT TO:<905@foo>
 DATA
 QUIT
diff --git a/tests/data/test907 b/tests/data/test907
index 511d51970e..d191a28777 100644
--- a/tests/data/test907
+++ b/tests/data/test907
@@ -30,7 +30,7 @@ SMTP plain authentication with initial response
 mail body
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 907@foo --mail-from 907@from -u test:1234 --sasl-ir -T -
+smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 907@foo --mail-from 907@example.com -u test:1234 --sasl-ir -T -
 </command>
 </client>
 
@@ -40,7 +40,7 @@ smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 907@foo --mail-from 907@from -u test:1
 <protocol>
 EHLO user
 AUTH PLAIN dGVzdAB0ZXN0ADEyMzQ=
-MAIL FROM:<907@from>
+MAIL FROM:<907@example.com>
 RCPT TO:<907@foo>
 DATA
 QUIT
diff --git a/tests/data/test908 b/tests/data/test908
index 61d56c5e04..3f4d4242af 100644
--- a/tests/data/test908
+++ b/tests/data/test908
@@ -30,7 +30,7 @@ SMTP login authentication with initial response
 mail body
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 908@foo --mail-from 908@from -u test:1234 --sasl-ir -T -
+smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 908@foo --mail-from 908@example.com -u test:1234 --sasl-ir -T -
 </command>
 </client>
 
@@ -41,7 +41,7 @@ smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 908@foo --mail-from 908@from -u test:1
 EHLO user
 AUTH LOGIN dGVzdA==
 MTIzNA==
-MAIL FROM:<908@from>
+MAIL FROM:<908@example.com>
 RCPT TO:<908@foo>
 DATA
 QUIT
diff --git a/tests/data/test909 b/tests/data/test909
index 2fc1f191d9..0122dfe48e 100644
--- a/tests/data/test909
+++ b/tests/data/test909
@@ -30,7 +30,7 @@ To: another
 body
 </file>
  <command>
-smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 909@foo --mail-rcpt 909@foobar.example --mail-from 909@from -T log/test909.eml
+smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 909@foo --mail-rcpt 909@foobar.example --mail-from 909@example.com -T log/test909.eml
 </command>
 </client>
 
@@ -39,7 +39,7 @@ smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 909@foo --mail-rcpt 909@foobar.example
 <verify>
 <protocol>
 EHLO user
-MAIL FROM:<909@from>
+MAIL FROM:<909@example.com>
 RCPT TO:<909@foo>
 RCPT TO:<909@foobar.example>
 DATA
diff --git a/tests/data/test910 b/tests/data/test910
index 5013fdc75f..5f8186f663 100644
--- a/tests/data/test910
+++ b/tests/data/test910
@@ -26,7 +26,7 @@ To: another
 body
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 910@foo --mail-rcpt 910@foobar.example --mail-from 910@from -T -
+smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 910@foo --mail-rcpt 910@foobar.example --mail-from 910@example.com -T -
 </command>
 </client>
 
@@ -35,7 +35,7 @@ smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 910@foo --mail-rcpt 910@foobar.example
 <verify>
 <protocol>
 EHLO user
-MAIL FROM:<910@from>
+MAIL FROM:<910@example.com>
 RCPT TO:<910@foo>
 RCPT TO:<910@foobar.example>
 DATA
diff --git a/tests/data/test911 b/tests/data/test911
index 6b7a1f40e8..c8cecdc9cb 100644
--- a/tests/data/test911
+++ b/tests/data/test911
@@ -25,7 +25,7 @@ SMTP with no mail data
 </stdin>
 
  <command>
-smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 911@foo --mail-rcpt 911@foobar.example --mail-from 911@from -T -
+smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 911@foo --mail-rcpt 911@foobar.example --mail-from 911@example.com -T -
 </command>
 </client>
 
@@ -34,7 +34,7 @@ smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 911@foo --mail-rcpt 911@foobar.example
 <verify>
 <protocol>
 EHLO user
-MAIL FROM:<911@from>
+MAIL FROM:<911@example.com>
 RCPT TO:<911@foo>
 RCPT TO:<911@foobar.example>
 DATA
diff --git a/tests/data/test912 b/tests/data/test912
index beea8a2467..7c9d7bbe71 100644
--- a/tests/data/test912
+++ b/tests/data/test912
@@ -30,7 +30,7 @@ To: another
 body
 </file>
  <command>
-smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 912@foo --mail-from 912@from -T log/test912.eml
+smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 912@foo --mail-from 912@example.com -T log/test912.eml
 </command>
 </client>
 
@@ -39,7 +39,7 @@ smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 912@foo --mail-from 912@from -T log/te
 <verify>
 <protocol>
 EHLO user
-MAIL FROM:<912@from> SIZE=38
+MAIL FROM:<912@example.com> SIZE=38
 RCPT TO:<912@foo>
 DATA
 QUIT