diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index 1b8c1704c..3e3749aad 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -22,7 +22,7 @@ test80 test81 test82 test83 test84 test85 test86 test87 test507 \
test149 test88 test89 test90 test508 test91 test92 test203 test93 \
test94 test95 test509 test510 test97 test98 test99 test150 test151 \
test152 test153 test154 test155 test156 test157 test158 test159 test511 \
-test160 test161 test162 test163 test164 test512 test165
+test160 test161 test162 test163 test164 test512 test165 test166
# The following tests have been removed from the dist since they no longer
# work. We need to fix the test suite's FTPS server first, then bring them
diff --git a/tests/data/test166 b/tests/data/test166
new file mode 100644
index 000000000..fada82ba7
--- /dev/null
+++ b/tests/data/test166
@@ -0,0 +1,52 @@
+# Server-side
+
+
+HTTP/1.1 200 OK swsclose
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+
+blablabla
+
+
+
+# Client-side
+
+
+http
+
+
+HTTP formpost a file with spaces in name
+
+
+http://%HOSTIP:%HOSTPORT/we/want/166 -F "name=@log/fie ld 166"
+
+# We create this file before the command is invoked!
+
+data inside the file
+
+
+
+# Verify data after the test has been "shot"
+
+
+^(User-Agent:|Content-Type: multipart/form-data;|------------).*
+
+
+POST /we/want/166 HTTP/1.1
+User-Agent: curl/7.12.0-CVS (i686-pc-linux-gnu) libcurl/7.12.0-CVS OpenSSL/0.9.6b zlib/1.1.4 c-ares/1.2.0 libidn/0.4.3
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: */*
+Content-Length: 227
+Expect: 100-continue
+Content-Type: multipart/form-data; boundary=----------------------------b0b3d6d23991
+
+------------------------------b0b3d6d23991
+Content-Disposition: form-data; name="name"; filename="log/fie ld 166"
+Content-Type: application/octet-stream
+
+data inside the file
+
+------------------------------b0b3d6d23991--
+
+