diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index 18b8be8b93..1a8b3cd023 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -25,7 +25,7 @@ test40 test42 test69 test70 test71 test72 test73 test146 test505 \
test74 test75 test76 test77 test78 test147 test148 test506 test79 test80 \
test81 test82 test83 test84 test85 test86 test87 test507 test149 test88 \
test89 test90 test508 test91 test92 test203 test93 test94 test95 test509 \
-test510
+test510 test97
# The following tests have been removed from the dist since they no longer
# work. We need to fix the test suite's FTPS server first, then bring them
diff --git a/tests/data/test97 b/tests/data/test97
new file mode 100644
index 0000000000..018123c03c
--- /dev/null
+++ b/tests/data/test97
@@ -0,0 +1,44 @@
+#
+# Server-side
+
+
+HTTP/1.0 200 OK
+Server: test-server/fake
+Content-Type: text/html
+Content-Length: 6
+
+blaha
+
+
+
+#
+# Client-side
+
+
+http
+
+
+HTTP POST with custom content-type
+
+
+ -d "hejsanallabarn" -H "Content-Type: silly/type" http://%HOSTIP:%HOSTPORT/97
+
+
+
+#
+# Verify data after the test has been "shot"
+
+
+^User-Agent:.*
+
+
+POST /97 HTTP/1.1
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Content-Type: silly/type
+Content-Length: 14
+
+hejsanallabarn
+
+