diff --git a/tests/ftpserver.pl b/tests/ftpserver.pl
index e5c461a450a30695c4b72a4e9447c9a75507b285..76b6f4bea628f612eb8279b2758ec703f22353b7 100755
--- a/tests/ftpserver.pl
+++ b/tests/ftpserver.pl
@@ -452,6 +452,9 @@ sub getreplydata {
     loadtest("$srcdir/data/test$testno");
 
     my @data = getpart("reply", "data$testpart");
+    if((!@data) && ($testpart ne "")) {
+        @data = getpart("reply", "data");
+    }
 
     return @data;
 }