diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index 744c16274b..bc1487819b 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -12,6 +12,6 @@ test101  test110  test12   test15   test202  test3    test4    test6 \
 test102  test111  test120  test16   test21   test30   test400  test7 \
 test103  test112  test121  test17   test22   test300  test401  test8 \
 test104  test113  test122  test18   test23   test301  test402  test9 \
-test105  test114  test123  test19   test24   test302  test43   \
+test105  test114  test123  test19   test24   test302  test43   test31 \
 test106  test115  test124  test190  test25   test303  test44   test38 \
 test107  test116  test125  test2    test26   test33   test45   test126
diff --git a/tests/data/test31 b/tests/data/test31
new file mode 100644
index 0000000000..55188d851d
--- /dev/null
+++ b/tests/data/test31
@@ -0,0 +1,56 @@
+# Server-side
+<reply>
+<data>
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Type: text/html
+Funny-head: yesyes
+Set-Cookie: foobar=name; domain=127.0.0.1; path=/ ; secure
+Set-Cookie:mismatch=this  ; domain=127.0.0.1; path=/silly/
+Set-Cookie: partmatch=present; domain=127.0.0.1 ; path=/;
+Set-Cookie: eat=this; domain=moo.foo.moo;
+Set-Cookie: eat=this-too; domain=foo.moo;
+Set-Cookie: nodomainnovalue
+Set-Cookie: nodomain=value; expires=Tue Feb 1 11:56:27 MET 2014
+Set-Cookie: nodomainnovalue; domain=reallysilly
+
+boo
+</data>
+</reply>
+
+# Client-side
+<client>
+ <name>
+HTTP with weirdly formatted cookies and cookiejar storage
+ </name>
+ <command>
+http://%HOSTIP:%HOSTPORT/we/want/31 -b none -c log/jar31.txt
+</command>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+GET /we/want/31 HTTP/1.1
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
+</protocol>
+<file name="log/jar31.txt">
+# Netscape HTTP Cookie File
+# http://www.netscape.com/newsref/std/cookie_spec.html
+# This file was generated by libcurl! Edit at your own risk.
+
+127.0.0.1	FALSE	/	TRUE	0	foobar	name
+127.0.0.1	FALSE	/silly/	FALSE	0	ismatch	this
+127.0.0.1	FALSE	/	FALSE	0	partmatch	present
+moo.foo.moo	FALSE	/	FALSE	0	eat	this
+foo.moo	FALSE	/	FALSE	0	eat	this-too
+127.0.0.1	FALSE	/	FALSE	1014678000	nodomain	value
+</file>
+</verify>