diff --git a/tests/data/test1001 b/tests/data/test1001
index 1bcc82a6dc..9f8e53432c 100644
--- a/tests/data/test1001
+++ b/tests/data/test1001
@@ -2,12 +2,14 @@
 <info>
 <keywords>
 HTTP
-Digest
-PUT
+HTTP Digest auth
+HTTP PUT
 Resume
+Content-Range
 CUSTOMREQUEST
 </keywords>
 </info>
+
 # Server-side
 <reply>
 <data>
diff --git a/tests/data/test1002 b/tests/data/test1002
index eb92db1551..6e51ff610d 100644
--- a/tests/data/test1002
+++ b/tests/data/test1002
@@ -2,9 +2,10 @@
 <info>
 <keywords>
 HTTP
-Digest
-PUT
+HTTP Digest auth
+HTTP PUT
 Resume
+Content-Range
 CUSTOMREQUEST
 </keywords>
 </info>
diff --git a/tests/data/test131 b/tests/data/test131
index 5f9eb6ac15..4e9ba6d9a7 100644
--- a/tests/data/test131
+++ b/tests/data/test131
@@ -4,7 +4,7 @@
 FTP
 EPSV
 LIST
-netrca
+netrc
 </keywords>
 </info>
 #
diff --git a/tests/data/test153 b/tests/data/test153
index 3e26db8efe..5a1db31509 100644
--- a/tests/data/test153
+++ b/tests/data/test153
@@ -1,4 +1,12 @@
 <testcase>
+<info>
+<keywords>
+HTTP
+HTTP GET
+HTTP Digest auth
+</keywords>
+</info>
+
 # Server-side
 <reply>
 # reply back and ask for Digest auth
diff --git a/tests/data/test154 b/tests/data/test154
index c57254cb31..89e2bd51fd 100644
--- a/tests/data/test154
+++ b/tests/data/test154
@@ -1,4 +1,13 @@
 <testcase>
+<info>
+<keywords>
+HTTP
+HTTP PUT
+HTTP Digest auth
+--anyauth
+</keywords>
+</info>
+
 # Server-side
 <reply>
 <servercmd>
diff --git a/tests/data/test167 b/tests/data/test167
index a83dc61bda..ef83688cb0 100644
--- a/tests/data/test167
+++ b/tests/data/test167
@@ -1,4 +1,14 @@
 <testcase>
+<info>
+<keywords>
+HTTP
+HTTP GET
+HTTP proxy
+HTTP proxy Basic auth
+HTTP Digest auth
+</keywords>
+</info>
+
 # Server-side
 <reply>
 <data>
diff --git a/tests/data/test168 b/tests/data/test168
index b1fc97967b..d3a12b8ae3 100644
--- a/tests/data/test168
+++ b/tests/data/test168
@@ -1,4 +1,14 @@
 <testcase>
+<info>
+<keywords>
+HTTP
+HTTP GET
+HTTP proxy
+HTTP proxy Digest auth
+HTTP Digest auth
+</keywords>
+</info>
+
 # Server-side
 <reply>
 
diff --git a/tests/data/test169 b/tests/data/test169
index 0308ef54c7..9a4b954e43 100644
--- a/tests/data/test169
+++ b/tests/data/test169
@@ -1,4 +1,14 @@
 <testcase>
+<info>
+<keywords>
+HTTP
+HTTP GET
+HTTP proxy
+HTTP proxy NTLM auth
+HTTP Digest auth
+</keywords>
+</info>
+
 # Server-side
 <reply>
 
diff --git a/tests/data/test171 b/tests/data/test171
index 270c2fb38d..24ca87a5a1 100644
--- a/tests/data/test171
+++ b/tests/data/test171
@@ -1,15 +1,23 @@
 <testcase>
+<info>
+<keywords>
+HTTP
+HTTP GET
+cookies
+</keywords>
+</info>
+
 # Server-side
 <reply>
 <data>
-HTTP/1.1 200 OK
-Date: Tue, 25 Sep 2001 19:37:44 GMT
-Content-Type: text/html
-Set-Cookie: XToken=xt;Domain=.z.x.com;Path=/
-Cache-control: private
+HTTP/1.1 200 OK
+Date: Tue, 25 Sep 2001 19:37:44 GMT
+Content-Type: text/html
+Set-Cookie: XToken=xt;Domain=.z.x.com;Path=/
+Cache-control: private
 Content-Length: 62
