diff --git a/tests/data/test1319 b/tests/data/test1319
index ab31b9c25..6461f476a 100644
--- a/tests/data/test1319
+++ b/tests/data/test1319
@@ -18,7 +18,7 @@ To: fake@nowhere
 body
 
 --
-  yours sincerely
+  yours sincerely
 </data>
 
 <datacheck>
@@ -30,7 +30,7 @@ To: fake@nowhere
 body
 
 --
-  yours sincerely
+  yours sincerely
 </datacheck>
 </reply>
 
diff --git a/tests/data/test800 b/tests/data/test800
index 3281b632d..8c4850147 100644
--- a/tests/data/test800
+++ b/tests/data/test800
@@ -10,13 +10,13 @@ RETR
 # Server-side
 <reply>
 <data>
-From: me@somewhere
-To: fake@nowhere
-
-body
-
---
-  yours sincerely
+From: me@somewhere
+To: fake@nowhere
+
+body
+
+--
+  yours sincerely
 </data>
 </reply>
 
diff --git a/tests/ftpserver.pl b/tests/ftpserver.pl
index b4039b381..034ac710d 100755
--- a/tests/ftpserver.pl
+++ b/tests/ftpserver.pl
@@ -6,7 +6,7 @@
 #                            | (__| |_| |  _ <| |___
 #                             \___|\___/|_| \_\_____|
 #
-# Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
 #
 # This software is licensed as described in the file COPYING, which
 # you should have received as part of this distribution. The terms
@@ -857,8 +857,9 @@ sub RETR_pop3 {
          sendcontrol $d;
      }
 
-     # end with the magic 5-byte end of mail marker
-     sendcontrol "\r\n.\r\n";
+     # end with the magic 3-byte end of mail marker, assumes that the
+     # mail body ends with a CRLF!
+     sendcontrol ".\r\n";
 
      return 0;
 }
@@ -880,8 +881,8 @@ my @pop3list=(
          sendcontrol $d;
      }
 
-     # end with the magic 5-byte end of listing marker
-     sendcontrol "\r\n.\r\n";
+     # end with the magic 3-byte end of listing marker
+     sendcontrol ".\r\n";
 
      return 0;
 }