diff --git a/tests/data/test1029 b/tests/data/test1029
index 8e8de8b47a5d0214188c135e2ccc2d76e9fe1172..97e7fc05fcac8d75a3a508f8c64f33beec7e18a8 100644
--- a/tests/data/test1029
+++ b/tests/data/test1029
@@ -5,8 +5,10 @@ HTTP
 HTTP GET
 redirect_url
 followlocation
+--write-out
 </keywords>
 </info>
+
 # Server-side
 <reply>
 <data nocheck="1">
diff --git a/tests/data/test1054 b/tests/data/test1054
index 72389b3762c166922ef75c5c4f64d9722ac49138..54d023267c07db1addf85ec565ec111f9686fa6c 100644
--- a/tests/data/test1054
+++ b/tests/data/test1054
@@ -12,7 +12,7 @@ followlocation
 <reply>
 <data>
 HTTP/1.1 301 OK swsclose
-Location: moo.html&testcase=/10540002
+Location: moo/testcase/10540002
 Date: Thu, 31 Jul 2008 14:49:00 GMT
 Connection: close
 
@@ -26,7 +26,7 @@ body
 </data2>
 <datacheck>
 HTTP/1.1 301 OK swsclose
-Location: moo.html&testcase=/10540002
+Location: moo/testcase/10540002
 Date: Thu, 31 Jul 2008 14:49:00 GMT
 Connection: close
 
@@ -68,7 +68,7 @@ Accept: */*
 Content-Length: 10
 Content-Type: application/x-www-form-urlencoded
 
-field=dataPOST /blah/moo.html&testcase=/10540002 HTTP/1.1
+field=dataPOST /blah/moo/testcase/10540002 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Content-Length: 10
diff --git a/tests/data/test184 b/tests/data/test184
index e7b860e86ea05d450c83388adb23550631da96b4..48767e2166ed7a9fcc6e049bedc3fd5e878adfa5 100644
--- a/tests/data/test184
+++ b/tests/data/test184
@@ -5,8 +5,8 @@ HTTP
 HTTP GET
 followlocation
 </keywords>
-
 </info>
+
 # Server-side
 <reply>
 <data>
diff --git a/tests/data/test187 b/tests/data/test187
index b880c9953a9c538dbe608eba61f5e6908ad994af..b82a6c60e24d15b813ee3c2fc3ce83d853f92138 100644
--- a/tests/data/test187
+++ b/tests/data/test187
@@ -1,4 +1,12 @@
 <testcase>
+<info>
+<keywords>
+HTTP
+HTTP GET
+followlocation
+</keywords>
+</info>
+
 # Server-side
 <reply>
 <data>
diff --git a/tests/data/test188 b/tests/data/test188
index 76976d254610efe15abded84b7ba73ae18f7e7ca..0303544140ad0b4d9f9e27516db28bba79b65fc5 100644
--- a/tests/data/test188
+++ b/tests/data/test188
@@ -5,6 +5,7 @@ HTTP
 HTTP GET
 Content-Range
 Resume
+followlocation
 </keywords>
 </info>
 
diff --git a/tests/data/test193 b/tests/data/test193
index cc1b0c7ed6110fc06340a365832202f41465d938..19057751d0dd5f3f83e2ba44d12b5a1bb9eba0ef 100644
--- a/tests/data/test193
+++ b/tests/data/test193
@@ -1,4 +1,13 @@
 <testcase>
+<info>
+<keywords>
+HTTP
+HTTP GET
+followlocation
+--write-out
+</keywords>
+</info>
+
 #
 # Server-side
 <reply>
diff --git a/tests/data/test217 b/tests/data/test217
index db029dd840d212d64c617f9f9717b763b1d02f04..63bb691a98ca5ec91d5acbd655291797369efc70 100644
--- a/tests/data/test217
+++ b/tests/data/test217
@@ -1,4 +1,16 @@
 <testcase>
+<info>
+<keywords>
+HTTP
+HTTP GET
+HTTP CONNECT
+HTTP proxy
+proxytunnel
+followlocation
+--write-out
+</keywords>
+</info>
+
 # Server-side
 <reply>
 
diff --git a/tests/data/test57 b/tests/data/test57
index d4db95141e9f49ca3e2229de4942f25b85451f39..7af555a755157cb87ae2e41844e31fcd0737cf36 100644
--- a/tests/data/test57
+++ b/tests/data/test57
@@ -6,6 +6,7 @@ HTTP GET
 --write-out
 </keywords>
 </info>
+
 # Server-side
 <reply>
 <data nocheck="1">