8 files changed, 37 insertions, 4 deletions
diff --git a/tests/data/test1029 b/tests/data/test1029
index 8e8de8b47..97e7fc05f 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 72389b376..54d023267 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 e7b860e86..48767e216 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 b880c9953..b82a6c60e 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 76976d254..030354414 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 cc1b0c7ed..19057751d 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 db029dd84..63bb691a9 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 d4db95141..7af555a75 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">