diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index 88310563d7..b985b70a3a 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -70,9 +70,9 @@ test850 test851 test852 test853 test854 test855 test856 test857 test858 \
 test859 test860 test861 test862 test863 test864 test865 test866 test867 \
 test868 test869 test870 \
 \
-test900 test901 test902 test903 test904 test905 test906 test907 test908 \
+test900 test901 test902 test903 test904 test905 test906                 \
 test909 test910 test911 test912 test913 test914 test915 test916 test917 \
-test918 \
+test918 test919 test920 \
 \
 test1000 test1001 test1002 test1003 test1004 test1005 test1006 test1007 \
 test1008 test1009 test1010 test1011 test1012 test1013 test1014 test1015 \
diff --git a/tests/data/test907 b/tests/data/test919
similarity index 88%
rename from tests/data/test907
rename to tests/data/test919
index 20533b9021..bc26fef55e 100644
--- a/tests/data/test907
+++ b/tests/data/test919
@@ -30,7 +30,7 @@ SMTP plain authentication with initial response
 mail body
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/907 --mail-rcpt recipient@example.com --mail-from sender@example.com -u test:1234 --sasl-ir -T -
+smtp://%HOSTIP:%SMTPPORT/919 --mail-rcpt recipient@example.com --mail-from sender@example.com -u test:1234 --sasl-ir -T -
 </command>
 </client>
 
@@ -38,7 +38,7 @@ smtp://%HOSTIP:%SMTPPORT/907 --mail-rcpt recipient@example.com --mail-from sende
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 907
+EHLO 919
 AUTH PLAIN dGVzdAB0ZXN0ADEyMzQ=
 MAIL FROM:<sender@example.com>
 RCPT TO:<recipient@example.com>
diff --git a/tests/data/test908 b/tests/data/test920
similarity index 89%
rename from tests/data/test908
rename to tests/data/test920
index 9f46363b6c..8502215e25 100644
--- a/tests/data/test908
+++ b/tests/data/test920
@@ -30,7 +30,7 @@ SMTP login authentication with initial response
 mail body
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/908 --mail-rcpt recipient@example.com --mail-from sender@example.com -u test:1234 --sasl-ir -T -
+smtp://%HOSTIP:%SMTPPORT/920 --mail-rcpt recipient@example.com --mail-from sender@example.com -u test:1234 --sasl-ir -T -
 </command>
 </client>
 
@@ -38,7 +38,7 @@ smtp://%HOSTIP:%SMTPPORT/908 --mail-rcpt recipient@example.com --mail-from sende
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 908
+EHLO 920
 AUTH LOGIN dGVzdA==
 MTIzNA==
 MAIL FROM:<sender@example.com>