diff --git a/tests/data/test800 b/tests/data/test800
index d528292725..4c5726021d 100644
--- a/tests/data/test800
+++ b/tests/data/test800
@@ -30,7 +30,7 @@ imap
 IMAP FETCH
  </name>
  <command>
-'imap://%HOSTIP:%IMAPPORT/801/;UID=1' -u user:secret
+'imap://%HOSTIP:%IMAPPORT/800/;UID=1' -u user:secret
 </command>
 </client>
 
@@ -40,7 +40,7 @@ IMAP FETCH
 <protocol>
 A001 CAPABILITY
 A002 LOGIN user secret
-A003 SELECT 801
+A003 SELECT 800
 A004 FETCH 1 BODY[]
 A005 LOGOUT
 </protocol>
diff --git a/tests/data/test850 b/tests/data/test850
index 2b7d057aa6..b0d0e3dc45 100644
--- a/tests/data/test850
+++ b/tests/data/test850
@@ -30,7 +30,7 @@ pop3
 POP3 RETR
  </name>
  <command>
-pop3://%HOSTIP:%POP3PORT/800 -u user:secret
+pop3://%HOSTIP:%POP3PORT/850 -u user:secret
 </command>
 </client>
 
@@ -41,7 +41,7 @@ pop3://%HOSTIP:%POP3PORT/800 -u user:secret
 CAPA
 USER user
 PASS secret
-RETR 800
+RETR 850
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test851 b/tests/data/test851
index 9027a5ab99..5ebb3a0945 100644
--- a/tests/data/test851
+++ b/tests/data/test851
@@ -11,7 +11,7 @@ LIST
 <reply>
 <servercmd>
 # include the '.\r\n' 3-byte trailer to end the transfer poperly!
-REPLY LIST +OK 808 100\r\n.
+REPLY LIST +OK 851 100\r\n.
 </servercmd>
 </reply>
 
@@ -25,7 +25,7 @@ pop3
 POP3 LIST one message
  </name>
  <command>
-pop3://%HOSTIP:%POP3PORT/808 -l -u user:secret
+pop3://%HOSTIP:%POP3PORT/851 -l -u user:secret
 </command>
 </client>
 
@@ -36,7 +36,7 @@ pop3://%HOSTIP:%POP3PORT/808 -l -u user:secret
 CAPA
 USER user
 PASS secret
-LIST 808
+LIST 851
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test852 b/tests/data/test852
index ffa9b3331d..e07c172bcb 100644
--- a/tests/data/test852
+++ b/tests/data/test852
@@ -25,7 +25,7 @@ pop3
 POP3 LIST invalid message
  </name>
  <command>
-pop3://%HOSTIP:%POP3PORT/809 -l -u user:secret
+pop3://%HOSTIP:%POP3PORT/852 -l -u user:secret
 </command>
 </client>
 
@@ -39,7 +39,7 @@ pop3://%HOSTIP:%POP3PORT/809 -l -u user:secret
 CAPA
 USER user
 PASS secret
-LIST 809
+LIST 852
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test855 b/tests/data/test855
index dbf40c4913..bcbdf48162 100644
--- a/tests/data/test855
+++ b/tests/data/test855
@@ -25,7 +25,7 @@ pop3
 POP3 RETR invalid message
  </name>
  <command>
-pop3://%HOSTIP:%POP3PORT/812 -u user:secret
+pop3://%HOSTIP:%POP3PORT/855 -u user:secret
 </command>
 </client>
 
@@ -39,7 +39,7 @@ pop3://%HOSTIP:%POP3PORT/812 -u user:secret
 CAPA
 USER user
 PASS secret
-RETR 812
+RETR 855
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test856 b/tests/data/test856
index fac4aa0ef7..7076cf6a91 100644
--- a/tests/data/test856
+++ b/tests/data/test856
@@ -24,7 +24,7 @@ pop3
 POP3 invalid login
  </name>
  <command>
-pop3://%HOSTIP:%POP3PORT/813 -u user:wrong
+pop3://%HOSTIP:%POP3PORT/856 -u user:wrong
 </command>
 </client>
 
diff --git a/tests/data/test857 b/tests/data/test857
index 261887f9bc..716c49e89e 100644
--- a/tests/data/test857
+++ b/tests/data/test857
@@ -41,7 +41,7 @@ pop3
 POP3 RETR with dot-prefixed line
  </name>
  <command>
-pop3://%HOSTIP:%POP3PORT/815 -u user:secret
+pop3://%HOSTIP:%POP3PORT/857 -u user:secret
 </command>
 </client>
 
