diff --git a/tests/data/DISABLED b/tests/data/DISABLED
index 8a0dd2c63a..7db101d42b 100644
--- a/tests/data/DISABLED
+++ b/tests/data/DISABLED
@@ -4,3 +4,4 @@
# per line.
# Lines starting with '#' letters are treated as comments.
#230
+351
diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index 9c13cef947..8fc8fbc625 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -42,4 +42,4 @@ EXTRA_DIST = test1 test108 test117 test127 test20 test27 test34 test46 \
test405 test604 test605 test606 test607 test608 test609 test294 test295 \
test296 test297 test298 test610 test611 test612 test406 test407 test408 \
test409 test613 test614 test700 test701 test702 test704 test705 test703 \
- test706 test707
+ test706 test707 test350 test351 test352
diff --git a/tests/data/test350 b/tests/data/test350
new file mode 100644
index 0000000000..9c22d307c6
--- /dev/null
+++ b/tests/data/test350
@@ -0,0 +1,57 @@
+
+
+
+FTP
+PASV
+LIST
+
+
+#
+# Server-side
+
+# When doing LIST, we get the default list output hard-coded in the test
+# FTP server
+
+total 20
+drwxr-xr-x 8 98 98 512 Oct 22 13:06 .
+drwxr-xr-x 8 98 98 512 Oct 22 13:06 ..
+drwxr-xr-x 2 98 98 512 May 2 1996 .NeXT
+-r--r--r-- 1 0 1 35 Jul 16 1996 README
+lrwxrwxrwx 1 0 1 7 Dec 9 1999 bin -> usr/bin
+dr-xr-xr-x 2 0 1 512 Oct 1 1997 dev
+drwxrwxrwx 2 98 98 512 May 29 16:04 download.html
+dr-xr-xr-x 2 0 1 512 Nov 30 1995 etc
+drwxrwxrwx 2 98 1 512 Oct 30 14:33 pub
+dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr
+
+
+
+#
+# Client-side
+
+
+ftp
+
+
+FTP root dir list multicwd
+
+
+ftp://%HOSTIP:%FTPPORT// --ftp-method multicwd
+
+
+
+#
+# Verify data after the test has been "shot"
+
+
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD /
+EPSV
+TYPE A
+LIST
+QUIT
+
+
+
diff --git a/tests/data/test351 b/tests/data/test351
new file mode 100644
index 0000000000..5d44a647f4
--- /dev/null
+++ b/tests/data/test351
@@ -0,0 +1,56 @@
+
+
+
+FTP
+PASV
+LIST
+
+
+#
+# Server-side
+
+# When doing LIST, we get the default list output hard-coded in the test
+# FTP server
+
+total 20
+drwxr-xr-x 8 98 98 512 Oct 22 13:06 .
+drwxr-xr-x 8 98 98 512 Oct 22 13:06 ..
+drwxr-xr-x 2 98 98 512 May 2 1996 .NeXT
+-r--r--r-- 1 0 1 35 Jul 16 1996 README
+lrwxrwxrwx 1 0 1 7 Dec 9 1999 bin -> usr/bin
+dr-xr-xr-x 2 0 1 512 Oct 1 1997 dev
+drwxrwxrwx 2 98 98 512 May 29 16:04 download.html
+dr-xr-xr-x 2 0 1 512 Nov 30 1995 etc
+drwxrwxrwx 2 98 1 512 Oct 30 14:33 pub
+dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr
+
+
+
+#
+# Client-side
+
+
+ftp
+
+
+FTP root dir list nocwd
+
+
+ftp://%HOSTIP:%FTPPORT// --ftp-method nocwd
+
+
+
+#
+# Verify data after the test has been "shot"
+
+
+USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+TYPE A
+LIST /
+QUIT
+
+
+
diff --git a/tests/data/test352 b/tests/data/test352
new file mode 100644
index 0000000000..d868894484
--- /dev/null
+++ b/tests/data/test352
@@ -0,0 +1,57 @@
+
+
+
+FTP
+PASV
+LIST
+
+
+#
+# Server-side
+
+# When doing LIST, we get the default list output hard-coded in the test
+# FTP server
+
+total 20
+drwxr-xr-x 8 98 98 512 Oct 22 13:06 .
+drwxr-xr-x 8 98 98 512 Oct 22 13:06 ..
+drwxr-xr-x 2 98 98 512 May 2 1996 .NeXT
+-r--r--r-- 1 0 1 35 Jul 16 1996 README
+lrwxrwxrwx 1 0 1 7 Dec 9 1999 bin -> usr/bin
+dr-xr-xr-x 2 0 1 512 Oct 1 1997 dev
+drwxrwxrwx 2 98 98 512 May 29 16:04 download.html
+dr-xr-xr-x 2 0 1 512 Nov 30 1995 etc
+drwxrwxrwx 2 98 1 512 Oct 30 14:33 pub
+dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr
+
+
+
+#
+# Client-side
+
+
+ftp
+
+
+FTP root dir list singlecwd
+
+
+ftp://%HOSTIP:%FTPPORT// --ftp-method singlecwd
+
+
+
+#
+# Verify data after the test has been "shot"
+
+
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD /
+EPSV
+TYPE A
+LIST
+QUIT
+
+
+