diff --git a/tests/data/test1349 b/tests/data/test1349
index 63c06e2983..9c74aed958 100644
--- a/tests/data/test1349
+++ b/tests/data/test1349
@@ -58,7 +58,7 @@ mooo
 230 Welcome you silly person
 257 "/" is current directory
 250 CWD command successful.
-229 Entering Passive Mode (stripped)
+229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted
 213 10
 150 Binary data connection for %TESTNUMBER () (10 bytes).
diff --git a/tests/data/test1350 b/tests/data/test1350
index 5d7a365394..fcf78744b3 100644
--- a/tests/data/test1350
+++ b/tests/data/test1350
@@ -58,7 +58,7 @@ mooo
 230 Welcome you silly person
 257 "/" is current directory
 250 CWD command successful.
-229 Entering Passive Mode (stripped)
+229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted
 213 10
 150 Binary data connection for %TESTNUMBER () (10 bytes).
diff --git a/tests/data/test1351 b/tests/data/test1351
index d05f9b026c..c1ed52d4a5 100644
--- a/tests/data/test1351
+++ b/tests/data/test1351
@@ -59,7 +59,7 @@ mooo
 230 Welcome you silly person
 257 "/" is current directory
 250 CWD command successful.
-229 Entering Passive Mode (stripped)
+229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted
 213 10
 150 Binary data connection for %TESTNUMBER () (10 bytes).
diff --git a/tests/data/test1352 b/tests/data/test1352
index db093ab72b..c54ca4a217 100644
--- a/tests/data/test1352
+++ b/tests/data/test1352
@@ -59,7 +59,7 @@ mooo
 230 Welcome you silly person
 257 "/" is current directory
 250 CWD command successful.
-229 Entering Passive Mode (stripped)
+229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted
 213 10
 150 Binary data connection for %TESTNUMBER () (10 bytes).
diff --git a/tests/data/test1353 b/tests/data/test1353
index 45308f1cf1..2b6af8cf01 100644
--- a/tests/data/test1353
+++ b/tests/data/test1353
@@ -58,7 +58,7 @@ mooo
 230 Welcome you silly person
 257 "/" is current directory
 250 CWD command successful.
-229 Entering Passive Mode (stripped)
+229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted
 213 10
 150 Binary data connection for %TESTNUMBER () (10 bytes).
diff --git a/tests/data/test1354 b/tests/data/test1354
index dfba8ba3a5..3bf6ddde16 100644
--- a/tests/data/test1354
+++ b/tests/data/test1354
@@ -56,7 +56,7 @@ mooo
 230 Welcome you silly person
 257 "/" is current directory
 250 CWD command successful.
-229 Entering Passive Mode (stripped)
+229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted
 213 10
 150 Binary data connection for %TESTNUMBER () (10 bytes).
diff --git a/tests/data/test1357 b/tests/data/test1357
index 25ce6b24b7..7e83e87feb 100644
--- a/tests/data/test1357
+++ b/tests/data/test1357
@@ -71,7 +71,7 @@ MOOOO
 230 Welcome you silly person
 257 "/" is current directory
 250 CWD command successful.
-229 Entering Passive Mode (stripped)
+229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted
 213 214
 150 Binary data connection for %TESTNUMBER () (214 bytes).
diff --git a/tests/data/test1358 b/tests/data/test1358
index c5e3ce80fb..3eb623cb6b 100644
--- a/tests/data/test1358
+++ b/tests/data/test1358
@@ -71,7 +71,7 @@ MOOOO
 230 Welcome you silly person
 257 "/" is current directory
 250 CWD command successful.
-229 Entering Passive Mode (stripped)
+229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted
 213 214
 150 Binary data connection for %TESTNUMBER () (214 bytes).
diff --git a/tests/data/test1359 b/tests/data/test1359
index e7d0058600..98765b285d 100644
--- a/tests/data/test1359
+++ b/tests/data/test1359
@@ -72,7 +72,7 @@ MOOOO
 230 Welcome you silly person
 257 "/" is current directory
 250 CWD command successful.
