diff --git a/tests/data/test1032 b/tests/data/test1032
index 614cdbf74b..56918645e4 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 cba99ba757..c30347336e 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 4b5a9ec732..017f598f31 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 3172fedb1b..bd441a995f 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 d860bee135..58f63f9307 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 366ffc77ca..8aa643224d 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 9a36f97702..2ed4ab08cb 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 9d92a8dfb0..3fd8fdd853 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 cca3295875..261cb8c607 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 f0da507273..51edc97024 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 51892e186c..68f023d384 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 c3991ecb4b..04203a776a 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 692bb1af77..9295a1b60e 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 01b2f6d76a..54d5e77780 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 85f9af6ad2..e44385f18a 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 8daed55387..444525f182 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 523fa02530..5b6d98cd17 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 ae29d9b5a2..01c5221ac5 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 90f4563b25..6a92158c8d 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 aa889c50f5..6768000b46 100644
--- a/tests/data/test78
+++ b/tests/data/test78
@@ -3,6 +3,7 @@
 <keywords>
 HTTP
 HTTP GET
+If-Modified-Since
 -z
 </keywords>
 </info>