diff --git a/tests/data/test1101 b/tests/data/test1101
index 02aced8ce4..a17f2f9717 100644
--- a/tests/data/test1101
+++ b/tests/data/test1101
@@ -4,6 +4,8 @@
 HTTP
 HTTP GET
 HTTP Basic auth
+HTTP proxy
+http_proxy
 NO_PROXY
 </keywords>
 </info>
diff --git a/tests/data/test1194 b/tests/data/test1194
index cabf6beb0f..52d9292bca 100644
--- a/tests/data/test1194
+++ b/tests/data/test1194
@@ -30,7 +30,7 @@ mqtt
 mqtt
 </server>
 <name>
-MQTT SUBSCRIBE with PUBLISH befoire SUBACK
+MQTT SUBSCRIBE with PUBLISH before SUBACK
 </name>
 <command option="binary-trace">
 mqtt://%HOSTIP:%MQTTPORT/%TESTNUMBER
diff --git a/tests/data/test1252 b/tests/data/test1252
index 262cf3c9bc..0fea2b67a3 100644
--- a/tests/data/test1252
+++ b/tests/data/test1252
@@ -30,7 +30,7 @@ proxy
 http
 </server>
 <name>
-Under condition using --proxy, override NO_PROXY by --nproxy and access target URL directly
+Under condition using --proxy, override NO_PROXY by --noproxy and access target URL directly
 </name>
 <setenv>
 NO_PROXY=example.com
diff --git a/tests/data/test1253 b/tests/data/test1253
index 96f0a2d20f..a10732e4c3 100644
--- a/tests/data/test1253
+++ b/tests/data/test1253
@@ -27,7 +27,7 @@ foo
 http
 </server>
 <name>
-Under condition using --proxy, override NO_PROXY by --nproxy and access target URL through proxy
+Under condition using --proxy, override NO_PROXY by --noproxy and access target URL through proxy
 </name>
 <setenv>
 NO_PROXY=example.com
diff --git a/tests/data/test1255 b/tests/data/test1255
index 7c1fa24383..f23f4660c4 100644
--- a/tests/data/test1255
+++ b/tests/data/test1255
@@ -3,6 +3,7 @@
 <keywords>
 HTTP
 HTTP proxy
+http_proxy
 NO_PROXY
 noproxy
 </keywords>
@@ -27,7 +28,7 @@ foo
 http
 </server>
 <name>
-Under condition using http_proxy, override NO_PROXY by --nproxy and access target URL directly
+Under condition using http_proxy, override NO_PROXY by --noproxy and access target URL directly
 </name>
 <setenv>
 http_proxy=http://%HOSTIP:%HTTPPORT
diff --git a/tests/data/test1256 b/tests/data/test1256
index f9f0fdc77b..fcbb6053c9 100644
--- a/tests/data/test1256
+++ b/tests/data/test1256
@@ -3,6 +3,7 @@
 <keywords>
 HTTP
 HTTP proxy
+http_proxy
 NO_PROXY
 noproxy
 </keywords>
@@ -27,7 +28,7 @@ foo
 http
 </server>
 <name>
-Under condition using http_proxy, override NO_PROXY by --nproxy and access target URL through proxy
+Under condition using http_proxy, override NO_PROXY by --noproxy and access target URL through proxy
 </name>
 <setenv>
 http_proxy=http://%HOSTIP:%HTTPPORT
diff --git a/tests/data/test1257 b/tests/data/test1257
index 82c61ee74b..daf411e838 100644
--- a/tests/data/test1257
+++ b/tests/data/test1257
@@ -3,6 +3,7 @@
 <keywords>
 HTTP
 HTTP proxy
+http_proxy
 NO_PROXY
 noproxy
 </keywords>
@@ -27,7 +28,7 @@ foo
 http
 </server>
 <name>
-Under condition using http_proxy, override NO_PROXY by --nproxy and access target URL through proxy
+Under condition using http_proxy, override NO_PROXY by --noproxy and access target URL through proxy
 </name>
 <setenv>
 http_proxy=http://%HOSTIP:%HTTPPORT
diff --git a/tests/data/test1265 b/tests/data/test1265
index b18f2db748..16a7833c87 100644
--- a/tests/data/test1265
+++ b/tests/data/test1265
@@ -3,6 +3,7 @@
 <keywords>
 HTTP
 HTTP proxy