-229 Entering Passive Mode (stripped)
+229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted
 213 214
 150 Binary data connection for %TESTNUMBER () (214 bytes).
diff --git a/tests/data/test1360 b/tests/data/test1360
index 794ba64536..117ef84b37 100644
--- a/tests/data/test1360
+++ b/tests/data/test1360
@@ -72,7 +72,7 @@ MOOOO
 230 Welcome you silly person
 257 "/" is current directory
 250 CWD command successful.
-229 Entering Passive Mode (stripped)
+229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted
 213 214
 150 Binary data connection for %TESTNUMBER () (214 bytes).
diff --git a/tests/data/test1361 b/tests/data/test1361
index 13138941d7..9215c23ca2 100644
--- a/tests/data/test1361
+++ b/tests/data/test1361
@@ -71,7 +71,7 @@ MOOOO
 230 Welcome you silly person
 257 "/" is current directory
 250 CWD command successful.
-229 Entering Passive Mode (stripped)
+229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted
 213 214
 150 Binary data connection for %TESTNUMBER () (214 bytes).
diff --git a/tests/data/test1362 b/tests/data/test1362
index 1ffa1a2e9a..9ad0fa7424 100644
--- a/tests/data/test1362
+++ b/tests/data/test1362
@@ -71,7 +71,7 @@ MOOOO
 230 Welcome you silly person
 257 "/" is current directory
 250 CWD command successful.
-229 Entering Passive Mode (stripped)
+229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted
 213 214
 150 Binary data connection for %TESTNUMBER () (214 bytes).
diff --git a/tests/data/test1379 b/tests/data/test1379
index 5faf44ac1b..953c9b6cd8 100644
--- a/tests/data/test1379
+++ b/tests/data/test1379
@@ -56,7 +56,7 @@ mooo
 230 Welcome you silly person
 257 "/" is current directory
 250 CWD command successful.
-229 Entering Passive Mode (stripped)
+229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted
 213 10
 150 Binary data connection for %TESTNUMBER () (10 bytes).
diff --git a/tests/data/test1380 b/tests/data/test1380
index 02db86ac27..b106b3c7fc 100644
--- a/tests/data/test1380
+++ b/tests/data/test1380
@@ -56,7 +56,7 @@ mooo
 230 Welcome you silly person
 257 "/" is current directory
 250 CWD command successful.
-229 Entering Passive Mode (stripped)
+229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted
 213 10
 150 Binary data connection for %TESTNUMBER () (10 bytes).
diff --git a/tests/data/test1381 b/tests/data/test1381
index 4ae53c38cb..7d4ef7ba33 100644
--- a/tests/data/test1381
+++ b/tests/data/test1381
@@ -57,7 +57,7 @@ mooo
 230 Welcome you silly person
 257 "/" is current directory
 250 CWD command successful.
-229 Entering Passive Mode (stripped)
+229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted
 213 10
 150 Binary data connection for %TESTNUMBER () (10 bytes).
diff --git a/tests/data/test1382 b/tests/data/test1382
index bce914faa6..7c4cc6e290 100644
--- a/tests/data/test1382
+++ b/tests/data/test1382
@@ -57,7 +57,7 @@ mooo
 230 Welcome you silly person
 257 "/" is current directory
 250 CWD command successful.
-229 Entering Passive Mode (stripped)
+229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted
 213 10
 150 Binary data connection for %TESTNUMBER () (10 bytes).
diff --git a/tests/data/test1383 b/tests/data/test1383
index 23a9ec55ba..c8b1d119b9 100644
--- a/tests/data/test1383
+++ b/tests/data/test1383
@@ -56,7 +56,7 @@ mooo
 230 Welcome you silly person
 257 "/" is current directory
 250 CWD command successful.
-229 Entering Passive Mode (stripped)
+229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted
 213 10
 150 Binary data connection for %TESTNUMBER () (10 bytes).
diff --git a/tests/data/test1384 b/tests/data/test1384
index 459a4e0236..3f99d28bfe 100644
--- a/tests/data/test1384
+++ b/tests/data/test1384
@@ -56,7 +56,7 @@ mooo
 230 Welcome you silly person
 257 "/" is current directory
 250 CWD command successful.
