diff --git a/tests/data/test1032 b/tests/data/test1032
index 614cdbf74bfd45fa1df8a581b5edb79f4bd2b419..56918645e415a4ab2369ea66bb06cf0621dc8b0c 100644
--- a/tests/data/test1032
+++ b/tests/data/test1032
@@ -3,7 +3,7 @@
 <keywords>
 HTTP
 HTTP HEAD
-range
+Range
 </keywords>
 </info>
 
diff --git a/tests/data/test1048 b/tests/data/test1048
index cba99ba75741be81bd38dafeb8f368b35bfb6d74..c30347336eeec6205445bed60b01424cf2fa8d0c 100644
--- a/tests/data/test1048
+++ b/tests/data/test1048
@@ -2,6 +2,8 @@
 <info>
 <keywords>
 FTP
+FTP-ipv6
+IPv6
 PASV
 LIST
 --interface
diff --git a/tests/data/test1119 b/tests/data/test1119
index 4b5a9ec732be18ae1e2a509befe5c0096cc96f8b..017f598f31e520b25ab6e0393ded7587ab74d2ed 100644
--- a/tests/data/test1119
+++ b/tests/data/test1119
@@ -1,6 +1,7 @@
 <testcase>
 <info>
 <keywords>
+source analysis
 symbols-in-versions
 </keywords>
 </info>
diff --git a/tests/data/test1123 b/tests/data/test1123
index 3172fedb1b819ea0c29924a49f07572e6c4a80c0..bd441a995f74fb8542f551d253a089978c945fda 100644
--- a/tests/data/test1123
+++ b/tests/data/test1123
@@ -4,6 +4,7 @@
 HTTP
 HTTP GET
 compressed
+Transfer-Encoding
 </keywords>
 </info>
 #
diff --git a/tests/data/test1124 b/tests/data/test1124
index d860bee1356fac9d0ef135f435e9f04ce5d26b5a..58f63f9307910b03988879371f3a6cfdd736c306 100644
--- a/tests/data/test1124
+++ b/tests/data/test1124
@@ -5,7 +5,7 @@ HTTP
 HTTP GET
 compressed
 Transfer-Encoding
-chunked
+chunked Transfer-Encoding
 </keywords>
 </info>
 #
diff --git a/tests/data/test1132 b/tests/data/test1132
index 366ffc77cae17d6c6fd4d0b511875a02d7f7751b..8aa643224d23e355aecee0587df3c6e2b0c14e90 100644
--- a/tests/data/test1132
+++ b/tests/data/test1132
@@ -1,6 +1,7 @@
 <testcase>
 <info>
 <keywords>
+source analysis
 memory-includes
 </keywords>
 </info>
diff --git a/tests/data/test116 b/tests/data/test116
index 9a36f97702509fba5a5e4090dc0af6d06b282a43..2ed4ab08cb79f5bc18c656d1a29a4ecb4d61cc64 100644
--- a/tests/data/test116
+++ b/tests/data/test116
@@ -2,6 +2,7 @@
 <info>
 <keywords>
 FTP
+EPRT
 PORT
 FAILURE
 EPRT refused
diff --git a/tests/data/test1212 b/tests/data/test1212
index 9d92a8dfb0b72400c166c6211078f649be7a967d..3fd8fdd853020b7190cfbec06db6a97b1b79e0b4 100644
--- a/tests/data/test1212
+++ b/tests/data/test1212
@@ -1,12 +1,13 @@
 <testcase>
 <info>
 <keywords>
-Proxy
-Socks Proxy
+HTTP
+SOCKS5
 NO_PROXY
 noproxy
 </keywords>
 </info>
+
 # Server-side
 <reply>
 <data>
diff --git a/tests/data/test1221 b/tests/data/test1221
index cca3295875bf60fd06b93908f1349f96f782b43b..261cb8c607defbebae50824e7946ab95ec458dbc 100644
--- a/tests/data/test1221
+++ b/tests/data/test1221
@@ -2,8 +2,10 @@
 <info>
 <keywords>
 build system
+source analysis
 </keywords>
 </info>
+
 #
 # Client-side
 <client>
diff --git a/tests/data/test1222 b/tests/data/test1222
index f0da507273f350a129f3690f7e1cfdb71ca77fba..51edc9702478ec56a04cf001b818e7416520cdc8 100644
--- a/tests/data/test1222
+++ b/tests/data/test1222
@@ -2,8 +2,10 @@
 <info>
 <keywords>
 build system
