diff --git a/tests/data/test1015 b/tests/data/test1015
index c16746646d4c675d826abd1bfdfa76e3cd418700..a2b2cefa1ec35d4cc2ddafcef76ff1d4ee9470db 100644
--- a/tests/data/test1015
+++ b/tests/data/test1015
@@ -1,6 +1,8 @@
 <testcase>
 <info>
 <keywords>
+HTTP
+HTTP POST
 --data-urlencode
 </keywords>
 </info>
diff --git a/tests/data/test151 b/tests/data/test151
index 7fb190884079310cd6a2d6d8acad9af580aad035..8f20d1d8b5d15f48a51a2b806bd1ae14131a9d01 100644
--- a/tests/data/test151
+++ b/tests/data/test151
@@ -1,4 +1,11 @@
 <testcase>
+<info>
+<keywords>
+HTTP
+HTTP GET
+</keywords>
+</info>
+
 # Server-side
 <reply>
 <data>
diff --git a/tests/data/test152 b/tests/data/test152
index c3f4159e8f254ea16616fd1bd30d62d7575098fb..2cc521614c48c4556b29e9b68a34ccbd99170b9e 100644
--- a/tests/data/test152
+++ b/tests/data/test152
@@ -1,4 +1,12 @@
 <testcase>
+<info>
+<keywords>
+HTTP
+HTTP GET
+--fail
+</keywords>
+</info>
+
 # Server-side
 <reply>
 <data nocheck="yes">
diff --git a/tests/data/test156 b/tests/data/test156
index 0ff5e7e05bb0d3034d22f0f7e3f6462725ffd772..098de218de016dee255355970e8b8a80941f5138 100644
--- a/tests/data/test156
+++ b/tests/data/test156
@@ -1,4 +1,12 @@
 <testcase>
+<info>
+<keywords>
+HTTP
+HTTP PUT
+--anyauth
+</keywords>
+</info>
+
 # Server-side
 <reply>
 <data>
diff --git a/tests/data/test157 b/tests/data/test157
index 872d93b8676143aabdc688fa8091a5c7c38cb239..77700f6ade43a9347268608984bc0875c9437d49 100644
--- a/tests/data/test157
+++ b/tests/data/test157
@@ -1,4 +1,12 @@
 <testcase>
+<info>
+<keywords>
+HTTP
+HTTP GET
+--anyauth
+</keywords>
+</info>
+
 # Server-side
 <reply>
 <data>
diff --git a/tests/data/test159 b/tests/data/test159
index 2b9c8321857043726a5e67808c8e50dcf63ba82b..1f8a2f8877f576b5c839fc7dd166f7000adc299e 100644
--- a/tests/data/test159
+++ b/tests/data/test159
@@ -1,4 +1,11 @@
 <testcase>
+<info>
+<keywords>
+HTTP
+HTTP GET
+</keywords>
+</info>
+
 # Server-side
 <reply>
 
diff --git a/tests/data/test160 b/tests/data/test160
index d6ead5937614fe0039ff06f87fb9a6a67246e14b..df80aef974ac46b0bd84b5b14d416920740b2a8c 100644
--- a/tests/data/test160
+++ b/tests/data/test160
@@ -1,4 +1,11 @@
 <testcase>
+<info>
+<keywords>
+HTTP
+HTTP GET
+</keywords>
+</info>
+
 # Server-side
 <reply>
 <data nocheck="yes">
diff --git a/tests/data/test163 b/tests/data/test163
index 9e8256d0022dd98a5ebc37ddfa9568273d7441be..22341c0459440ebf669de309a5ad89a6d40a8c09 100644
--- a/tests/data/test163
+++ b/tests/data/test163
@@ -1,4 +1,11 @@
 <testcase>
+<info>
+<keywords>
+HTTP
+HTTP POST
+</keywords>
+</info>
+
 # Server-side
 <reply>
 <data>
diff --git a/tests/data/test164 b/tests/data/test164
index baac196263641a80346164a0e227c442a4e5d666..227bd717093b3735cf2b7993d4a78f5c9ddfb6cb 100644
--- a/tests/data/test164
+++ b/tests/data/test164
@@ -1,4 +1,11 @@
 <testcase>
+<info>
+<keywords>
+HTTP
+HTTP GET
+</keywords>
+</info>
+
 # Server-side
 # This particular response is an exact excerpt from an actual Apache
 # server when asked for a 0-10,12-15 range (except gt/lt changed to {}
diff --git a/tests/data/test166 b/tests/data/test166
index 374be283f1fafc70540b99b6809cf28df4a599d1..2036773f89e55abb11de600478644b89f488723a 100644
--- a/tests/data/test166
+++ b/tests/data/test166
@@ -1,4 +1,11 @@
 <testcase>
