diff --git a/tests/data/test853 b/tests/data/test853
index de5236420d..3b57e7d086 100644
--- a/tests/data/test853
+++ b/tests/data/test853
@@ -18,11 +18,11 @@ SLOWDOWN
 </servercmd>
 # When doing LIST, we get the default list output hard-coded in the test
 # POP3 server
-<datacheck>
+<data>
 1 100
 2 4294967400
 3 200
-</datacheck>
+</data>
 </reply>
 
 #
diff --git a/tests/ftpserver.pl b/tests/ftpserver.pl
index 282121d69d..3da888976a 100755
--- a/tests/ftpserver.pl
+++ b/tests/ftpserver.pl
@@ -1862,12 +1862,7 @@ sub RETR_pop3 {
 }
 
 sub LIST_pop3 {
-    # This is a built-in fake-message list
-    my @data = (
-        "1 100\r\n",
-        "2 4294967400\r\n",  # > 4 GB
-        "3 200\r\n",
-    );
+    my @data = getpart("reply", "data");
 
     logmsg "retrieve a message list\n";