diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index 010b9a89e74f775609a41e510afdb6bd7f294034..d448eb3d93faed4f553a3db4a26b50c28505846f 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -20,4 +20,4 @@ test130  test131  test132  test133  test134 test135 test403 test305 \
 test49 test50 test51 test52 test53 test54 test55 test56 \
 test500 test501 test502 test503 test504 test136 test57 test137 test138 \
 test58 test139 test140 test141 test59 test60 test61 test142 test143 test62 \
-test63 test64 test65 test66
+test63 test64 test65 test66 test144 test145
diff --git a/tests/data/test144 b/tests/data/test144
new file mode 100644
index 0000000000000000000000000000000000000000..5ca145dc316fc8e3ae8862e70d23fb1796d4e2fd
--- /dev/null
+++ b/tests/data/test144
@@ -0,0 +1,39 @@
+# Server-side
+<reply>
+<data>
+</data>
+</reply>
+
+# Client-side
+<client>
+<server>
+ftp
+</server>
+ <name>
+FTP NLST dir list without contents, using PORT
+ </name>
+ <command>
+ftp://%HOSTIP:%FTPPORT/ -P - -l
+</command>
+<file name="log/ftpserver.cmd">
+REPLY NLST 450 No files found
+</file>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+# strip all kinds of PORT, EPRT and LPRT curl can do
+<strip>
+^PORT 127,0,0,1,.*
+^EPRT.*
+^LPRT.*
+</strip>
+<protocol>
+USER anonymous
+PASS curl_by_daniel@haxx.se
+PWD
+PORT 127,0,0,1,243,212
+TYPE A
+NLST
+</protocol>
+</verify>
diff --git a/tests/data/test145 b/tests/data/test145
new file mode 100644
index 0000000000000000000000000000000000000000..03f3804cf36bf8c28ce3f61ccb612f6db5896ee9
--- /dev/null
+++ b/tests/data/test145
@@ -0,0 +1,42 @@
+# Server-side
+<reply>
+<data>
+</data>
+</reply>
+
+# Client-side
+<client>
+<server>
+ftp
+</server>
+ <name>
+FTP NLST dir list with weird reply code, using PORT
+ </name>
+ <command>
+ftp://%HOSTIP:%FTPPORT/ -P - -l
+</command>
+<file name="log/ftpserver.cmd">
+REPLY NLST 550 Have a taste on this!
+</file>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<errorcode>
+19
+</errorcode>
+# strip all kinds of PORT, EPRT and LPRT curl can do
+<strip>
+^PORT 127,0,0,1,.*
+^EPRT.*
+^LPRT.*
+</strip>
+<protocol>
+USER anonymous
+PASS curl_by_daniel@haxx.se
+PWD
+PORT 127,0,0,1,243,212
+TYPE A
+NLST
+</protocol>
+</verify>