diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index 280c7b1de5979851f215e277d78c365539f54c64..511540f28570722f8aaa92b333a2313041634c9d 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -58,4 +58,7 @@ command28.txt  name28.txt     prot28.txt     reply28.txt \
 command120.txt  name120.txt     prot120.txt     reply120.txt \
 command121.txt  name121.txt     prot121.txt     reply121.txt \
 command29.txt  error30.txt  name30.txt  prot30.txt   reply30.txt \
-command30.txt  name29.txt   prot29.txt  reply29.txt
+command30.txt  name29.txt   prot29.txt  reply29.txt \
+command31.txt  name32.txt  reply31.txt      reply32.txt \
+command32.txt  prot31.txt  reply310001.txt  reply320001.txt \
+name31.txt     prot32.txt  reply310002.txt  reply320002.txt
diff --git a/tests/data/command31.txt b/tests/data/command31.txt
new file mode 100644
index 0000000000000000000000000000000000000000..dbffab3ebc9b1b44ca46d437f0de963914865398
--- /dev/null
+++ b/tests/data/command31.txt
@@ -0,0 +1,2 @@
+http://%HOSTIP:%HOSTPORT/31 -d mooo=fooo -L
+
diff --git a/tests/data/command32.txt b/tests/data/command32.txt
new file mode 100644
index 0000000000000000000000000000000000000000..d7fb1ae14af18a2287e2fc9e52619e81db1545e7
--- /dev/null
+++ b/tests/data/command32.txt
@@ -0,0 +1,2 @@
+http://%HOSTIP:%HOSTPORT/32 -d mooo=fooo -L
+
diff --git a/tests/data/name31.txt b/tests/data/name31.txt
new file mode 100644
index 0000000000000000000000000000000000000000..7e3df9febc9d329a9a80ccab29c1aed138860abc
--- /dev/null
+++ b/tests/data/name31.txt
@@ -0,0 +1 @@
+HTTP POST and follow Location: (error 301)
diff --git a/tests/data/name32.txt b/tests/data/name32.txt
new file mode 100644
index 0000000000000000000000000000000000000000..ba04e8fff54dbb0908606abc302d42df60956898
--- /dev/null
+++ b/tests/data/name32.txt
@@ -0,0 +1 @@
+HTTP POST and follow Location: (error 303)
diff --git a/tests/data/prot31.txt b/tests/data/prot31.txt
new file mode 100644
index 0000000000000000000000000000000000000000..4c87ac86a0a5c5c1d689ca19d01ee22c749585db
--- /dev/null
+++ b/tests/data/prot31.txt
@@ -0,0 +1,9 @@
+POST /moo/moo/moo/310002 HTTP/1.0
+User-Agent: curl/7.6 (i686-pc-linux-gnu) libcurl 7.6 (SSL 0.9.5) (ipv6 enabled)
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+Content-Length: 9
+Content-Type: application/x-www-form-urlencoded
+
+mooo=fooo
diff --git a/tests/data/prot32.txt b/tests/data/prot32.txt
new file mode 100644
index 0000000000000000000000000000000000000000..55e94ac40c06789347f9fa8fddf851f7c8371f6c
--- /dev/null
+++ b/tests/data/prot32.txt
@@ -0,0 +1,6 @@
+GET /moo/moo/moo/320002 HTTP/1.0
+User-Agent: curl/7.6 (i686-pc-linux-gnu) libcurl 7.6 (SSL 0.9.5) (ipv6 enabled)
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
diff --git a/tests/data/reply31.txt b/tests/data/reply31.txt
new file mode 100644
index 0000000000000000000000000000000000000000..7794fd3cebad75fee5e1c8c35a391033d26455f3
--- /dev/null
+++ b/tests/data/reply31.txt
@@ -0,0 +1,6 @@
+HTTP/1.1 301 Moved Permanently
+Server: fake
+Location: /moo/moo/moo/310002
+
+No contents
+
diff --git a/tests/data/reply310001.txt b/tests/data/reply310001.txt
new file mode 100644
index 0000000000000000000000000000000000000000..ea3c76a7c1ee30d03a62b89d9fdde937130928c0
--- /dev/null
+++ b/tests/data/reply310001.txt
@@ -0,0 +1,9 @@
+HTTP/1.1 301 Moved Permanently
+Server: fake
+Location: /moo/moo/moo/310002
+
+HTTP/1.1 200 Followed here fine
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+
+If this is received, the location following worked
diff --git a/tests/data/reply310002.txt b/tests/data/reply310002.txt
new file mode 100644
index 0000000000000000000000000000000000000000..280a45bfa224a6965b9d18d84f6eaa57c175de5f
--- /dev/null
+++ b/tests/data/reply310002.txt
@@ -0,0 +1,5 @@
+HTTP/1.1 200 Followed here fine
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+
+If this is received, the location following worked
diff --git a/tests/data/reply32.txt b/tests/data/reply32.txt
new file mode 100644
index 0000000000000000000000000000000000000000..8f8cf85224f90a8537533078471d8d961985f444
--- /dev/null
+++ b/tests/data/reply32.txt
@@ -0,0 +1,7 @@
+HTTP/1.1 303 See Other
+Server: fake
+Location: /moo/moo/moo/320002
+
+This Location should be fetched with a GET!
+
+
diff --git a/tests/data/reply320001.txt b/tests/data/reply320001.txt
new file mode 100644
index 0000000000000000000000000000000000000000..e444cfc1708696796ded743b547a6a55d66e87c3
--- /dev/null
+++ b/tests/data/reply320001.txt
@@ -0,0 +1,9 @@
+HTTP/1.1 303 See Other
+Server: fake
+Location: /moo/moo/moo/320002
+
+HTTP/1.1 200 Followed here fine
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+
+If this is received, the location following worked
diff --git a/tests/data/reply320002.txt b/tests/data/reply320002.txt
new file mode 100644
index 0000000000000000000000000000000000000000..280a45bfa224a6965b9d18d84f6eaa57c175de5f
--- /dev/null
+++ b/tests/data/reply320002.txt
@@ -0,0 +1,5 @@
+HTTP/1.1 200 Followed here fine
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+
+If this is received, the location following worked