+http_proxy
 NO_PROXY
 noproxy
 </keywords>
diff --git a/tests/data/test1289 b/tests/data/test1289
index 14a41458ab..e159f1d172 100644
--- a/tests/data/test1289
+++ b/tests/data/test1289
@@ -18,7 +18,7 @@ globbing
 http
 </server>
 <name>
-globbing with overflow and bad syntxx
+globbing with overflow and bad syntax
 </name>
 <command>
 http://ur%20[0-60000000000000000000
diff --git a/tests/data/test1322 b/tests/data/test1322
index ddc9aaa7f5..a709527109 100644
--- a/tests/data/test1322
+++ b/tests/data/test1322
@@ -4,7 +4,7 @@
 HTTP
 HTTP GET
 --resolve
-trailing dot
+trailing-dot
 </keywords>
 </info>
 
diff --git a/tests/data/test1550 b/tests/data/test1550
index 2d297a47af..3d747792fe 100644
--- a/tests/data/test1550
+++ b/tests/data/test1550
@@ -20,7 +20,7 @@ lib%TESTNUMBER
 </tool>
 
 <name>
-verify setting pipeling blocklisting options
+verify setting pipelining blocklisting options
 </name>
 <command>
 http://%HOSTIP:%NOLISTENPORT/%TESTNUMBER
diff --git a/tests/data/test1560 b/tests/data/test1560
index fc27000d14..8a991f9b9e 100644
--- a/tests/data/test1560
+++ b/tests/data/test1560
@@ -2,7 +2,7 @@
 <info>
 <keywords>
 unittest
-URLAPI
+urlapi
 </keywords>
 </info>
 
diff --git a/tests/data/test1630 b/tests/data/test1630
index 35bc53fd41..d8cdab826f 100644
--- a/tests/data/test1630
+++ b/tests/data/test1630
@@ -3,8 +3,8 @@
 <keywords>
 HTTP
 HTTP GET
-HTTPS-proxy
-HTTPS-proxy Basic auth
+HTTPS proxy
+HTTPS proxy Basic auth
 </keywords>
 </info>
 
diff --git a/tests/data/test1631 b/tests/data/test1631
index 4bd67843db..16786b879a 100644
--- a/tests/data/test1631
+++ b/tests/data/test1631
@@ -2,7 +2,7 @@
 <info>
 <keywords>
 FTP
-HTTPS-proxy
+HTTPS proxy
 flaky
 </keywords>
 </info>
diff --git a/tests/data/test1632 b/tests/data/test1632
index 1685ce7a70..1494eb40ac 100644
--- a/tests/data/test1632
+++ b/tests/data/test1632
@@ -2,7 +2,7 @@
 <info>
 <keywords>
 FTP
-HTTPS-proxy
+HTTPS proxy
 flaky
 </keywords>
 </info>
diff --git a/tests/data/test1650 b/tests/data/test1650
index 57a06f05e1..b99001923b 100644
--- a/tests/data/test1650
+++ b/tests/data/test1650
@@ -17,7 +17,7 @@ unittest
 DoH
 </features>
 <name>
-DOH
+DoH parsing
 </name>
 </client>
 </testcase>
diff --git a/tests/data/test1654 b/tests/data/test1654
index e759c681a4..d7c1443bdb 100644
--- a/tests/data/test1654
+++ b/tests/data/test1654
@@ -2,8 +2,7 @@
 <info>
 <keywords>
 unittest
-alt-svc
-altsvc
+Alt-Svc
 </keywords>
 </info>
 
diff --git a/tests/data/test1655 b/tests/data/test1655
index 6e79170314..b69b36a29f 100644
--- a/tests/data/test1655
+++ b/tests/data/test1655
@@ -2,7 +2,7 @@
 <info>
 <keywords>
 unittest
-doh
+DOH
 </keywords>
 </info>
 
diff --git a/tests/data/test1709 b/tests/data/test1709
index 8482ba49ad..efdc8a7d3e 100644
--- a/tests/data/test1709
+++ b/tests/data/test1709
@@ -16,7 +16,7 @@ none
 </server>
 
 <name>
-Verify curl -h --badone
+Verify curl -h with bad option name
 </name>
 
 <command>