+<info>
+<keywords>
+HTTP
+HTTP POST
+</keywords>
+</info>
+
 # Server-side
 <reply>
 <data>
diff --git a/tests/data/test178 b/tests/data/test178
index 07f0566e7ea186dd730cbcf83133acd4364d0f99..7481467df73138badaa8500e12d162155f14e192 100644
--- a/tests/data/test178
+++ b/tests/data/test178
@@ -1,4 +1,11 @@
 <testcase>
+<info>
+<keywords>
+HTTP
+HTTP GET
+</keywords>
+</info>
+
 #
 # Server-side
 <reply>
diff --git a/tests/data/test180 b/tests/data/test180
index c93302e7573a9875cb05e4155740c2a6d0f0e17e..0b2ca0373ff895730db4131a284ab42de32e8439 100644
--- a/tests/data/test180
+++ b/tests/data/test180
@@ -1,4 +1,12 @@
 <testcase>
+<info>
+<keywords>
+HTTP
+HTTP PUT
+HTTP/1.0
+</keywords>
+</info>
+
 <reply>
 <data>
 HTTP/1.0 200 OK swsclose
diff --git a/tests/data/test181 b/tests/data/test181
index 87c5701fd592957ac314970170ca61d29fc07060..b6b55cb997121b7441c67c17f6e67bdefe55078d 100644
--- a/tests/data/test181
+++ b/tests/data/test181
@@ -1,4 +1,12 @@
 <testcase>
+<info>
+<keywords>
+HTTP
+HTTP POST
+HTTP/1.0
+</keywords>
+</info>
+
 <reply>
 <data>
 HTTP/1.0 200 OK swsclose
diff --git a/tests/data/test186 b/tests/data/test186
index 5a1b7b9ac3ab4252c91d1e10528918d770e6f64e..b07736cbc08d1363994f341e6aedfc7af0b59fb3 100644
--- a/tests/data/test186
+++ b/tests/data/test186
@@ -1,4 +1,11 @@
 <testcase>
+<info>
+<keywords>
+HTTP
+HTTP POST
+</keywords>
+</info>
+
 # Server-side
 <reply>
 <data>
diff --git a/tests/data/test189 b/tests/data/test189
index 55485104f2f443a90d51823e0855de853682ba25..deb6e894e00c4a82356f72e8882111cb00bac62d 100644
--- a/tests/data/test189
+++ b/tests/data/test189
@@ -1,4 +1,11 @@
 <testcase>
+<info>
+<keywords>
+HTTP
+HTTP GET
+</keywords>
+</info>
+
 # Server-side
 <reply>
 <data>
diff --git a/tests/data/test192 b/tests/data/test192
index 5f59e1850a680eee997d0ce8f203463554d10803..42cebc031fea7a5afdfc8a6b6cf9acffe6be346c 100644
--- a/tests/data/test192
+++ b/tests/data/test192
@@ -1,4 +1,11 @@
 <testcase>
+<info>
+<keywords>
+HTTP
+HTTP GET
+</keywords>
+</info>
+
 #
 # Server-side
 <reply>
diff --git a/tests/data/test510 b/tests/data/test510
index 8313f51c35ded8e9053be784329c99a222db880f..f1f1a3ceb62ec5fbebe5a502d0ac9359dd18869c 100644
--- a/tests/data/test510
+++ b/tests/data/test510
@@ -1,4 +1,11 @@
 <testcase>
+<info>
+<keywords>
+HTTP
+HTTP POST
+</keywords>
+</info>
+
 #
 # Server-side
 <reply>
diff --git a/tests/data/test512 b/tests/data/test512
index 516a503880d7c0d16c0a8d44989409cf0c5508d0..ce644db6f3bece050703759d9e303cb8f8120a2b 100644
--- a/tests/data/test512
+++ b/tests/data/test512
@@ -1,4 +1,11 @@
 <testcase>
+<info>
+<keywords>
+HTTP
+HTTP GET
+</keywords>
+</info>
+
 #
 # Server-side
 <reply>
diff --git a/tests/data/test513 b/tests/data/test513
index 7d8e69b87c99e40ce16faa9d62b190422aeb2884..00e0f77eb76c3179592789fa4acf912072047617 100644
--- a/tests/data/test513
+++ b/tests/data/test513
@@ -1,4 +1,11 @@
 <testcase>
+<info>
+<keywords>
+HTTP
+HTTP POST
+</keywords>
+</info>
+
 #
 # Server-side
 <reply>
diff --git a/tests/data/test514 b/tests/data/test514
index bd6da02db189c1c10732164446d2e2d73ca83d49..a8e66eaad22db6dd52b81e909d0de2fab50873fa 100644
--- a/tests/data/test514
+++ b/tests/data/test514
@@ -1,4 +1,10 @@
 <testcase>
