diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index 51831ff2b..1fd5b7f0f 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -35,4 +35,5 @@ EXTRA_DIST = test1 test108 test117 test127 test20 test27 test34 test46 \
test256 test257 test258 test259 test260 test261 test262 test263 test264 \
test265 test266 test267 test268 test269 test270 test271 test272 test273 \
test274 test275 test524 test525 test276 test277 test526 test527 test528 \
- test530 DISABLED test278 test279 test531 test280 test529 test532
+ test530 DISABLED test278 test279 test531 test280 test529 test532 test533 \
+ test534
diff --git a/tests/data/test534 b/tests/data/test534
new file mode 100644
index 000000000..5676b77e4
--- /dev/null
+++ b/tests/data/test534
@@ -0,0 +1,50 @@
+
+
+FTP
+PASV
+RETR
+
+
+# Server-side
+
+
+
+
+
+REPLY RETR 550 the file doesn't exist
+REPLY SIZE 550 Can't check for file existence
+
+
+
+# Client-side
+
+
+ftp
+
+
+lib533
+
+
+FTP RETR twice using multi: non-existing host and non-existing file
+
+
+ftp://non-existing-host.com/path/534 ftp://%HOSTIP:%FTPPORT/path/534
+
+
+
+# Verify data after the test has been "shot"
+
+
+
+
+USER anonymous
+PASS curl_by_daniel@haxx.se
+PWD
+CWD path
+EPSV
+TYPE I
+SIZE 534
+RETR 534
+QUIT
+
+
diff --git a/tests/libtest/lib533.c b/tests/libtest/lib533.c
index e7e59677e..afbb7bd27 100644
--- a/tests/libtest/lib533.c
+++ b/tests/libtest/lib533.c
@@ -8,6 +8,8 @@
* $Id$
*/
+/* used for test case 533 and 534 */
+
#include "test.h"
#include