diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc
index 0441ffce6aee2218d339647956c8e78449f67d84..32df87e3ab78e4cc0f5b1865baf0036e21062901 100644
--- a/tests/data/Makefile.inc
+++ b/tests/data/Makefile.inc
@@ -91,14 +91,15 @@ test836 test837 test838 test839 test840 \
 test850 test851 test852 test853 test854 test855 test856 test857 test858 \
 test859 test860 test861 test862 test863 test864 test865 test866 test867 \
 test868 test869 test870 test871 test872 test873 test874 test875 test876 \
-test877 test878 test879 test880 test881 test882 \
+test877 test878 test879 test880 test881 test882 test883 test884 test885 \
+test886 \
 \
 test900 test901 test902 test903 test904 test905 test906 test907 test908 \
 test909 test910 test911 test912 test913 test914 test915 test916 test917 \
 test918 test919 test920 test921 test922 test923 test924 test925 test926 \
 test927 test928 test929 test930 test931 test932 test933 test934 test935 \
 test936 test937 test938 test939 test940 test941                         \
-        test946 test947 test948 test949 test950 test951 test952 test953 \
+                                        test950 test951 test952 test953 \
 \
 test1000 test1001 test1002 test1003 test1004 test1005 test1006 test1007 \
 test1008 test1009 test1010 test1011 test1012 test1013 test1014 test1015 \
diff --git a/tests/data/test946 b/tests/data/test883
similarity index 88%
rename from tests/data/test946
rename to tests/data/test883
index 46f7b10b368fa5e379e9265512ee71f3fedb3928..5d5a756a90ed1ba11c3f1a52173c7233d8f4e763 100644
--- a/tests/data/test946
+++ b/tests/data/test883
@@ -39,7 +39,7 @@ pop3
 POP3 external authentication
  </name>
  <command>
-'pop3://user;AUTH=EXTERNAL@%HOSTIP:%POP3PORT/946'
+'pop3://user;AUTH=EXTERNAL@%HOSTIP:%POP3PORT/883'
 </command>
 </client>
 
@@ -50,7 +50,7 @@ POP3 external authentication
 CAPA
 AUTH EXTERNAL
 dXNlcg==
-RETR 946
+RETR 883
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test947 b/tests/data/test884
similarity index 89%
rename from tests/data/test947
rename to tests/data/test884
index df1474ea20018172c97726e4f43f3c1197e4a47a..34fd94d13acd2d8711201db42a2dca3bf66999bc 100644
--- a/tests/data/test947
+++ b/tests/data/test884
@@ -39,7 +39,7 @@ pop3
 POP3 external authentication without credentials
  </name>
  <command>
-'pop3://;AUTH=EXTERNAL@%HOSTIP:%POP3PORT/947'
+'pop3://;AUTH=EXTERNAL@%HOSTIP:%POP3PORT/884'
 </command>
 </client>
 
@@ -50,7 +50,7 @@ POP3 external authentication without credentials
 CAPA
 AUTH EXTERNAL
 =
-RETR 947
+RETR 884
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test948 b/tests/data/test885
similarity index 87%
rename from tests/data/test948
rename to tests/data/test885
index 4ed21cb1fd0d61c89e68c63c21af7788330560e1..581e9b24f27c8c1b1601f7fcb1c8bdf7eda0f4da 100644
--- a/tests/data/test948
+++ b/tests/data/test885
@@ -39,7 +39,7 @@ pop3
 POP3 external authentication with initial response
  </name>
  <command>
-'pop3://user;AUTH=EXTERNAL@%HOSTIP:%POP3PORT/948' --sasl-ir
+'pop3://user;AUTH=EXTERNAL@%HOSTIP:%POP3PORT/885' --sasl-ir
 </command>
 </client>
 
@@ -49,7 +49,7 @@ POP3 external authentication with initial response
 <protocol>
 CAPA
 AUTH EXTERNAL dXNlcg==
-RETR 948
+RETR 885
 QUIT
 </protocol>
 </verify>
diff --git a/tests/data/test949 b/tests/data/test886
similarity index 88%
rename from tests/data/test949
rename to tests/data/test886
index 93f7f97f4bd25e0271d7192ddc41544b81fef377..3aca2f18f9bca117e96e0b37c1804abf107764bb 100644
--- a/tests/data/test949
+++ b/tests/data/test886
@@ -39,7 +39,7 @@ pop3
 POP3 external authentication with initial response without credentials
  </name>
  <command>
-'pop3://;AUTH=EXTERNAL@%HOSTIP:%POP3PORT/949' --sasl-ir
+'pop3://;AUTH=EXTERNAL@%HOSTIP:%POP3PORT/886' --sasl-ir
 </command>
 </client>
 
@@ -49,7 +49,7 @@ POP3 external authentication with initial response without credentials
 <protocol>
 CAPA
 AUTH EXTERNAL =
-RETR 949
+RETR 886
 QUIT
 </protocol>
 </verify>