+<info>
+<keywords>
+HTTP
+HTTP HEAD
+</keywords>
+</info>
 #
 # Server-side
 <reply>
diff --git a/tests/data/test515 b/tests/data/test515
index 9de0ac2b9b45e427ce9b354c871f7ba1d2636b3f..d139f29484dad57e26b100f0d3c142b93f1a6f6b 100644
--- a/tests/data/test515
+++ b/tests/data/test515
@@ -1,4 +1,10 @@
 <testcase>
+<info>
+<keywords>
+HTTP
+HTTP POST
+</keywords>
+</info>
 #
 # Server-side
 <reply>
diff --git a/tests/data/test516 b/tests/data/test516
index 22c39dc5eb4f0a7944b3e9ae9c7a7c2671791b6b..93f21d6ef1045015655d836fd31f13d2d0be11b1 100644
--- a/tests/data/test516
+++ b/tests/data/test516
@@ -1,4 +1,11 @@
 <testcase>
+<info>
+<keywords>
+HTTP
+HTTP POST
+</keywords>
+</info>
+
 #
 # Server-side
 <reply>
diff --git a/tests/data/test518 b/tests/data/test518
index 8e52615c5388a889f24a3a5ffae962e153f2d7dd..58c8b2cf1db4f07671a0fdaf8c137e4cc9f8f5be 100644
--- a/tests/data/test518
+++ b/tests/data/test518
@@ -1,4 +1,11 @@
 <testcase>
+<info>
+<keywords>
+HTTP
+HTTP GET
+</keywords>
+</info>
+
 #
 # Server-side
 <reply>
diff --git a/tests/data/test519 b/tests/data/test519
index c6bc8615bd969c415dd1472c6ee1ef9bc024f368..1a9768d0e660c263fcc56222d7d6bd58d9ad23d0 100644
--- a/tests/data/test519
+++ b/tests/data/test519
@@ -1,4 +1,11 @@
 <testcase>
+<info>
+<keywords>
+HTTP
+HTTP GET
+</keywords>
+</info>
+
 #
 # Server-side
 <reply>
diff --git a/tests/data/test536 b/tests/data/test536
index ef8263d98a543e08922a6cd356ab577fa384f50f..51cde158f79fa6eae133eea86fd62f47ecb898f5 100644
--- a/tests/data/test536
+++ b/tests/data/test536
@@ -2,6 +2,7 @@
 <info>
 <keywords>
 HTTP
+HTTP GET
 pipelining
 multi
 </keywords>
diff --git a/tests/data/test537 b/tests/data/test537
index ce66c409d9738b06b43f29a01de619e9f68f20c1..bef8f83b278822f13317d29a673e4cb140cd9e21 100644
--- a/tests/data/test537
+++ b/tests/data/test537
@@ -1,4 +1,11 @@
 <testcase>
+<info>
+<keywords>
+HTTP
+HTTP GET
+</keywords>
+</info>
+
 #
 # Server-side
 <reply>
diff --git a/tests/data/test544 b/tests/data/test544
index 2fa4edb1b258bf62092ebe4b86f9a3cf73d4e63f..963baec78be7ee2d0b4c0a4b726a468ec984cf92 100644
--- a/tests/data/test544
+++ b/tests/data/test544
@@ -1,4 +1,11 @@
 <testcase>
+<info>
+<keywords>
+HTTP
+HTTP POST
+</keywords>
+</info>
+
 #
 # Server-side
 <reply>
diff --git a/tests/data/test545 b/tests/data/test545
index 66ebb61199e9df182f53441d97a597468ddbbab5..11e3fb9f331e75eb9d723be96143a7e481875fb8 100644
Binary files a/tests/data/test545 and b/tests/data/test545 differ
diff --git a/tests/data/test554 b/tests/data/test554
index b442230c9b679e34ccc24a88647335b557e3634f..b08d7741f7f5b86557ce0f605ba337dbb6edb291 100644
--- a/tests/data/test554
+++ b/tests/data/test554
@@ -1,4 +1,11 @@
 <testcase>
+<info>
+<keywords>
+HTTP
+HTTP POST
+</keywords>
+</info>
+
 #
 # Server-side
 <reply>
diff --git a/tests/data/test587 b/tests/data/test587
index e73cc2cf72ba1b05148cacb4d8a105a68d3a425f..69cbe1ed72d25be41c9cf8028ef48b2c7ebfc067 100644
--- a/tests/data/test587
+++ b/tests/data/test587
@@ -1,4 +1,11 @@
 <testcase>
+<info>
+<keywords>
+HTTP
+HTTP POST
+</keywords>
+</info>
+
 #
 # Server-side
 <reply>