diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index 75f2a4b463751533b66cd7272a875148363c009c..c21073708d1aafc0f18215401e1ac8bf4d291162 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -22,4 +22,4 @@ test500 test501 test502 test503 test504 test136 test57 test137 test138 \
 test58 test139 test140 test141 test59 test60 test61 test142 test143 \
 test62 test63 test64 test65 test66 test144 test145 test67 test68 test41 \
 test40 test42 test69 test70 test71 test72 test73 test146 test505 \
-test74 test75 test76 test77 test78
+test74 test75 test76 test77 test78 test147
diff --git a/tests/data/test147 b/tests/data/test147
new file mode 100644
index 0000000000000000000000000000000000000000..9fbcaf26e95d871f26655d861c2601b238987c56
--- /dev/null
+++ b/tests/data/test147
@@ -0,0 +1,48 @@
+# Server-side
+<reply>
+<data>
+foo
+</data>
+</reply>
+
+# Client-side
+<client>
+<server>
+ftp
+</server>
+ <name>
+FTP with --ftp-create-dirs (failing CWD)
+ </name>
+ <command>
+ftp://%HOSTIP:%FTPPORT/first/dir/here/147 --ftp-create-dirs
+</command>
+</test>
+<file name="log/ftpserver.cmd">
+REPLY CWD 550 I won't allow this on my server
+COUNT CWD 1
+</file>
+</client>
+
+# 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
+CWD first
+MKD first
+CWD first
+CWD dir
+CWD here
+EPSV
+TYPE I
+SIZE 147
+RETR 147
+</protocol>
+</verify>