diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc
index 00b8f8a6ed..773397e4db 100644
--- a/tests/data/Makefile.inc
+++ b/tests/data/Makefile.inc
@@ -159,7 +159,7 @@ test1525 test1526 test1527 test1528 test1529 test1530 test1531 \
 \
 test1600 test1601 test1602 test1603 test1604 \
 \
-test1700 \
+test1700 test1701 test1702 \
 \
 test1800 test1801 \
 \
diff --git a/tests/data/test1701 b/tests/data/test1701
new file mode 100644
index 0000000000..621c82d823
--- /dev/null
+++ b/tests/data/test1701
@@ -0,0 +1,83 @@
+<testcase>
+<info>
+<keywords>
+HTTP
+HTTP POST
+HTTP/2
+</keywords>
+</info>
+
+#
+# Server-side
+<reply>
+<data nocheck="yes">
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+ETag: "21025-dc7-39462498"
+Accept-Ranges: bytes
+Content-Length: 6
+Connection: close
+Content-Type: text/html
+Funny-head: yesyes
+
+-foo-
+</data>
+</reply>
+
+#
+# Client-side
+<client>
+<server>
+http
+http2
+</server>
+ <name>
+HTTP/2 POST with Upgrade:
+ </name>
+ <command>
+http://%HOSTIP:%HTTP2PORT/1701 --http2 -d "datatosend"
+</command>
+</client>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+^X-Forwarded-Proto:.*
+^Via:.*
+</strip>
+<protocol nonewline="yes">
+POST /1701 HTTP/1.1
+Host: %HOSTIP:%HTTP2PORT
+Accept: */*
+Content-Length: 10
+Content-Type: application/x-www-form-urlencoded
+
+datatosend
+</protocol>
+<stdout>
+HTTP/1.1 101 Switching Protocols
+Connection: Upgrade
+Upgrade: h2c
+
+HTTP/2 200 
+date: Thu, 09 Nov 2010 14:49:00 GMT
+last-modified: Tue, 13 Jun 2000 12:10:00 GMT
+etag: "21025-dc7-39462498"
+accept-ranges: bytes
+content-length: 6
+content-type: text/html
+funny-head: yesyes
+server: cut-out
+via: 1.1 nghttpx
+
+-foo-
+</stdout>
+<stripfile>
+s/^server:.*/server: cut-out
/
+</stripfile>
+</verify>
+</testcase>
diff --git a/tests/data/test1702 b/tests/data/test1702
new file mode 100644
index 0000000000..cf7f26cd7c
--- /dev/null
+++ b/tests/data/test1702
@@ -0,0 +1,78 @@
+<testcase>
+<info>
+<keywords>
+HTTP
+HTTP HEAD
+HTTP/2
+</keywords>
+</info>
+
+#
+# Server-side
+<reply>
+<data nocheck="yes">
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+ETag: "21025-dc7-39462498"
+Accept-Ranges: bytes
+Content-Length: 6
+Connection: close
+Content-Type: text/html
+Funny-head: yesyes
+
+</data>
+</reply>
+
+#
+# Client-side
+<client>
+<server>
+http
+http2
+</server>
+ <name>
+HTTP/2 HEAD with Upgrade:
+ </name>
+ <command>
+http://%HOSTIP:%HTTP2PORT/1702 --http2 --head
+</command>
+</client>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+^X-Forwarded-Proto:.*
+^Via:.*
+</strip>
+<protocol>
+HEAD /1702 HTTP/1.1
+Host: %HOSTIP:%HTTP2PORT
+Accept: */*
+
+</protocol>
+<stdout>
+HTTP/1.1 101 Switching Protocols
+Connection: Upgrade
+Upgrade: h2c
+
+HTTP/2 200 
+date: Thu, 09 Nov 2010 14:49:00 GMT
+last-modified: Tue, 13 Jun 2000 12:10:00 GMT
+etag: "21025-dc7-39462498"
+accept-ranges: bytes
+content-length: 6
+content-type: text/html
+funny-head: yesyes
+server: cut-out
+via: 1.1 nghttpx
+
+</stdout>
+<stripfile>
+s/^server:.*/server: cut-out
/
+</stripfile>
+</verify>
+</testcase>