+source analysis
 </keywords>
 </info>
+
 #
 # Client-side
 <client>
diff --git a/tests/data/test1237 b/tests/data/test1237
index 51892e186cb2e910f4ae4eb15356552fbf09a50b..68f023d384261547e7f9dfb84141a13237badf83 100644
--- a/tests/data/test1237
+++ b/tests/data/test1237
@@ -2,7 +2,7 @@
 <info>
 <keywords>
 HTTP
-Basic
+HTTP Basic auth
 </keywords>
 </info>
 # Server-side
diff --git a/tests/data/test1328 b/tests/data/test1328
index c3991ecb4b418978f386dc057b0a5cfda29e24eb..04203a776ab88c9029a2d89f5ab8b12cd222341d 100644
--- a/tests/data/test1328
+++ b/tests/data/test1328
@@ -3,7 +3,7 @@
 <keywords>
 HTTP
 HTTP GET
--f
+--fail
 </keywords>
 </info>
 
diff --git a/tests/data/test1405 b/tests/data/test1405
index 692bb1af77fe5601aab018097c24da2531eba74b..9295a1b60ea27e2523676f89b319b3a8bf5725fd 100644
--- a/tests/data/test1405
+++ b/tests/data/test1405
@@ -5,7 +5,6 @@
 FTP
 post-quote
 pre-quote
-quote
 --libcurl
 </keywords>
 </info>
diff --git a/tests/data/test1408 b/tests/data/test1408
index 01b2f6d76a85f0136932a6899a127dc7cd0903ed..54d5e7778063bb0fdeb290b904700bdbee5a8fae 100644
--- a/tests/data/test1408
+++ b/tests/data/test1408
@@ -3,7 +3,7 @@
 <keywords>
 HTTP
 HTTP GET
-IPV6
+IPv6
 cookies
 cookiejar
 </keywords>
diff --git a/tests/data/test207 b/tests/data/test207
index 85f9af6ad26eb77c0d7caa5792460127db33c9aa..e44385f18a736fbe60de634ef7eda6726c60072f 100644
--- a/tests/data/test207
+++ b/tests/data/test207
@@ -3,6 +3,8 @@
 <keywords>
 HTTP
 HTTP GET
+CURLE_PARTIAL_FILE
+FAILURE
 </keywords>
 </info>
 #
diff --git a/tests/data/test212 b/tests/data/test212
index 8daed55387eb935cdaa4ed5e0443ccb976a848ef..444525f182c63621a0eb4409fb3ea05a2df905d3 100644
--- a/tests/data/test212
+++ b/tests/data/test212
@@ -2,6 +2,7 @@
 <info>
 <keywords>
 FTP
+EPRT
 </keywords>
 </info>
 
diff --git a/tests/data/test227 b/tests/data/test227
index 523fa02530f9425d2cb662637a5b940839bf668f..5b6d98cd1720fb57343bdd0b5c78c79a163d218f 100644
--- a/tests/data/test227
+++ b/tests/data/test227
@@ -4,7 +4,6 @@
 FTP
 post-quote
 pre-quote
-quote
 </keywords>
 </info>
 # Server-side
diff --git a/tests/data/test627 b/tests/data/test627
index ae29d9b5a22f072ba961ab645ca240f924764096..01c5221ac5e127b9f7454c918c35b75d21b9f870 100644
--- a/tests/data/test627
+++ b/tests/data/test627
@@ -2,7 +2,7 @@
 <info>
 <keywords>
 SFTP
-quote
+pre-quote
 NOBODY
 </keywords>
 </info>
diff --git a/tests/data/test77 b/tests/data/test77
index 90f4563b25fe17c791813f04c115631b07078a0f..6a92158c8df6361a733210867013fa53e01dd8da 100644
--- a/tests/data/test77
+++ b/tests/data/test77
@@ -3,6 +3,7 @@
 <keywords>
 HTTP
 HTTP GET
+If-Modified-Since
 -z
 </keywords>
 </info>
diff --git a/tests/data/test78 b/tests/data/test78
index aa889c50f5ff39812626a7fc5ce44a641d8d830a..6768000b46cd8458aaad4d074d4d7fb7477a84b0 100644
--- a/tests/data/test78
+++ b/tests/data/test78
@@ -3,6 +3,7 @@
 <keywords>
 HTTP
 HTTP GET
+If-Modified-Since
 -z
 </keywords>
 </info>