diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index 2517626fb8692d1672c5d2f3fbe0620f3ee46712..f85b8c82ceddf44947cb44414419c223967c115b 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -15,5 +15,5 @@ test104  test113  test122  test18   test23   test301  test402  test9 \
 test105  test114  test123  test19   test24   test302  test43   test31 \
 test106  test115  test124  test190  test25   test303  test44   test38 \
 test107  test116  test125  test2    test26   test33   test45   test126 \
-test304
+test304  test39
 
diff --git a/tests/data/test39 b/tests/data/test39
new file mode 100644
index 0000000000000000000000000000000000000000..52c35a5c4370e96fb76bbae21fe23ef8a84291b6
--- /dev/null
+++ b/tests/data/test39
@@ -0,0 +1,73 @@
+# Server-side
+<reply>
+<data>
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+
+blablabla
+
+</data>
+</reply>
+
+# Client-side
+<client>
+ <name>
+HTTP RFC1867-type formposting with filename= and type=
+ </name>
+ <command>
+http://%HOSTIP:%HOSTPORT/we/want/39 -F name=daniel -F tool=curl -F "file=@log/test39.txt;filename=fakerfile;type=moo/foobar" -F file2=@log/test39.txt
+</command>
+# We create this file before the command is invoked!
+<file name="log/test39.txt">
+foo bar
+This is a bar foo
+bar
+foo
+</file>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^(User-Agent:|Content-Type: multipart/form-data;|--curl).*
+</strip>
+<protocol>
+POST /we/want/39 HTTP/1.1
+User-Agent: curl/7.9.5 (sparc-sun-solaris2.7) libcurl 7.9.5 (OpenSSL 0.9.6c) (krb4 enabled)
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Content-Length: 553
+Expect: 100-continue
+Content-Type: multipart/form-data; boundary=curl4T+HO20DMiXx0k2FI9gR0lqf7C/
+
+--curl4T+HO20DMiXx0k2FI9gR0lqf7C/
+Content-Disposition: form-data; name="name"
+
+daniel
+--curl4T+HO20DMiXx0k2FI9gR0lqf7C/
+Content-Disposition: form-data; name="tool"
+
+curl
+--curl4T+HO20DMiXx0k2FI9gR0lqf7C/
+Content-Disposition: form-data; name="file"; filename="fakerfile"
+Content-Type: moo/foobar
+
+foo bar
+This is a bar foo
+bar
+foo
+
+--curl4T+HO20DMiXx0k2FI9gR0lqf7C/
+Content-Disposition: form-data; name="file2"; filename="log/test39.txt"
+Content-Type: text/plain
+
+foo bar
+This is a bar foo
+bar
+foo
+
+--curl4T+HO20DMiXx0k2FI9gR0lqf7C/--
+</protocol>
+</verify>