diff --git a/tests/data/test1919 b/tests/data/test1919
index 98613877ba..b5f4bb17c2 100644
--- a/tests/data/test1919
+++ b/tests/data/test1919
@@ -1,7 +1,7 @@
 <testcase>
 <info>
 <keywords>
-conn-reuse
+connection reuse
 </keywords>
 </info>
 
diff --git a/tests/data/test219 b/tests/data/test219
index 2e965f366e..d597478b61 100644
--- a/tests/data/test219
+++ b/tests/data/test219
@@ -2,6 +2,7 @@
 <info>
 <keywords>
 proxy
+unsupported scheme
 </keywords>
 </info>
 
diff --git a/tests/data/test23 b/tests/data/test23
index 1f15b218e1..ffb969164f 100644
--- a/tests/data/test23
+++ b/tests/data/test23
@@ -1,7 +1,7 @@
 <testcase>
 <info>
 <keywords>
-unsupported protocol
+unsupported scheme
 FAILURE
 </keywords>
 </info>
diff --git a/tests/data/test235 b/tests/data/test235
index 485be98ecf..4e112398a0 100644
--- a/tests/data/test235
+++ b/tests/data/test235
@@ -2,6 +2,7 @@
 <info>
 <keywords>
 FTP
+STOR
 </keywords>
 </info>
 
diff --git a/tests/data/test247 b/tests/data/test247
index 5eade37b30..ec28ca81f8 100644
--- a/tests/data/test247
+++ b/tests/data/test247
@@ -2,6 +2,7 @@
 <info>
 <keywords>
 FTP
+MDTM
 </keywords>
 </info>
 
diff --git a/tests/data/test248 b/tests/data/test248
index 2d5c845bae..ed3f3779ff 100644
--- a/tests/data/test248
+++ b/tests/data/test248
@@ -2,6 +2,8 @@
 <info>
 <keywords>
 FTP
+STOR
+MDTM
 </keywords>
 </info>
 
diff --git a/tests/data/test260 b/tests/data/test260
index 7793b7646a..b72d6cd166 100644
--- a/tests/data/test260
+++ b/tests/data/test260
@@ -32,7 +32,7 @@ Funny-head: yesyes
 http
 </server>
 <name>
-HTTP GET URL without slash but with questionmark
+HTTP GET URL without slash but with question mark
 </name>
 <command>
 "http://%HOSTIP:%HTTPPORT?%TESTNUMBER"
diff --git a/tests/data/test3021 b/tests/data/test3021
index 56b4f9b4f7..8dbd7dd9dc 100644
--- a/tests/data/test3021
+++ b/tests/data/test3021
@@ -2,7 +2,8 @@
 <info>
 <keywords>
 SFTP
-server sha256 key check
+server key check
+SHA256
 </keywords>
 </info>
 
diff --git a/tests/data/test3022 b/tests/data/test3022
index 1213a02884..4efd4ea5e8 100644
--- a/tests/data/test3022
+++ b/tests/data/test3022
@@ -2,7 +2,8 @@
 <info>
 <keywords>
 SCP
-server sha256 key check
+server key check
+SHA256
 </keywords>
 </info>
 
diff --git a/tests/data/test3104 b/tests/data/test3104
index 5853898514..296bdc1dc1 100644
--- a/tests/data/test3104
+++ b/tests/data/test3104
@@ -38,7 +38,7 @@ http
 lib%TESTNUMBER
 </tool>
 <name>
-CURLOPT_COOKIELIST with netscape format
+CURLOPT_COOKIELIST with Netscape format
 </name>
 <command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER
diff --git a/tests/data/test333 b/tests/data/test333
index 8f048e6cbe..690e407594 100644
--- a/tests/data/test333
+++ b/tests/data/test333
@@ -1,7 +1,7 @@
 <testcase>
 <info>
 <keywords>
-command-line
+cmdline
 </keywords>
 </info>
 
diff --git a/tests/data/test357 b/tests/data/test357
index e7e4e6160a..8883cfffe8 100644
--- a/tests/data/test357
+++ b/tests/data/test357
@@ -3,7 +3,7 @@
 <keywords>
 HTTP
 HTTP PUT
-Expect
+Expect: 100-continue
 </keywords>
 </info>
 # Server-side