-
-This server reply is for testing a simple Location: following
+
+This server reply is for testing a simple cookie test case...
 </data>
 </reply>
 
diff --git a/tests/data/test172 b/tests/data/test172
index 0fa6dfd5e7..bb1689ba94 100644
--- a/tests/data/test172
+++ b/tests/data/test172
@@ -1,4 +1,12 @@
 <testcase>
+<info>
+<keywords>
+HTTP
+HTTP GET
+cookies
+</keywords>
+</info>
+
 # Server-side
 <reply>
 <data>
diff --git a/tests/data/test175 b/tests/data/test175
index 9fdac42fe4..2ee78d5084 100644
--- a/tests/data/test175
+++ b/tests/data/test175
@@ -1,4 +1,12 @@
 <testcase>
+<info>
+<keywords>
+HTTP
+HTTP POST
+HTTP Digest auth
+</keywords>
+</info>
+
 # Server-side
 <reply>
 <data>
diff --git a/tests/data/test177 b/tests/data/test177
index da542cab6e..495dea9b43 100644
--- a/tests/data/test177
+++ b/tests/data/test177
@@ -1,4 +1,13 @@
 <testcase>
+<info>
+<keywords>
+HTTP
+HTTP POST
+HTTP Digest auth
+followlocation
+</keywords>
+</info>
+
 # Server-side
 <reply>
 <data>
diff --git a/tests/data/test179 b/tests/data/test179
index a86f04e7e8..779caf3775 100644
--- a/tests/data/test179
+++ b/tests/data/test179
@@ -1,4 +1,13 @@
 <testcase>
+<info>
+<keywords>
+HTTP
+HTTP GET
+HTTP proxy
+cookies
+</keywords>
+</info>
+
 # Server-side
 <reply>
 <data>
diff --git a/tests/data/test188 b/tests/data/test188
index c85065e642..974dd59876 100644
--- a/tests/data/test188
+++ b/tests/data/test188
@@ -1,4 +1,13 @@
 <testcase>
+<info>
+<keywords>
+HTTP
+HTTP GET
+Range
+Resume
+</keywords>
+</info>
+
 # Server-side
 <reply>
 <data>
diff --git a/tests/data/test194 b/tests/data/test194
index 606faea224..86c1a78ac9 100644
--- a/tests/data/test194
+++ b/tests/data/test194
@@ -1,4 +1,12 @@
 <testcase>
+<info>
+<keywords>
+HTTP
+HTTP GET
+Range
+Resume
+</keywords>
+
 # Server-side
 <reply>
 <data>
diff --git a/tests/data/test206 b/tests/data/test206
index ab39bcd322..70d8c3962f 100644
--- a/tests/data/test206
+++ b/tests/data/test206
@@ -1,4 +1,14 @@
 <testcase>
+<info>
+<keywords>
+HTTP
+HTTP GET
+HTTP proxy
+proxytunnel
+HTTP proxy Digest auth
+</keywords>
+</info>
+
 # Server-side
 <reply>
 
diff --git a/tests/data/test233 b/tests/data/test233
index 6832ae5dd9..8e5f8b8979 100644
--- a/tests/data/test233
+++ b/tests/data/test233
@@ -2,7 +2,7 @@
 <info>
 <keywords>
 HTTP
-HTTP Proxy
+HTTP proxy
 HTTP Basic auth
 HTTP proxy Basic auth
 followlocation
diff --git a/tests/data/test242 b/tests/data/test242
index 639b2c093a..01d40bdd77 100644
--- a/tests/data/test242
+++ b/tests/data/test242
@@ -4,7 +4,7 @@
 HTTP
 HTTP GET
 IPv6
-HTTP Basic
+HTTP Basic auth
 </keywords>
 </info>
 #
diff --git a/tests/data/test243 b/tests/data/test243
index 376310d317..a20bd750a6 100644
--- a/tests/data/test243
+++ b/tests/data/test243
@@ -4,7 +4,7 @@
 HTTP
 HTTP GET
 --proxy-anyauth