@@ -52,7 +52,7 @@ pop3://%HOSTIP:%POP3PORT/815 -u user:secret
 CAPA
 USER user
 PASS secret
-RETR 815
+RETR 857
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test900 b/tests/data/test900
index 12e46c9c3c..2b6681b9ee 100644
--- a/tests/data/test900
+++ b/tests/data/test900
@@ -26,7 +26,7 @@ To: another
 body
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 802@foo --mail-rcpt 802@foobar.example --mail-from 802@from -T -
+smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 900@foo --mail-rcpt 900@foobar.example --mail-from 900@from -T -
 </command>
 </client>
 
@@ -35,9 +35,9 @@ smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 802@foo --mail-rcpt 802@foobar.example
 <verify>
 <protocol>
 EHLO user
-MAIL FROM:<802@from>
-RCPT TO:<802@foo>
-RCPT TO:<802@foobar.example>
+MAIL FROM:<900@from>
+RCPT TO:<900@foo>
+RCPT TO:<900@foobar.example>
 DATA
 QUIT
 </protocol>
diff --git a/tests/data/test901 b/tests/data/test901
index a00ed7ab6f..5617c6d737 100644
--- a/tests/data/test901
+++ b/tests/data/test901
@@ -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 901@foo --mail-from '<901@from>' -T -
 </command>
 </client>
 
@@ -41,8 +41,8 @@ smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 803@foo --mail-from '<803@from>' -T -
 <verify>
 <protocol>
 EHLO user
-MAIL FROM:<803@from>
-RCPT TO:<803@foo>
+MAIL FROM:<901@from>
+RCPT TO:<901@foo>
 DATA
 QUIT
 </protocol>
diff --git a/tests/data/test902 b/tests/data/test902
index cfacfc64f2..5cb920c789 100644
--- a/tests/data/test902
+++ b/tests/data/test902
@@ -32,7 +32,7 @@ To: another
 body
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 804@foo --mail-from 804@from -T -
+smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 902@foo --mail-from 902@from -T -
 </command>
 </client>
 
@@ -42,8 +42,8 @@ smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 804@foo --mail-from 804@from -T -
 <protocol>
 EHLO user
 HELO user
-MAIL FROM:<804@from>
-RCPT TO:<804@foo>
+MAIL FROM:<902@from>
+RCPT TO:<902@foo>
 DATA
 QUIT
 </protocol>
diff --git a/tests/data/test903 b/tests/data/test903
index d124e40e71..f9f2d09490 100644
--- a/tests/data/test903
+++ b/tests/data/test903
@@ -30,7 +30,7 @@ SMTP plain authentication
 mail body
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 805@foo --mail-from 805@from -u test:1234 -T -
+smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 903@foo --mail-from 903@from -u test:1234 -T -
 </command>
 </client>
 
@@ -40,8 +40,8 @@ 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>
-RCPT TO:<805@foo>
+MAIL FROM:<903@from>
+RCPT TO:<903@foo>
 DATA
 QUIT
 </protocol>
diff --git a/tests/data/test904 b/tests/data/test904
index 9d1c988149..eaccae8668 100644
--- a/tests/data/test904
+++ b/tests/data/test904
@@ -30,7 +30,7 @@ SMTP login authentication
 mail body
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 806@foo --mail-from 806@from -u test:1234 -T -
+smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 904@foo --mail-from 904@from -u test:1234 -T -
 </command>
 </client>
 
@@ -41,8 +41,8 @@ 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>
-RCPT TO:<806@foo>
+MAIL FROM:<904@from>
+RCPT TO:<904@foo>
 DATA
 QUIT
 </protocol>
diff --git a/tests/data/test905 b/tests/data/test905
index 4165a1553e..d583619037 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 807@foo --mail-from 807@from -u tim:tanstaaftanstaaf -T -
+smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 905@foo --mail-from 905@from -u tim:tanstaaftanstaaf -T -
 </command>
 </client>
 
@@ -45,8 +45,8 @@ 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>
-RCPT TO:<807@foo>
+MAIL FROM:<905@from>
+RCPT TO:<905@foo>
 DATA
 QUIT
 </protocol>
diff --git a/tests/data/test906 b/tests/data/test906
index 1fc0607779..da196009e0 100644
--- a/tests/data/test906
+++ b/tests/data/test906
@@ -26,7 +26,7 @@ To: another
 body
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 814@foo -T -
+smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 906@foo -T -
 </command>
 </client>
 
@@ -36,7 +36,7 @@ smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 814@foo -T -
 <protocol>
 EHLO user
 MAIL FROM:<>
-RCPT TO:<814@foo>
+RCPT TO:<906@foo>
 DATA
 QUIT
 </protocol>