diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index 4621fc8c3..234295db2 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -13,3 +13,4 @@ test102 test11 test117 test124 test19 test23 test33 test8 \
test103 test110 test118 test125 test2 test24 test4 test9 \
test104 test111 test119 test13 test20 test25 test400 test47 \
test105 test112 test12 test14 test200 test26 test43 test46
+test34 test36
diff --git a/tests/data/test34 b/tests/data/test34
new file mode 100644
index 000000000..ea7d239b2
--- /dev/null
+++ b/tests/data/test34
@@ -0,0 +1,55 @@
+#
+# Server-side
+
+
+HTTP/1.1 200 funky chunky!
+Server: fakeit/0.9 fakeitbad/1.0
+Transfer-Encoding: chunked
+Connection: mooo
+
+40
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+30
+bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
+21;heresatest=moooo
+cccccccccccccccccccccccccccccccc
+
+0
+muuu
+
+
+HTTP/1.1 200 funky chunky!
+Server: fakeit/0.9 fakeitbad/1.0
+Transfer-Encoding: chunked
+Connection: mooo
+
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbcccccccccccccccccccccccccccccccc
+
+
+
+#
+# Client-side
+
+
+HTTP GET with chunked Transfer-Encoding
+
+
+http://%HOSTIP:%HOSTPORT/34
+
+
+
+#
+# Verify data after the test has been "shot"
+
+
+^User-Agent:.*
+
+
+GET /34 HTTP/1.1
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
+
+
+
diff --git a/tests/data/test36 b/tests/data/test36
new file mode 100644
index 000000000..bd5ce9572
--- /dev/null
+++ b/tests/data/test36
@@ -0,0 +1,54 @@
+#
+# Server-side
+
+
+HTTP/1.1 200 funky chunky!
+Server: fakeit/0.9 fakeitbad/1.0
+Transfer-Encoding: chunked
+Connection: mooo
+
+2
+a
+
+ILLEGAL
+bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
+
+
+HTTP/1.1 200 funky chunky!
+Server: fakeit/0.9 fakeitbad/1.0
+Transfer-Encoding: chunked
+Connection: mooo
+
+a
+
+
+
+#
+# Client-side
+
+
+HTTP GET with bad chunked Transfer-Encoding
+
+
+http://%HOSTIP:%HOSTPORT/36
+
+
+
+#
+# Verify data after the test has been "shot"
+
+
+26
+
+
+^User-Agent:.*
+
+
+GET /36 HTTP/1.1
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
+
+
+