-HTTP proxy NTLM
+HTTP proxy NTLM auth
 </keywords>
 </info>
 # Server-side
diff --git a/tests/data/test245 b/tests/data/test245
index 1804e7375b..8ad45d3a1d 100644
--- a/tests/data/test245
+++ b/tests/data/test245
@@ -1,4 +1,12 @@
 <testcase>
+<info>
+<keywords>
+HTTP
+HTTP POST
+HTTP Digest auth
+</keywords>
+</info>
+
 # Server-side
 <reply>
 <data>
diff --git a/tests/data/test246 b/tests/data/test246
index 8af7770792..b92c17a8bf 100644
--- a/tests/data/test246
+++ b/tests/data/test246
@@ -1,4 +1,12 @@
 <testcase>
+<info>
+<keywords>
+HTTP
+HTTP POST
+HTTP Digest auth
+</keywords>
+</info>
+
 # Server-side
 <reply>
 <data>
diff --git a/tests/data/test258 b/tests/data/test258
index ae880391e7..c2f5269374 100644
--- a/tests/data/test258
+++ b/tests/data/test258
@@ -7,6 +7,7 @@ HTTP replaced headers
 HTTP proxy
 HTTP proxy Digest auth
 </keywords>
+
 </info>
 # Server-side
 <reply>
diff --git a/tests/data/test33 b/tests/data/test33
index 94b5c8bd86..82cf80b309 100644
--- a/tests/data/test33
+++ b/tests/data/test33
@@ -3,7 +3,7 @@
 <keywords>
 HTTP
 HTTP PUT
-resume upload
+Resume
 Content-Range
 </keywords>
 </info>
diff --git a/tests/data/test506 b/tests/data/test506
index 89860c318a..ced223bd90 100644
--- a/tests/data/test506
+++ b/tests/data/test506
@@ -1,4 +1,13 @@
 <testcase>
+<info>
+<keywords>
+HTTP
+HTTP GET
+cookies
+shared cookies
+</keywords>
+</info>
+
 # Server-side
 <reply>
 <data1>
diff --git a/tests/data/test540 b/tests/data/test540
index c42cb92dc7..98cf0fa872 100644
--- a/tests/data/test540
+++ b/tests/data/test540
@@ -1,4 +1,14 @@
 <testcase>
+<info>
+<keywords>
+HTTP
+HTTP GET
+HTTP proxy
+HTTP proxy Digest auth
+multi
+</keywords>
+</info>
+
 # Server-side
 <reply>
 
diff --git a/tests/data/test6 b/tests/data/test6
index dc96f0a6bd..0e7dc9b249 100644
--- a/tests/data/test6
+++ b/tests/data/test6
@@ -4,6 +4,7 @@
 HTTP
 HTTP GET
 HTTP set cookie
+cookies
 </keywords>
 </info>
 # Server-side
diff --git a/tests/data/test62 b/tests/data/test62
index cba6317b8c..b8167e5798 100644
--- a/tests/data/test62
+++ b/tests/data/test62
@@ -4,8 +4,10 @@
 HTTP
 HTTP GET
 HTTP replaced headers
+cookies
 </keywords>
 </info>
+
 # Server-side
 <reply>
 <data>
diff --git a/tests/data/test7 b/tests/data/test7
index 7a70cad492..62731de130 100644
--- a/tests/data/test7
+++ b/tests/data/test7
@@ -3,9 +3,11 @@
 <keywords>
 HTTP
 HTTP GET
+cookies
 header dump
 </keywords>
 </info>
+
 # Server-side
 <reply>
 <data>
diff --git a/tests/data/test73 b/tests/data/test73
index 5941c7254d..1b47b88bd9 100644
--- a/tests/data/test73
+++ b/tests/data/test73
@@ -3,6 +3,7 @@
 <keywords>
 HTTP
 HTTP GET
+cookies
 cookiejar
 </keywords>
 </info>
diff --git a/tests/data/test92 b/tests/data/test92
index 949ab61d9c..e6d0b66a47 100644
--- a/tests/data/test92
+++ b/tests/data/test92
@@ -3,9 +3,11 @@
 <keywords>
 HTTP
 HTTP GET
+Range
 Resume
 </keywords>
 </info>
+
 # Server-side
 <reply>
 <data>