diff --git a/tests/data/test365 b/tests/data/test365
index 05ab8faa36..40f0540bcc 100644
--- a/tests/data/test365
+++ b/tests/data/test365
@@ -3,7 +3,7 @@
 <keywords>
 HTTP
 HTTP GET
-Chunked
+chunked Transfer-Encoding
 </keywords>
 </info>
 
diff --git a/tests/data/test367 b/tests/data/test367
index de8b9014a3..1ee59cedfd 100644
--- a/tests/data/test367
+++ b/tests/data/test367
@@ -3,7 +3,7 @@
 <keywords>
 HTTP
 HTTP GET
-Basic
+HTTP Basic auth
 </keywords>
 </info>
 
diff --git a/tests/data/test373 b/tests/data/test373
index b11f227f20..5a51fe968f 100644
--- a/tests/data/test373
+++ b/tests/data/test373
@@ -3,7 +3,7 @@
 <keywords>
 HTTP
 HTTP GET
-chunked transfer encoding
+chunked Transfer-Encoding
 </keywords>
 </info>
 
diff --git a/tests/data/test417 b/tests/data/test417
index f286e41925..0e7ac831d1 100644
--- a/tests/data/test417
+++ b/tests/data/test417
@@ -2,6 +2,7 @@
 <info>
 <keywords>
 HTTPS
+--write-out
 %{certs}
 </keywords>
 </info>
@@ -31,7 +32,7 @@ http
 https
 </server>
 <name>
-%{certs}
+--write-out with %{certs}
 </name>
 <command option="no-include">
 --insecure https://%HOSTIP:%HTTPSPORT/%TESTNUMBER -w '%{certs}'
diff --git a/tests/data/test419 b/tests/data/test419
index f8ec82522b..d0f48a9f7c 100644
--- a/tests/data/test419
+++ b/tests/data/test419
@@ -2,7 +2,7 @@
 <info>
 <keywords>
 --dump-header
-failure
+FAILURE
 </keywords>
 </info>
 
diff --git a/tests/data/test426 b/tests/data/test426
index 34c80c6aae..cc66108d14 100644
--- a/tests/data/test426
+++ b/tests/data/test426
@@ -1,6 +1,7 @@
 <testcase>
 <info>
 <keywords>
+Resume
 error detection
 </keywords>
 </info>
diff --git a/tests/data/test469 b/tests/data/test469
index 81d341cd8c..b6f0bdbdea 100644
--- a/tests/data/test469
+++ b/tests/data/test469
@@ -2,7 +2,6 @@
 <info>
 <keywords>
 HTTP
-
 </keywords>
 </info>
 
diff --git a/tests/data/test470 b/tests/data/test470
index a3f05f8cbe..7b2da01e83 100644
--- a/tests/data/test470
+++ b/tests/data/test470
@@ -2,7 +2,6 @@
 <info>
 <keywords>
 HTTP
-
 </keywords>
 </info>
 
diff --git a/tests/data/test480 b/tests/data/test480
index aab889f472..96149412b5 100644
--- a/tests/data/test480
+++ b/tests/data/test480
@@ -2,7 +2,7 @@
 <info>
 <keywords>
 netrc
-pop3
+POP3
 </keywords>
 </info>
 #
diff --git a/tests/data/test484 b/tests/data/test484
index 4c5c4cc250..3850ce4df2 100644
--- a/tests/data/test484
+++ b/tests/data/test484
@@ -2,7 +2,7 @@
 <info>
 <keywords>
 HTTP
-etags
+etag
 </keywords>
 </info>
 
diff --git a/tests/data/test485 b/tests/data/test485
index a6405a61f8..01761e9562 100644
--- a/tests/data/test485
+++ b/tests/data/test485
@@ -2,7 +2,7 @@
 <info>
 <keywords>
 HTTP
-etags
+etag
 </keywords>
 </info>
 
diff --git a/tests/data/test505 b/tests/data/test505
index aa26ccb5f9..70dfcda06a 100644
--- a/tests/data/test505
+++ b/tests/data/test505
@@ -2,6 +2,7 @@
 <info>
 <keywords>
 FTP
+STOR
 </keywords>
 </info>
 
