diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index dd0ad1228..794aeb051 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -19,4 +19,4 @@ test304  test39   test32   test128  test48 test306 \
 test130  test131  test132  test133  test134 test135 test403 test305 \
 test49 test50 test51 test52 test53 test54 test55 test56 \
 test500 test501 test502 test503 test504 test136 test57 test137 test138 \
-test58 test139 test140 test141 test59
+test58 test139 test140 test141 test59 test60
diff --git a/tests/data/test60 b/tests/data/test60
new file mode 100644
index 000000000..7ee2dfc87
--- /dev/null
+++ b/tests/data/test60
@@ -0,0 +1,44 @@
+# Server-side
+<reply>
+<data>
+HTTP/1.0 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+
+blablabla
+
+</data>
+</reply>
+
+# Client-side
+<client>
+<name>
+HTTP PUT from stdin with wrong content-length
+</name>
+ <command>
+http://%HOSTIP:%HOSTPORT/bzz/60 -T - -H "Content-Length: 1" < log/60.txt
+</command>
+<file name="log/60.txt">
+more than one byte
+</file>
+</client>
+
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+PUT /bzz/60 HTTP/1.1
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Transfer-Encoding: chunked
+Content-Length: 1
+
+13
+more than one byte
+
+0
+</protocol>
+</verify>