diff --git a/CHANGES b/CHANGES
index 39df56125d9d4bad57c2bb2e45aa2a3161e97d8b..82ed74886e06b4f428b1b080e84981d142e399c0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,17 @@
 
                                   Changelog
 
+Daniel S (22 July 2007)
+- Added test case 354 that makes a simple FTP retrieval without password, which
+  verifies the bug fix in #1757328.
+
+Daniel S (21 July 2007)
+- To allow more flexibility in FTP test cases, I've removed the enforced states
+  from the test server code as they served no real purpose. The test server
+  is here to serve for the test cases, not to attempt to function as a real
+  server! While at it, I modified test case 141 to better test and verify
+  curl -I on a single FTP file.
+
 Daniel S (20 July 2007)
 - James Housley fixed the SFTP PWD command to work.
 
diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index 98988cf0eade4545571bab4a141c486653d6974f..8cc794d4ae2ec49a5bfab10957fc2744299a06fc 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 test350 test351 test352 test353 test289 test540
+ test706 test707 test350 test351 test352 test353 test289 test540 test354
diff --git a/tests/data/test354 b/tests/data/test354
new file mode 100644
index 0000000000000000000000000000000000000000..a6949328a1c4825e8ab31d14f83accabea7a41c9
--- /dev/null
+++ b/tests/data/test354
@@ -0,0 +1,50 @@
+<testcase>
+<info>
+<keywords>
+FTP
+PASV
+RETR
+</keywords>
+</info>
+# Server-side
+<reply>
+<data>
+data
+    to
+      see
+that FTP
+works
+  so does it?
+</data>
+<servercmd>
+REPLY USER 200 fine, proceed without password
+</servercmd>
+</reply>
+
+# Client-side
+<client>
+<server>
+ftp
+</server>
+ <name>
+FTP without password
+ </name>
+ <command>
+ftp://%HOSTIP:%FTPPORT/354
+</command>
+
+</client>
+
+# Verify data after the test has been "shot"
+<verify>
+<protocol>
+USER anonymous
+PWD
+EPSV
+TYPE I
+SIZE 354
+RETR 354
+QUIT
+</protocol>
+</verify>
+</testcase>