diff --git a/tests/data/test541 b/tests/data/test541
index 9492d0854e..ed4de68b98 100644
--- a/tests/data/test541
+++ b/tests/data/test541
@@ -2,6 +2,7 @@
 <info>
 <keywords>
 FTP
+STOR
 </keywords>
 </info>
 
diff --git a/tests/data/test63 b/tests/data/test63
index 3a7e015fd3..5f659a6ae3 100644
--- a/tests/data/test63
+++ b/tests/data/test63
@@ -5,6 +5,7 @@ HTTP
 HTTP GET
 HTTP proxy
 HTTP proxy Basic auth
+http_proxy
 </keywords>
 </info>
 # Server-side
diff --git a/tests/data/test647 b/tests/data/test647
index d34fe21f74..8cac4577e1 100644
--- a/tests/data/test647
+++ b/tests/data/test647
@@ -3,6 +3,7 @@
 <keywords>
 IMAP
 APPEND
+UPLOAD
 MULTIPART
 </keywords>
 </info>
diff --git a/tests/data/test693 b/tests/data/test693
index 533ce80311..d7bd193ac2 100644
--- a/tests/data/test693
+++ b/tests/data/test693
@@ -3,7 +3,7 @@
 <keywords>
 HTTP
 HTTP GET
-etags
+etag
 </keywords>
 </info>
 #
diff --git a/tests/data/test709 b/tests/data/test709
index 656675395c..2b2b952c18 100644
--- a/tests/data/test709
+++ b/tests/data/test709
@@ -4,6 +4,7 @@
 HTTP
 HTTP GET
 SOCKS5
+http_proxy
 </keywords>
 </info>
 
diff --git a/tests/data/test783 b/tests/data/test783
index 1f888738ed..be7004ed8a 100644
--- a/tests/data/test783
+++ b/tests/data/test783
@@ -52,7 +52,7 @@ CURL_TIME=1728465947
 </file>
 
 <name>
-HSTS update expiry, removing includesubdomains in update
+HSTS update expiry, removing includeSubDomains in update
 </name>
 <command>
 -x http://%HOSTIP:%PROXYPORT http://this.hsts.example:%HTTPSPORT/%TESTNUMBER --hsts %LOGDIR/input%TESTNUMBER --insecure
diff --git a/tests/data/test898 b/tests/data/test898
index c6dba52d67..cffbc629b2 100644
--- a/tests/data/test898
+++ b/tests/data/test898
@@ -5,7 +5,7 @@ HTTP
 HTTP proxy
 --location
 Authorization
-Cookie
+cookies
 </keywords>
 </info>
 
diff --git a/tests/data/test899 b/tests/data/test899
index d1f1936fc0..5f163ab29f 100644
--- a/tests/data/test899
+++ b/tests/data/test899
@@ -3,7 +3,7 @@
 <keywords>
 HTTP
 HTTP GET
-Basic
+HTTP Basic auth
 </keywords>
 </info>
 
diff --git a/tests/data/test954 b/tests/data/test954
index 698786b4db..0bb6488dd6 100644
--- a/tests/data/test954
+++ b/tests/data/test954
@@ -5,7 +5,7 @@ SMTP
 SASL
 SASL AUTH PLAIN
 RFC4616
-RFC4%TESTNUMBER
+RFC4954
 </keywords>
 </info>
 
diff --git a/tests/data/test979 b/tests/data/test979
index 40cc35044d..98a7d83914 100644
--- a/tests/data/test979
+++ b/tests/data/test979
@@ -3,7 +3,7 @@
 <keywords>
 HTTP
 HTTP GET
-Basic
+HTTP Basic auth
 </keywords>
 </info>
 
diff --git a/tests/data/test987 b/tests/data/test987
index ae69b8de87..c58ae77e13 100644
--- a/tests/data/test987
+++ b/tests/data/test987
@@ -2,6 +2,7 @@
 <info>
 <keywords>
 SMTPS
+UPLOAD
 </keywords>
 </info>
 
diff --git a/tests/data/test992 b/tests/data/test992
index dad0aa51a5..a4b24376f3 100644
--- a/tests/data/test992
+++ b/tests/data/test992
@@ -1,7 +1,9 @@
 <testcase>
 <info>
 <keywords>
+SMTP
 SASL
+UPLOAD
 </keywords>
 </info>