-229 Entering Passive Mode (stripped)
+229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted
 213 10
 150 Binary data connection for %TESTNUMBER () (10 bytes).
diff --git a/tests/data/test1387 b/tests/data/test1387
index 44b7d8aea2..a5531aa201 100644
--- a/tests/data/test1387
+++ b/tests/data/test1387
@@ -71,7 +71,7 @@ MOOOO
 230 Welcome you silly person
 257 "/" is current directory
 250 CWD command successful.
-229 Entering Passive Mode (stripped)
+229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted
 213 222
 150 Binary data connection for %TESTNUMBER () (222 bytes).
diff --git a/tests/data/test1388 b/tests/data/test1388
index 6bb7997279..8630be7877 100644
--- a/tests/data/test1388
+++ b/tests/data/test1388
@@ -71,7 +71,7 @@ MOOOO
 230 Welcome you silly person
 257 "/" is current directory
 250 CWD command successful.
-229 Entering Passive Mode (stripped)
+229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted
 213 222
 150 Binary data connection for %TESTNUMBER () (222 bytes).
diff --git a/tests/data/test1389 b/tests/data/test1389
index 5c6979bd31..53fda6cd59 100644
--- a/tests/data/test1389
+++ b/tests/data/test1389
@@ -72,7 +72,7 @@ MOOOO
 230 Welcome you silly person
 257 "/" is current directory
 250 CWD command successful.
-229 Entering Passive Mode (stripped)
+229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted
 213 222
 150 Binary data connection for %TESTNUMBER () (222 bytes).
diff --git a/tests/data/test1390 b/tests/data/test1390
index e263fef969..b86e099d75 100644
--- a/tests/data/test1390
+++ b/tests/data/test1390
@@ -72,7 +72,7 @@ MOOOO
 230 Welcome you silly person
 257 "/" is current directory
 250 CWD command successful.
-229 Entering Passive Mode (stripped)
+229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted
 213 222
 150 Binary data connection for %TESTNUMBER () (222 bytes).
diff --git a/tests/data/test1391 b/tests/data/test1391
index 063294b8e7..d9350b8677 100644
--- a/tests/data/test1391
+++ b/tests/data/test1391
@@ -71,7 +71,7 @@ MOOOO
 230 Welcome you silly person
 257 "/" is current directory
 250 CWD command successful.
-229 Entering Passive Mode (stripped)
+229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted
 213 222
 150 Binary data connection for %TESTNUMBER () (222 bytes).
diff --git a/tests/data/test1392 b/tests/data/test1392
index 824cc214c2..572841e5b5 100644
--- a/tests/data/test1392
+++ b/tests/data/test1392
@@ -71,7 +71,7 @@ MOOOO
 230 Welcome you silly person
 257 "/" is current directory
 250 CWD command successful.
-229 Entering Passive Mode (stripped)
+229 Entering Passive Mode (stripped)
 200 I modify TYPE as you wanted
 213 222
 150 Binary data connection for %TESTNUMBER () (222 bytes).
diff --git a/tests/ftpserver.pl b/tests/ftpserver.pl
index 71d6774fd1..f70fa0d0ee 100755
--- a/tests/ftpserver.pl
+++ b/tests/ftpserver.pl
@@ -2566,12 +2566,12 @@ sub PASV_ftp {
         if($pasvbadip) {
             $p="1,2,3,4";
         }
-        sendcontrol sprintf("227 Entering Passive Mode ($p,%d,%d)\n",
+        sendcontrol sprintf("227 Entering Passive Mode ($p,%d,%d)\r\n",
                             int($pasvport/256), int($pasvport%256));
     }
     else {
         # EPSV reply
-        sendcontrol sprintf("229 Entering Passive Mode (|||%d|)\n", $pasvport);
+        sendcontrol sprintf("229 Entering Passive Mode (|||%d|)\r\n", $pasvport);
     }
 
     logmsg "Client has been notified that DATA conn ".