diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index 2c34e8ec5a3b2122b5c7855242afda1381106716..f80875c047c42f2735e11c77120a834de0158cdc 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -18,4 +18,4 @@ test107  test116  test125  test2    test26   test33   test45   test126 \
 test304  test39   test32   test128  test48 test306 \
 test130  test131  test132  test133  test134 test135 test403 test305 \
 test49 test50 test51 test52 test53 test54 test55 test56 \
-test500 test501 test502 test503 test504 test136 test57
+test500 test501 test502 test503 test504 test136 test57 test137 test138
diff --git a/tests/data/test138 b/tests/data/test138
new file mode 100644
index 0000000000000000000000000000000000000000..d3479e661bd1af4f3f12617712e48c5dc46f8a1a
--- /dev/null
+++ b/tests/data/test138
@@ -0,0 +1,36 @@
+# Server-side
+<reply>
+<data>
+this is file contents
+</data>
+<size>
+-1
+</size>
+</reply>
+
+# Client-side
+<client>
+ <name>
+FTP download without size in RETR string and no SIZE command
+ </name>
+ <command>
+ftp://%HOSTIP:%FTPPORT/blalbla/lululul/138
+</command>
+<file name="log/ftpserver.cmd">
+RETRNOSIZE
+</file>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<protocol>
+USER anonymous
+PASS curl_by_daniel@haxx.se
+PWD
+CWD blalbla/lululul
+EPSV
+TYPE I
+SIZE 138
+RETR 138
+</protocol>
+</verify>