diff --git a/tests/FILEFORMAT.md b/tests/FILEFORMAT.md
index bc5f42a086..2c36a91cd4 100644
--- a/tests/FILEFORMAT.md
+++ b/tests/FILEFORMAT.md
@@ -432,7 +432,7 @@ Features testable here are:
 - `CharConv`
 - `cookies`
 - `crypto`
-- `debug`
+- `Debug`
 - `DoH`
 - `getrlimit`
 - `GnuTLS`
@@ -443,12 +443,12 @@ Features testable here are:
 - `HTTP-auth`
 - `http/2`
 - `http/3`
-- `https-proxy`
+- `HTTPS-proxy`
 - `hyper`
-- `idn`
-- `ipv6`
+- `IDN`
+- `IPv6`
 - `Kerberos`
-- `large_file`
+- `Largefile`
 - `large-time` (time_t is larger than 32 bit)
 - `ld_preload`
 - `libssh2`
@@ -483,7 +483,7 @@ Features testable here are:
 - `threadsafe`
 - `Unicode`
 - `unittest`
-- `unix-sockets`
+- `UnixSockets`
 - `verbose-strings`
 - `wakeup`
 - `win32`
diff --git a/tests/data/test1034 b/tests/data/test1034
index 2a8170487e..09a4dd5f3f 100644
--- a/tests/data/test1034
+++ b/tests/data/test1034
@@ -23,7 +23,7 @@ config file
 none
 </server>
 <features>
-idn
+IDN
 http
 proxy
 </features>
diff --git a/tests/data/test1035 b/tests/data/test1035
index 1ace9428dd..0bbaabf9c8 100644
--- a/tests/data/test1035
+++ b/tests/data/test1035
@@ -21,7 +21,7 @@ FAILURE
 none
 </server>
 <features>
-idn
+IDN
 http
 proxy
 </features>
diff --git a/tests/data/test1044 b/tests/data/test1044
index 96a4f48c23..471f099a3f 100644
--- a/tests/data/test1044
+++ b/tests/data/test1044
@@ -23,7 +23,7 @@ Largefile
 # Client-side
 <client>
 <features>
-large_file
+Largefile
 </features>
 <server>
 ftp
diff --git a/tests/data/test1046 b/tests/data/test1046
index c6bdcbb24b..865fe12933 100644
--- a/tests/data/test1046
+++ b/tests/data/test1046
@@ -27,7 +27,7 @@ Content-Type: text/plain
 # Client-side
 <client>
 <features>
-ipv6
+IPv6
 </features>
 <server>
 http-ipv6
diff --git a/tests/data/test1048 b/tests/data/test1048
index 56f19c4af3..d4e12494b1 100644
--- a/tests/data/test1048
+++ b/tests/data/test1048
@@ -34,7 +34,7 @@ dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
 # Client-side
 <client>
 <features>
-ipv6
+IPv6
 </features>
 <server>
 ftp-ipv6
diff --git a/tests/data/test1050 b/tests/data/test1050
index ff179c637b..d302f10563 100644
--- a/tests/data/test1050
+++ b/tests/data/test1050
@@ -30,7 +30,7 @@ dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
 # Client-side
 <client>
 <features>
-ipv6
+IPv6
 </features>
 <server>
 ftp-ipv6
diff --git a/tests/data/test1056 b/tests/data/test1056
index 40879662a3..033c31f9f6 100644
--- a/tests/data/test1056
+++ b/tests/data/test1056
@@ -48,7 +48,7 @@ body
 # test there. This feature doesn't work on msys or Cygwin, so use a precheck
 # to skip those.
 <features>
-ipv6
+IPv6
 !win32
 </features>
 <server>
diff --git a/tests/data/test1063 b/tests/data/test1063
index fcbc4b883f..449263ef6f 100644
--- a/tests/data/test1063
+++ b/tests/data/test1063
@@ -20,7 +20,7 @@ none
 </server>
 <features>
 file
-large_file
+Largefile
 </features>
 <name>
 Invalid large X- range on a file://
diff --git a/tests/data/test1083 b/tests/data/test1083
index 8728d61832..6757920f49 100644
--- a/tests/data/test1083
+++ b/tests/data/test1083
@@ -27,7 +27,7 @@ Content-Type: text/plain
 # Client-side
 <client>
 <features>
-ipv6
+IPv6
 </features>
 <server>
 http-ipv6
diff --git a/tests/data/test1085 b/tests/data/test1085
index b63b0f033b..55eb00e069 100644
--- a/tests/data/test1085
+++ b/tests/data/test1085
@@ -20,7 +20,7 @@ non-existing host
 <client>
 <features>
 http
-ipv6
+IPv6
 </features>
 <server>
 none
diff --git a/tests/data/test1100 b/tests/data/test1100
index 1148a79f75..268f367f21 100644
--- a/tests/data/test1100
+++ b/tests/data/test1100
@@ -65,7 +65,7 @@ This is the final page !
 NTLM
 SSL
 !SSPI
-debug
+Debug
 </features>
 <server>
 http
diff --git a/tests/data/test116 b/tests/data/test116
index 37aed2ceb2..0ab00aae91 100644
--- a/tests/data/test116
+++ b/tests/data/test116
@@ -23,7 +23,7 @@ ftp
 </server>
 # EPRT is only sent when IPv6 is enabled
 <features>
-ipv6
+IPv6
 </features>
 <name>
 FTP download, failed PORT
diff --git a/tests/data/test1203 b/tests/data/test1203
index b4c70e9cbc..267fc15cb7 100644
--- a/tests/data/test1203
+++ b/tests/data/test1203
@@ -20,7 +20,7 @@ iMenu results		error.host	1
 # Client-side
 <client>
 <features>
-ipv6
+IPv6
 </features>
 <server>
 gopher-ipv6
diff --git a/tests/data/test1210 b/tests/data/test1210
index 4a07147f92..c8a3555cc2 100644
--- a/tests/data/test1210
+++ b/tests/data/test1210
@@ -27,7 +27,7 @@ Content-Type: text/html
 # this relies on the debug feature to allow us to set directory to store the
 # -O output in, using the CURL_TESTDIR variable
 <features>
-debug
+Debug
 </features>
 <server>
 http
diff --git a/tests/data/test1230 b/tests/data/test1230
index 5cdf1643fe..fbcff60393 100644
--- a/tests/data/test1230
+++ b/tests/data/test1230
@@ -42,7 +42,7 @@ mooooooo
 # Client-side
 <client>
 <features>
-ipv6
+IPv6
 proxy
 </features>
 <server>
diff --git a/tests/data/test1268 b/tests/data/test1268
index cf12334570..15b15b56e9 100644
--- a/tests/data/test1268
+++ b/tests/data/test1268
@@ -17,7 +17,7 @@ warning
 none
 </server>
 <features>
-unix-sockets
+UnixSockets
 </features>
 <name>
 filename argument looks like a flag
diff --git a/tests/data/test1294 b/tests/data/test1294
index 396f8a1732..b16ecb1424 100644
--- a/tests/data/test1294
+++ b/tests/data/test1294
@@ -30,7 +30,7 @@ Funny-head: yesyes
 <client>
 # hyper doesn't support the added crazy header
 <features>
-debug
+Debug
 !hyper
 </features>
 <server>
diff --git a/tests/data/test1295 b/tests/data/test1295
index e3692f5d67..5c963cae43 100644
--- a/tests/data/test1295
+++ b/tests/data/test1295
@@ -29,7 +29,7 @@ Funny-head: yesyes
 # Client-side
 <client>
 <features>
-debug
+Debug
 </features>
 <server>
 http
diff --git a/tests/data/test1310 b/tests/data/test1310
index 12fdbb1580..f3c1cfa3da 100644
--- a/tests/data/test1310
+++ b/tests/data/test1310
@@ -56,7 +56,7 @@ Finally, this is the real page!
 <client>
 <features>
 NTLM_WB
-debug
+Debug
 </features>
 <server>
 http
diff --git a/tests/data/test1311 b/tests/data/test1311
index 8e48794a08..cc53489aa6 100644
--- a/tests/data/test1311
+++ b/tests/data/test1311
@@ -28,7 +28,7 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 # this relies on the debug feature to allow us to set directory to store the
 # -J output in
 <features>
-debug
+Debug
 </features>
 <server>
 http
diff --git a/tests/data/test1312 b/tests/data/test1312
index c8170a8afa..6dfee1be54 100644
--- a/tests/data/test1312
+++ b/tests/data/test1312
@@ -28,7 +28,7 @@ Content-Disposition: inline; filename="name%TESTNUMBER;weird"
 # this relies on the debug feature to allow us to set directory to store the
 # -J output in
 <features>
-debug
+Debug
 </features>
 <server>
 http
diff --git a/tests/data/test1313 b/tests/data/test1313
index 8a28597440..ef7b17f455 100644
--- a/tests/data/test1313
+++ b/tests/data/test1313
@@ -28,7 +28,7 @@ Content-Disposition: inline; filename='name%TESTNUMBER
 # this relies on the debug feature to allow us to set directory to store the
 # -J output in
 <features>
-debug
+Debug
 </features>
 <server>
 http
diff --git a/tests/data/test1334 b/tests/data/test1334
index 88a41d8b2b..4c6d15b8c7 100644
--- a/tests/data/test1334
+++ b/tests/data/test1334
@@ -26,7 +26,7 @@ Content-Type: text/html
 # this relies on the debug feature to allow us to set directory to store the
 # -O output in, using the CURL_TESTDIR variable
 <features>
-debug
+Debug
 </features>
 <server>
 http
diff --git a/tests/data/test1335 b/tests/data/test1335
index 4d64ea877f..6ae23eeab2 100644
--- a/tests/data/test1335
+++ b/tests/data/test1335
@@ -26,7 +26,7 @@ Content-Type: text/html
 # this relies on the debug feature to allow us to set directory to store the
 # -O output in, using the CURL_TESTDIR variable
 <features>
-debug
+Debug
 </features>
 <server>
 http
diff --git a/tests/data/test1336 b/tests/data/test1336
index 993d8c6f87..98579bf301 100644
--- a/tests/data/test1336
+++ b/tests/data/test1336
@@ -27,7 +27,7 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 # this relies on the debug feature to allow us to set directory to store the
 # -O output in, using the CURL_TESTDIR variable
 <features>
-debug
+Debug
 </features>
 <server>
 http
diff --git a/tests/data/test1337 b/tests/data/test1337
index 4b954d063a..149fb24711 100644
--- a/tests/data/test1337
+++ b/tests/data/test1337
@@ -27,7 +27,7 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 # this relies on the debug feature to allow us to set directory to store the
 # -O output in, using the CURL_TESTDIR variable
 <features>
-debug
+Debug
 </features>
 <server>
 http
diff --git a/tests/data/test1338 b/tests/data/test1338
index c1c271a95e..9241ca0bda 100644
--- a/tests/data/test1338
+++ b/tests/data/test1338
@@ -27,7 +27,7 @@ Content-Type: text/html
 # this relies on the debug feature to allow us to set directory to store the
 # -O and -J output in, using the CURL_TESTDIR variable
 <features>
-debug
+Debug
 </features>
 <server>
 http
diff --git a/tests/data/test1339 b/tests/data/test1339
index a46934d3a3..aed9307b50 100644
--- a/tests/data/test1339
+++ b/tests/data/test1339
@@ -27,7 +27,7 @@ Content-Type: text/html
 # this relies on the debug feature to allow us to set directory to store the
 # -O and -J output in, using the CURL_TESTDIR variable
 <features>
-debug
+Debug
 </features>
 <server>
 http
diff --git a/tests/data/test1340 b/tests/data/test1340
index ebec701a64..d2ac8f7a32 100644
--- a/tests/data/test1340
+++ b/tests/data/test1340
@@ -28,7 +28,7 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 # this relies on the debug feature to allow us to set directory to store the
 # -O and -J output in, using the CURL_TESTDIR variable
 <features>
-debug
+Debug
 </features>
 <server>
 http
diff --git a/tests/data/test1341 b/tests/data/test1341
index 75d9daae74..8e6feafde8 100644
--- a/tests/data/test1341
+++ b/tests/data/test1341
@@ -28,7 +28,7 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 # this relies on the debug feature to allow us to set directory to store the
 # -O and -J output in, using the CURL_TESTDIR variable
 <features>
-debug
+Debug
 </features>
 <server>
 http
diff --git a/tests/data/test1342 b/tests/data/test1342
index 39dbfab57d..3da479f055 100644
--- a/tests/data/test1342
+++ b/tests/data/test1342
@@ -26,7 +26,7 @@ Content-Type: text/html
 # this relies on the debug feature to allow us to set directory to store the
 # -O output in, using the CURL_TESTDIR variable
 <features>
-debug
+Debug
 </features>
 <server>
 http
diff --git a/tests/data/test1343 b/tests/data/test1343
index 6a9eb7dc81..83a199874e 100644
--- a/tests/data/test1343
+++ b/tests/data/test1343
@@ -26,7 +26,7 @@ Content-Type: text/html
 # this relies on the debug feature to allow us to set directory to store the
 # -O output in, using the CURL_TESTDIR variable
 <features>
-debug
+Debug
 </features>
 <server>
 http
diff --git a/tests/data/test1344 b/tests/data/test1344
index ba4b38976d..b0e9f960a6 100644
--- a/tests/data/test1344
+++ b/tests/data/test1344
@@ -27,7 +27,7 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 # this relies on the debug feature to allow us to set directory to store the
 # -O output in, using the CURL_TESTDIR variable
 <features>
-debug
+Debug
 </features>
 <server>
 http
diff --git a/tests/data/test1345 b/tests/data/test1345
index a9298e4e27..456ec49701 100644
--- a/tests/data/test1345
+++ b/tests/data/test1345
@@ -27,7 +27,7 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 # this relies on the debug feature to allow us to set directory to store the
 # -O output in, using the CURL_TESTDIR variable
 <features>
-debug
+Debug
 </features>
 <server>
 http
diff --git a/tests/data/test1346 b/tests/data/test1346
index bab67cb631..13df571642 100644
--- a/tests/data/test1346
+++ b/tests/data/test1346
@@ -26,7 +26,7 @@ Content-Type: text/html
 # this relies on the debug feature to allow us to set directory to store the
 # -O output in, using the CURL_TESTDIR variable
 <features>
-debug
+Debug
 </features>
 <server>
 http
diff --git a/tests/data/test1347 b/tests/data/test1347
index 868e2611c8..0b7ec82660 100644
--- a/tests/data/test1347
+++ b/tests/data/test1347
@@ -27,7 +27,7 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 # this relies on the debug feature to allow us to set directory to store the
 # -O output in, using the CURL_TESTDIR variable
 <features>
-debug
+Debug
 </features>
 <server>
 http
diff --git a/tests/data/test1348 b/tests/data/test1348
index 3de0b4a93b..73cb473d97 100644
--- a/tests/data/test1348
+++ b/tests/data/test1348
@@ -19,7 +19,7 @@ mooo
 # this relies on the debug feature to allow us to set directory to store the
 # -O output in, using the CURL_TESTDIR variable
 <features>
-debug
+Debug
 </features>
 <server>
 ftp
diff --git a/tests/data/test1349 b/tests/data/test1349
index d2565496cb..4451dc37ed 100644
--- a/tests/data/test1349
+++ b/tests/data/test1349
@@ -19,7 +19,7 @@ mooo
 # this relies on the debug feature to allow us to set directory to store the
 # -O output in, using the CURL_TESTDIR variable
 <features>
-debug
+Debug
 </features>
 <server>
 ftp
diff --git a/tests/data/test1350 b/tests/data/test1350
index b5568f536b..7f4b5a60fb 100644
--- a/tests/data/test1350
+++ b/tests/data/test1350
@@ -19,7 +19,7 @@ mooo
 # this relies on the debug feature to allow us to set directory to store the
 # -O output in, using the CURL_TESTDIR variable
 <features>
-debug
+Debug
 </features>
 <server>
 ftp
diff --git a/tests/data/test1351 b/tests/data/test1351
index 93232d55cd..b876bbd35c 100644
--- a/tests/data/test1351
+++ b/tests/data/test1351
@@ -20,7 +20,7 @@ mooo
 # this relies on the debug feature to allow us to set directory to store the
 # -O output in, using the CURL_TESTDIR variable
 <features>
-debug
+Debug
 </features>
 <server>
 ftp
diff --git a/tests/data/test1352 b/tests/data/test1352
index 0649289b64..53689b6a77 100644
--- a/tests/data/test1352
+++ b/tests/data/test1352
@@ -20,7 +20,7 @@ mooo
 # this relies on the debug feature to allow us to set directory to store the
 # -O output in, using the CURL_TESTDIR variable
 <features>
-debug
+Debug
 </features>
 <server>
 ftp
diff --git a/tests/data/test1353 b/tests/data/test1353
index 8e0ad50e4f..be501618cb 100644
--- a/tests/data/test1353
+++ b/tests/data/test1353
@@ -19,7 +19,7 @@ mooo
 # this relies on the debug feature to allow us to set directory to store the
 # -O output in, using the CURL_TESTDIR variable
 <features>
-debug
+Debug
 </features>
 <server>
 ftp
diff --git a/tests/data/test1354 b/tests/data/test1354
index 506ec90e45..ba5cba780d 100644
--- a/tests/data/test1354
+++ b/tests/data/test1354
@@ -19,7 +19,7 @@ mooo
 # this relies on the debug feature to allow us to set directory to store the
 # -O output in, using the CURL_TESTDIR variable
 <features>
-debug
+Debug
 </features>
 <server>
 ftp
diff --git a/tests/data/test1355 b/tests/data/test1355
index fa19fabc4a..32c9d8baf2 100644
--- a/tests/data/test1355
+++ b/tests/data/test1355
@@ -19,7 +19,7 @@ mooo
 # this relies on the debug feature to allow us to set directory to store the
 # -O output in, using the CURL_TESTDIR variable
 <features>
-debug
+Debug
 </features>
 <server>
 ftp
diff --git a/tests/data/test1356 b/tests/data/test1356
index 0c326f48c7..2a156628da 100644
--- a/tests/data/test1356
+++ b/tests/data/test1356
@@ -27,7 +27,7 @@ MOOOO
 # this relies on the debug feature to allow us to set directory to store the
 # -O output in, using the CURL_TESTDIR variable
 <features>
-debug
+Debug
 </features>
 <server>
 ftp
diff --git a/tests/data/test1357 b/tests/data/test1357
index 9d395a8750..371d8c6191 100644
--- a/tests/data/test1357
+++ b/tests/data/test1357
@@ -27,7 +27,7 @@ MOOOO
 # this relies on the debug feature to allow us to set directory to store the
 # -O output in, using the CURL_TESTDIR variable
 <features>
-debug
+Debug
 </features>
 <server>
 ftp
diff --git a/tests/data/test1358 b/tests/data/test1358
index 973ef7cf4c..bd0b382a8d 100644
--- a/tests/data/test1358
+++ b/tests/data/test1358
@@ -27,7 +27,7 @@ MOOOO
 # this relies on the debug feature to allow us to set directory to store the
 # -O output in, using the CURL_TESTDIR variable
 <features>
-debug
+Debug
 </features>
 <server>
 ftp
diff --git a/tests/data/test1359 b/tests/data/test1359
index fc1eb37289..bc29dd8c8c 100644
--- a/tests/data/test1359
+++ b/tests/data/test1359
@@ -28,7 +28,7 @@ MOOOO
 # this relies on the debug feature to allow us to set directory to store the
 # -O output in, using the CURL_TESTDIR variable
 <features>
-debug
+Debug
 </features>
 <server>
 ftp
diff --git a/tests/data/test1360 b/tests/data/test1360
index 1fb80eecdb..70e8053bae 100644
--- a/tests/data/test1360
+++ b/tests/data/test1360
@@ -28,7 +28,7 @@ MOOOO
 # this relies on the debug feature to allow us to set directory to store the
 # -O output in, using the CURL_TESTDIR variable
 <features>
-debug
+Debug
 </features>
 <server>
 ftp
diff --git a/tests/data/test1361 b/tests/data/test1361
index 6b9af1ad8a..6b9c566a75 100644
--- a/tests/data/test1361
+++ b/tests/data/test1361
@@ -27,7 +27,7 @@ MOOOO
 # this relies on the debug feature to allow us to set directory to store the
 # -O output in, using the CURL_TESTDIR variable
 <features>
-debug
+Debug
 </features>
 <server>
 ftp
diff --git a/tests/data/test1362 b/tests/data/test1362
index 03d99047b7..41f7b4dfa0 100644
--- a/tests/data/test1362
+++ b/tests/data/test1362
@@ -27,7 +27,7 @@ MOOOO
 # this relies on the debug feature to allow us to set directory to store the
 # -O output in, using the CURL_TESTDIR variable
 <features>
-debug
+Debug
 </features>
 <server>
 ftp
diff --git a/tests/data/test1363 b/tests/data/test1363
index 009f68cae2..e5344f045f 100644
--- a/tests/data/test1363
+++ b/tests/data/test1363
@@ -27,7 +27,7 @@ MOOOO
 # this relies on the debug feature to allow us to set directory to store the
 # -O output in, using the CURL_TESTDIR variable
 <features>
-debug
+Debug
 </features>
 <server>
 ftp
diff --git a/tests/data/test1408 b/tests/data/test1408
index 925be875b6..5c7f6493df 100644
--- a/tests/data/test1408
+++ b/tests/data/test1408
@@ -40,7 +40,7 @@ Set-Cookie: time=2
 <client>
 <features>
 cookies
-ipv6
+IPv6
 </features>
 <server>
 http-ipv6
diff --git a/tests/data/test1422 b/tests/data/test1422
index c62c2cbdae..a865b5e532 100644
--- a/tests/data/test1422
+++ b/tests/data/test1422
@@ -27,7 +27,7 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=str//nge
 # this relies on the debug feature to allow us to set directory to store the
 # -O and -J output in, using the CURL_TESTDIR variable
 <features>
-debug
+Debug
 file
 </features>
 <server>
diff --git a/tests/data/test1425 b/tests/data/test1425
index f51483dd0c..4e13dbef89 100644
Binary files a/tests/data/test1425 and b/tests/data/test1425 differ
diff --git a/tests/data/test1426 b/tests/data/test1426
index d53138afaa..792cc4bab6 100644
Binary files a/tests/data/test1426 and b/tests/data/test1426 differ
diff --git a/tests/data/test1435 b/tests/data/test1435
index 0e1e34f559..321ea4c022 100644
--- a/tests/data/test1435
+++ b/tests/data/test1435
@@ -3,7 +3,7 @@
 <keywords>
 HTTP
 HTTP GET
-unix sockets
+UnixSockets
 </keywords>
 </info>
 
@@ -19,7 +19,7 @@ Based on test300
 
 <client>
 <features>
-unix-sockets
+UnixSockets
 </features>
 <server>
 http-unix
diff --git a/tests/data/test1436 b/tests/data/test1436
index 352ef34e0b..f82384e58d 100644
--- a/tests/data/test1436
+++ b/tests/data/test1436
@@ -3,7 +3,7 @@
 <keywords>
 HTTP
 HTTP GET
-unix sockets
+UnixSockets
 </keywords>
 </info>
 
@@ -33,7 +33,7 @@ Third
 
 <client>
 <features>
-unix-sockets
+UnixSockets
 </features>
 <server>
 http-unix
diff --git a/tests/data/test1443 b/tests/data/test1443
index bbfaf7f1b8..aaeb448e1c 100644
--- a/tests/data/test1443
+++ b/tests/data/test1443
@@ -28,7 +28,7 @@ Connection: close
 # This relies on the debug feature to allow us to set a directory
 # in which to store the -O output
 <features>
-debug
+Debug
 </features>
 <server>
 http
diff --git a/tests/data/test1448 b/tests/data/test1448
index 6a9ba5212a..1544d3936f 100644
--- a/tests/data/test1448
+++ b/tests/data/test1448
@@ -39,7 +39,7 @@ OK
 http
 </server>
 <features>
-idn
+IDN
 </features>
 <setenv>
 LC_ALL=en_US.UTF-8
diff --git a/tests/data/test1454 b/tests/data/test1454
index 4908a178db..dff914b113 100644
--- a/tests/data/test1454
+++ b/tests/data/test1454
@@ -14,7 +14,7 @@
 # Client-side
 <client>
 <features>
-!ipv6
+!IPv6
 </features>
 <server>
 http
diff --git a/tests/data/test1456 b/tests/data/test1456
index 3f3a74783d..d846b41ebc 100644
--- a/tests/data/test1456
+++ b/tests/data/test1456
@@ -31,7 +31,7 @@ These data aren't actually sent to the client
 # Client-side
 <client>
 <features>
-ipv6
+IPv6
 </features>
 <server>
 http-ipv6
diff --git a/tests/data/test1460 b/tests/data/test1460
index c3180ff923..4e85082e38 100644
--- a/tests/data/test1460
+++ b/tests/data/test1460
@@ -25,7 +25,7 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 # this relies on the debug feature to allow us to set directory to store the
 # -J output in
 <features>
-debug
+Debug
 </features>
 <server>
 http
diff --git a/tests/data/test1467 b/tests/data/test1467
index bf6ed8f389..e160a16255 100644
--- a/tests/data/test1467
+++ b/tests/data/test1467
@@ -4,7 +4,7 @@
 HTTP
 HTTP GET
 SOCKS5
-unix sockets
+UnixSockets
 </keywords>
 </info>
 
@@ -32,7 +32,7 @@ Funny-head: yesyes
 <client>
 <features>
 proxy
-unix-sockets
+UnixSockets
 </features>
 <server>
 http
diff --git a/tests/data/test1468 b/tests/data/test1468
index dad25df125..49748d1190 100644
--- a/tests/data/test1468
+++ b/tests/data/test1468
@@ -5,7 +5,7 @@ HTTP
 HTTP GET
 SOCKS5
 SOCKS5h
-unix sockets
+UnixSockets
 </keywords>
 </info>
 
@@ -33,7 +33,7 @@ Funny-head: yesyes
 <client>
 <features>
 proxy
-unix-sockets
+UnixSockets
 </features>
 <server>
 http
diff --git a/tests/data/test1470 b/tests/data/test1470
index ad4fb711af..c5d74ae650 100644
--- a/tests/data/test1470
+++ b/tests/data/test1470
@@ -6,7 +6,7 @@ HTTP
 HTTP GET
 SOCKS5
 SOCKS5h
-unix sockets
+UnixSockets
 </keywords>
 </info>
 
@@ -34,7 +34,7 @@ Funny-head: yesyes
 <client>
 <features>
 proxy
-unix-sockets
+UnixSockets
 </features>
 <server>
 https
diff --git a/tests/data/test1487 b/tests/data/test1487
index f57589abfb..33a92b6144 100644
--- a/tests/data/test1487
+++ b/tests/data/test1487
@@ -28,7 +28,7 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 # this relies on the debug feature to allow us to set directory to store the
 # -J output in
 <features>
-debug
+Debug
 </features>
 <server>
 http
diff --git a/tests/data/test159 b/tests/data/test159
index fabcb4f986..887c4795fa 100644
--- a/tests/data/test159
+++ b/tests/data/test159
@@ -45,7 +45,7 @@ This is not the real page either!
 NTLM
 SSL
 !SSPI
-debug
+Debug
 </features>
 <server>
 http
diff --git a/tests/data/test165 b/tests/data/test165
index d0353946a2..e9237d89cd 100644
--- a/tests/data/test165
+++ b/tests/data/test165
@@ -28,7 +28,7 @@ Funny-head: yesyes
 http
 </server>
 <features>
-idn
+IDN
 proxy
 </features>
 <setenv>
diff --git a/tests/data/test1662 b/tests/data/test1662
index b2fbcce8be..7e72add944 100644
--- a/tests/data/test1662
+++ b/tests/data/test1662
@@ -38,7 +38,7 @@ Funny-head: nono
 <client>
 <features>
 Mime
-debug
+Debug
 </features>
 <server>
 http
diff --git a/tests/data/test1908 b/tests/data/test1908
index 4ec55ed234..e4ec639cd8 100644
--- a/tests/data/test1908
+++ b/tests/data/test1908
@@ -37,7 +37,7 @@ http
 # require debug so that alt-svc can work over plain old HTTP
 <features>
 alt-svc
-debug
+Debug
 </features>
 <name>
 alt-svc cache save after resetting the handle
diff --git a/tests/data/test1933 b/tests/data/test1933
index 3f3e8ac2cd..456c8cfa05 100644
--- a/tests/data/test1933
+++ b/tests/data/test1933
@@ -35,7 +35,7 @@ http
 # this relies on the debug feature which allow to set the time
 <features>
 SSL
-debug
+Debug
 crypto
 </features>
 
diff --git a/tests/data/test1934 b/tests/data/test1934
index a131df49e7..f0235a7d3c 100644
--- a/tests/data/test1934
+++ b/tests/data/test1934
@@ -35,7 +35,7 @@ http
 # this relies on the debug feature which allow to set the time
 <features>
 SSL
-debug
+Debug
 crypto
 </features>
 
diff --git a/tests/data/test1935 b/tests/data/test1935
index d39a864715..b36e1fade8 100644
--- a/tests/data/test1935
+++ b/tests/data/test1935
@@ -35,7 +35,7 @@ http
 # this relies on the debug feature which allow to set the time
 <features>
 SSL
-debug
+Debug
 crypto
 </features>
 
diff --git a/tests/data/test1936 b/tests/data/test1936
index a0d38403b7..e937235d41 100644
--- a/tests/data/test1936
+++ b/tests/data/test1936
@@ -35,7 +35,7 @@ http
 # this relies on the debug feature which allow to set the time
 <features>
 SSL
-debug
+Debug
 crypto
 </features>
 
diff --git a/tests/data/test1937 b/tests/data/test1937
index ca1214b835..fc2d48c581 100644
--- a/tests/data/test1937
+++ b/tests/data/test1937
@@ -36,7 +36,7 @@ http
 # this relies on the debug feature which allow to set the time
 <features>
 SSL
-debug
+Debug
 crypto
 </features>
 
diff --git a/tests/data/test1938 b/tests/data/test1938
index 565a54ffe6..ed24261b26 100644
Binary files a/tests/data/test1938 and b/tests/data/test1938 differ
diff --git a/tests/data/test1955 b/tests/data/test1955
index 27bb466c75..61b5100bd5 100644
--- a/tests/data/test1955
+++ b/tests/data/test1955
@@ -35,7 +35,7 @@ http
 # this relies on the debug feature which allow to set the time
 <features>
 SSL
-debug
+Debug
 crypto
 </features>
 <setenv>
diff --git a/tests/data/test1956 b/tests/data/test1956
index 76aaa93abe..fbde6d7181 100644
--- a/tests/data/test1956
+++ b/tests/data/test1956
@@ -35,7 +35,7 @@ http
 # this relies on the debug feature which allow to set the time
 <features>
 SSL
-debug
+Debug
 crypto
 </features>
 <setenv>
diff --git a/tests/data/test1957 b/tests/data/test1957
index add27db0ff..39f11ac8b7 100644
--- a/tests/data/test1957
+++ b/tests/data/test1957
@@ -35,7 +35,7 @@ http
 # this relies on the debug feature which allow to set the time
 <features>
 SSL
-debug
+Debug
 crypto
 </features>
 <setenv>
diff --git a/tests/data/test1958 b/tests/data/test1958
index c54b17962e..99989097ec 100644
--- a/tests/data/test1958
+++ b/tests/data/test1958
@@ -35,7 +35,7 @@ http
 # this relies on the debug feature which allow to set the time
 <features>
 SSL
-debug
+Debug
 crypto
 </features>
 <setenv>
diff --git a/tests/data/test1959 b/tests/data/test1959
index 2be813b080..e3d080509c 100644
--- a/tests/data/test1959
+++ b/tests/data/test1959
@@ -35,7 +35,7 @@ http
 # this relies on the debug feature which allow to set the time
 <features>
 SSL
-debug
+Debug
 crypto
 </features>
 <setenv>
diff --git a/tests/data/test1970 b/tests/data/test1970
index 1fbe60b459..9ed1a1e64c 100644
--- a/tests/data/test1970
+++ b/tests/data/test1970
@@ -35,7 +35,7 @@ http
 # this relies on the debug feature which allow to set the time
 <features>
 SSL
-debug
+Debug
 crypto
 </features>
 <setenv>
diff --git a/tests/data/test1971 b/tests/data/test1971
index c311d176f8..a0b20c4d7f 100644
--- a/tests/data/test1971
+++ b/tests/data/test1971
@@ -28,7 +28,7 @@ http
 # this relies on the debug feature which allow to set the time
 <features>
 SSL
-debug
+Debug
 crypto
 </features>
 <setenv>
diff --git a/tests/data/test1972 b/tests/data/test1972
index 39e574747b..901aae29e8 100644
--- a/tests/data/test1972
+++ b/tests/data/test1972
@@ -35,7 +35,7 @@ http
 # this relies on the debug feature which allow to set the time
 <features>
 SSL
-debug
+Debug
 crypto
 </features>
 <setenv>
diff --git a/tests/data/test1973 b/tests/data/test1973
index 559fd5fc7e..af64b90e08 100644
--- a/tests/data/test1973
+++ b/tests/data/test1973
@@ -35,7 +35,7 @@ http
 # this relies on the debug feature which allow to set the time
 <features>
 SSL
-debug
+Debug
 crypto
 </features>
 <setenv>
diff --git a/tests/data/test1974 b/tests/data/test1974
index 9b5bb84756..ee88bec74c 100644
--- a/tests/data/test1974
+++ b/tests/data/test1974
@@ -35,7 +35,7 @@ http
 # this relies on the debug feature which allow to set the time
 <features>
 SSL
-debug
+Debug
 crypto
 </features>
 <setenv>
diff --git a/tests/data/test1975 b/tests/data/test1975
index 09256de040..277e35eddc 100644
--- a/tests/data/test1975
+++ b/tests/data/test1975
@@ -28,7 +28,7 @@ http
 # this relies on the debug feature which allow to set the time
 <features>
 SSL
-debug
+Debug
 crypto
 </features>
 <setenv>
diff --git a/tests/data/test2046 b/tests/data/test2046
index fc5ddca84e..3aefd25c96 100644
--- a/tests/data/test2046
+++ b/tests/data/test2046
@@ -39,7 +39,7 @@ OK
 http
 </server>
 <features>
-idn
+IDN
 </features>
 <setenv>
 LC_ALL=en_US.UTF-8
diff --git a/tests/data/test2047 b/tests/data/test2047
index 76bed3cc9d..82e9a14aaa 100644
--- a/tests/data/test2047
+++ b/tests/data/test2047
@@ -39,7 +39,7 @@ OK
 http
 </server>
 <features>
-idn
+IDN
 proxy
 </features>
 <setenv>
diff --git a/tests/data/test2056 b/tests/data/test2056
index 008f137dfb..80e592025d 100644
--- a/tests/data/test2056
+++ b/tests/data/test2056
@@ -40,7 +40,7 @@ HTTP Negotiate authentication (stub krb5)
 <features>
 GSS-API
 ld_preload
-!debug
+!Debug
 </features>
 <setenv>
 LD_PRELOAD=%PWD/libtest/.libs/libstubgss.so
diff --git a/tests/data/test2057 b/tests/data/test2057
index dfc7798f64..1e7568c6e1 100644
--- a/tests/data/test2057
+++ b/tests/data/test2057
@@ -56,7 +56,7 @@ HTTP Negotiate authentication (stub ntlm)
 <features>
 GSS-API
 ld_preload
-!debug
+!Debug
 </features>
 <setenv>
 LD_PRELOAD=%PWD/libtest/.libs/libstubgss.so
diff --git a/tests/data/test2100 b/tests/data/test2100
index 120a6af7af..3f5f5d9232 100644
--- a/tests/data/test2100
+++ b/tests/data/test2100
@@ -47,9 +47,9 @@ http
 # requires IPv6 so that we can assume and compare both DoH requests
 
 <features>
-debug
+Debug
 DoH
-ipv6
+IPv6
 </features>
 <name>
 HTTP GET using DoH
diff --git a/tests/data/test212 b/tests/data/test212
index db0201e157..045ad3769a 100644
--- a/tests/data/test212
+++ b/tests/data/test212
@@ -23,7 +23,7 @@ ftp
 </server>
 # EPRT is only sent when IPv6 is enabled
 <features>
-ipv6
+IPv6
 </features>
 <name>
 Get two FTP files with no remote EPRT support
diff --git a/tests/data/test2300 b/tests/data/test2300
index fa620a1b1a..e8a145929f 100644
--- a/tests/data/test2300
+++ b/tests/data/test2300
@@ -27,7 +27,7 @@ upgrade
 <client>
 # for the forced CURL_ENTROPY
 <features>
-debug
+Debug
 ws
 </features>
 <server>
diff --git a/tests/data/test2301 b/tests/data/test2301
index 1f8ed662b1..cc728d89a8 100644
--- a/tests/data/test2301
+++ b/tests/data/test2301
@@ -29,7 +29,7 @@ upgrade
 <client>
 # require debug for the forced CURL_ENTROPY
 <features>
-debug
+Debug
 ws
 </features>
 <server>
diff --git a/tests/data/test2302 b/tests/data/test2302
index 013c324e85..9ade6a1e52 100644
--- a/tests/data/test2302
+++ b/tests/data/test2302
@@ -29,7 +29,7 @@ upgrade
 <client>
 # require debug for the forced CURL_ENTROPY
 <features>
-debug
+Debug
 ws
 </features>
 <server>
diff --git a/tests/data/test2303 b/tests/data/test2303
index dbd1115c80..79cb4c2ad0 100644
--- a/tests/data/test2303
+++ b/tests/data/test2303
@@ -22,7 +22,7 @@ hello
 <client>
 # require debug for the forced CURL_ENTROPY
 <features>
-debug
+Debug
 ws
 </features>
 <server>
diff --git a/tests/data/test2304 b/tests/data/test2304
index 895518fb47..8ade3e7718 100644
--- a/tests/data/test2304
+++ b/tests/data/test2304
@@ -29,7 +29,7 @@ upgrade
 <client>
 # require debug for the forced CURL_ENTROPY
 <features>
-debug
+Debug
 ws
 </features>
 <server>
diff --git a/tests/data/test2305 b/tests/data/test2305
index b7f2188002..773b5df3a5 100644
--- a/tests/data/test2305
+++ b/tests/data/test2305
@@ -31,7 +31,7 @@ upgrade
 <client>
 # require debug for the forced CURL_ENTROPY
 <features>
-debug
+Debug
 ws
 </features>
 <server>
diff --git a/tests/data/test2307 b/tests/data/test2307
index ce260ac1c2..7c9f625b0b 100644
--- a/tests/data/test2307
+++ b/tests/data/test2307
@@ -29,7 +29,7 @@ upgrade
 <client>
 # require debug for the forced CURL_ENTROPY
 <features>
-debug
+Debug
 ws
 !hyper
 </features>
diff --git a/tests/data/test240 b/tests/data/test240
index d033ae35ce..75bd4bb3de 100644
--- a/tests/data/test240
+++ b/tests/data/test240
@@ -29,7 +29,7 @@ Funny-head: yesyes
 # Client-side
 <client>
 <features>
-ipv6
+IPv6
 </features>
 <server>
 http-ipv6
diff --git a/tests/data/test2400 b/tests/data/test2400
index e920f4f164..12395211ec 100644
--- a/tests/data/test2400
+++ b/tests/data/test2400
@@ -27,7 +27,7 @@ Funny-head: yesyes
 # Client-side
 <client>
 <features>
-debug
+Debug
 h2c
 SSL
 </features>
diff --git a/tests/data/test2401 b/tests/data/test2401
index ef5fbb1818..1db7dbedd9 100644
--- a/tests/data/test2401
+++ b/tests/data/test2401
@@ -25,7 +25,7 @@ Funny-head: yesyes
 # Client-side
 <client>
 <features>
-debug
+Debug
 h2c
 SSL
 </features>
diff --git a/tests/data/test2406 b/tests/data/test2406
index 7055feed38..7a1620f2b8 100644
--- a/tests/data/test2406
+++ b/tests/data/test2406
@@ -27,7 +27,7 @@ Funny-head: yesyes
 # Client-side
 <client>
 <features>
-debug
+Debug
 h2c
 SSL
 </features>
diff --git a/tests/data/test241 b/tests/data/test241
index 92a431420d..38dea3fd56 100644
--- a/tests/data/test241
+++ b/tests/data/test241
@@ -24,7 +24,7 @@ hello
 # Client-side
 <client>
 <features>
-ipv6
+IPv6
 </features>
 <server>
 http-ipv6
diff --git a/tests/data/test242 b/tests/data/test242
index a498ab29b7..91aeb381d7 100644
--- a/tests/data/test242
+++ b/tests/data/test242
@@ -24,7 +24,7 @@ hello
 # Client-side
 <client>
 <features>
-ipv6
+IPv6
 </features>
 <server>
 http-ipv6
diff --git a/tests/data/test2501 b/tests/data/test2501
index 4db52ecf6c..8b49127ffd 100644
--- a/tests/data/test2501
+++ b/tests/data/test2501
@@ -25,7 +25,7 @@ Funny-head: yesyes
 # Client-side
 <client>
 <features>
-debug
+Debug
 http
 http/3
 </features>
diff --git a/tests/data/test252 b/tests/data/test252
index 220cda1899..e803a85b23 100644
--- a/tests/data/test252
+++ b/tests/data/test252
@@ -31,7 +31,7 @@ dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
 # Client-side
 <client>
 <features>
-ipv6
+IPv6
 </features>
 <server>
 ftp-ipv6
diff --git a/tests/data/test253 b/tests/data/test253
index 2c1008d7e5..75b7b85671 100644
--- a/tests/data/test253
+++ b/tests/data/test253
@@ -31,7 +31,7 @@ dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
 # Client-side
 <client>
 <features>
-ipv6
+IPv6
 </features>
 <server>
 ftp-ipv6
diff --git a/tests/data/test254 b/tests/data/test254
index 30978758f7..d9de0b139d 100644
--- a/tests/data/test254
+++ b/tests/data/test254
@@ -32,7 +32,7 @@ dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
 # Client-side
 <client>
 <features>
-ipv6
+IPv6
 </features>
 <server>
 ftp-ipv6
diff --git a/tests/data/test255 b/tests/data/test255
index 37b9da2acf..ec42d117b0 100644
--- a/tests/data/test255
+++ b/tests/data/test255
@@ -32,7 +32,7 @@ dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
 # Client-side
 <client>
 <features>
-ipv6
+IPv6
 </features>
 <server>
 ftp-ipv6
diff --git a/tests/data/test2600 b/tests/data/test2600
index 10109d1e19..0b4ee8b2f5 100644
--- a/tests/data/test2600
+++ b/tests/data/test2600
@@ -15,7 +15,7 @@ none
 </server>
 <features>
 unittest
-debug
+Debug
 http
 !win32
 </features>
diff --git a/tests/data/test263 b/tests/data/test263
index 93e98a1970..6487025297 100644
--- a/tests/data/test263
+++ b/tests/data/test263
@@ -24,7 +24,7 @@ hello
 # Client-side
 <client>
 <features>
-ipv6
+IPv6
 proxy
 </features>
 <server>
diff --git a/tests/data/test3202 b/tests/data/test3202
index 25ec6073b4..48a74e132c 100644
--- a/tests/data/test3202
+++ b/tests/data/test3202
@@ -31,7 +31,7 @@ These data aren't actually sent to the client
 # Client-side
 <client>
 <features>
-ipv6
+IPv6
 </features>
 <server>
 http-ipv6
diff --git a/tests/data/test356 b/tests/data/test356
index 3fb001c58f..1d441d7e73 100644
--- a/tests/data/test356
+++ b/tests/data/test356
@@ -29,7 +29,7 @@ Alt-Svc: h1="nowhere.foo:70000"
 # Client-side
 <client>
 <features>
-debug
+Debug
 alt-svc
 </features>
 <server>
diff --git a/tests/data/test358 b/tests/data/test358
index 5df596de0c..9db8b66f13 100644
--- a/tests/data/test358
+++ b/tests/data/test358
@@ -29,7 +29,7 @@ Alt-Svc: h2=":%HTTP2PORT", ma=315360000; persist=0
 <client>
 <features>
 alt-svc
-debug
+Debug
 h2c
 </features>
 <server>
diff --git a/tests/data/test359 b/tests/data/test359
index 117b4defe3..2b7e52ce8e 100644
--- a/tests/data/test359
+++ b/tests/data/test359
@@ -29,7 +29,7 @@ Alt-Svc: h2=":%HTTP2PORT", ma=315360000; persist=0
 <client>
 <features>
 alt-svc
-debug
+Debug
 h2c
 </features>
 <server>
diff --git a/tests/data/test363 b/tests/data/test363
index 7cc7dad991..d2d9661f70 100644
--- a/tests/data/test363
+++ b/tests/data/test363
@@ -43,7 +43,7 @@ contents
 # Client-side
 <client>
 <features>
-debug
+Debug
 proxy
 </features>
 <server>
diff --git a/tests/data/test412 b/tests/data/test412
index de607baa22..5923054fc7 100644
--- a/tests/data/test412
+++ b/tests/data/test412
@@ -28,7 +28,7 @@ Funny-head: yesyes
 <client>
 <features>
 alt-svc
-debug
+Debug
 </features>
 <server>
 http
diff --git a/tests/data/test413 b/tests/data/test413
index 8639306e0c..e0aec1eaad 100644
--- a/tests/data/test413
+++ b/tests/data/test413
@@ -28,7 +28,7 @@ Funny-head: yesyes
 <client>
 <features>
 alt-svc
-debug
+Debug
 </features>
 <server>
 http
diff --git a/tests/data/test437 b/tests/data/test437
index f12052d241..4098b4c645 100644
--- a/tests/data/test437
+++ b/tests/data/test437
@@ -26,7 +26,7 @@ Alt-Svc: h1="[ffff::1]:8181"
 # Client-side
 <client>
 <features>
-debug
+Debug
 alt-svc
 </features>
 <server>
diff --git a/tests/data/test438 b/tests/data/test438
index 4dd3b82c80..aad056aeec 100644
--- a/tests/data/test438
+++ b/tests/data/test438
@@ -29,8 +29,8 @@ Alt-Svc: h1="%HOST6IP:%HTTP6PORT", ma=315360000; persist=0
 <client>
 <features>
 alt-svc
-debug
-ipv6
+Debug
+IPv6
 </features>
 <server>
 http
diff --git a/tests/data/test439 b/tests/data/test439
index c997a397a2..43b56ea784 100644
--- a/tests/data/test439
+++ b/tests/data/test439
@@ -32,7 +32,7 @@ Funny-head: yesyes
 http
 </server>
 <features>
-debug
+Debug
 </features>
 <name>
 aws-sigv4 with query
diff --git a/tests/data/test446 b/tests/data/test446
index b8e719dd77..7f98912560 100644
--- a/tests/data/test446
+++ b/tests/data/test446
@@ -41,7 +41,7 @@ http-proxy
 HSTS
 proxy
 https
-debug
+Debug
 </features>
 <setenv>
 CURL_HSTS_HTTP=yes
diff --git a/tests/data/test447 b/tests/data/test447
index f514a130e5..2783b750b6 100644
--- a/tests/data/test447
+++ b/tests/data/test447
@@ -30,7 +30,7 @@ Funny-head: yesyes
 # Client-side
 <client>
 <features>
-debug
+Debug
 </features>
 <server>
 http
diff --git a/tests/data/test472 b/tests/data/test472
index 721b9e8c86..88cc78f937 100644
--- a/tests/data/test472
+++ b/tests/data/test472
@@ -32,7 +32,7 @@ Funny-head: yesyes
 http
 </server>
 <features>
-debug
+Debug
 Unicode
 </features>
 <name>
diff --git a/tests/data/test558 b/tests/data/test558
index 06b772816e..47605de0b0 100644
--- a/tests/data/test558
+++ b/tests/data/test558
@@ -17,7 +17,7 @@ none
 </server>
 <features>
 TrackMemory
-ipv6
+IPv6
 </features>
 # tool is what to use instead of 'curl'
 <tool>
diff --git a/tests/data/test644 b/tests/data/test644
index fc670756cb..2db24f9071 100644
--- a/tests/data/test644
+++ b/tests/data/test644
@@ -47,7 +47,7 @@ Funny-head: yesyes
 http
 </server>
 <features>
-debug
+Debug
 xattr
 </features>
 # simulate the xattr operations
diff --git a/tests/data/test687 b/tests/data/test687
index 500a1dfb24..6384a5e499 100644
--- a/tests/data/test687
+++ b/tests/data/test687
@@ -29,7 +29,7 @@ Content-Type: fake/data
 http
 </server>
 <features>
-debug
+Debug
 xattr
 </features>
 # simulate the xattr operations
diff --git a/tests/data/test688 b/tests/data/test688
index c545c47044..4ade6edbc1 100644
--- a/tests/data/test688
+++ b/tests/data/test688
@@ -29,7 +29,7 @@ Content-Type: fake/data
 http
 </server>
 <features>
-debug
+Debug
 xattr
 </features>
 # simulate the xattr operations
diff --git a/tests/data/test719 b/tests/data/test719
index 63cb888863..454460983d 100644
--- a/tests/data/test719
+++ b/tests/data/test719
@@ -31,7 +31,7 @@ Funny-head: yesyes
 # Client-side
 <client>
 <features>
-ipv6
+IPv6
 proxy
 </features>
 <server>
diff --git a/tests/data/test823 b/tests/data/test823
index 18ed5fa674..a3736a6fd8 100644
--- a/tests/data/test823
+++ b/tests/data/test823
@@ -36,7 +36,7 @@ imap
 </server>
 <features>
 !SSPI
-debug
+Debug
 crypto
 </features>
 <name>
diff --git a/tests/data/test832 b/tests/data/test832
index 6001c1d450..bbbc0ac737 100644
--- a/tests/data/test832
+++ b/tests/data/test832
@@ -28,7 +28,7 @@ imap
 </server>
 <features>
 !SSPI
-debug
+Debug
 crypto
 </features>
 <name>
diff --git a/tests/data/test835 b/tests/data/test835
index ee6ed31d14..17c8675eb2 100644
--- a/tests/data/test835
+++ b/tests/data/test835
@@ -39,7 +39,7 @@ imap
 </server>
 <features>
 !SSPI
-debug
+Debug
 crypto
 </features>
 <name>
diff --git a/tests/data/test869 b/tests/data/test869
index 59900df087..56873e0386 100644
--- a/tests/data/test869
+++ b/tests/data/test869
@@ -38,7 +38,7 @@ pop3
 </server>
 <features>
 !SSPI
-debug
+Debug
 crypto
 </features>
 <name>
diff --git a/tests/data/test878 b/tests/data/test878
index 58c2e3007d..657dc71c72 100644
--- a/tests/data/test878
+++ b/tests/data/test878
@@ -29,7 +29,7 @@ pop3
 </server>
 <features>
 !SSPI
-debug
+Debug
 crypto
 </features>
 <name>
diff --git a/tests/data/test881 b/tests/data/test881
index 7cbdf64ba8..20e3527885 100644
--- a/tests/data/test881
+++ b/tests/data/test881
@@ -41,7 +41,7 @@ pop3
 </server>
 <features>
 !SSPI
-debug
+Debug
 crypto
 </features>
 <name>
diff --git a/tests/data/test907 b/tests/data/test907
index 12d6e82890..8c24b68c40 100644
--- a/tests/data/test907
+++ b/tests/data/test907
@@ -28,7 +28,7 @@ smtp
 </server>
 <features>
 !SSPI
-debug
+Debug
 crypto
 </features>
 <name>
diff --git a/tests/data/test934 b/tests/data/test934
index 8fd444e910..5ebf67fec2 100644
--- a/tests/data/test934
+++ b/tests/data/test934
@@ -28,7 +28,7 @@ smtp
 </server>
 <features>
 !SSPI
-debug
+Debug
 crypto
 </features>
 <name>
diff --git a/tests/data/test937 b/tests/data/test937
index 6c361b7387..bb761f8543 100644
--- a/tests/data/test937
+++ b/tests/data/test937
@@ -31,7 +31,7 @@ smtp
 </server>
 <features>
 !SSPI
-debug
+Debug
 crypto
 </features>
 <name>
diff --git a/tests/data/test959 b/tests/data/test959
index 143708df8c..421d6ba987 100644
--- a/tests/data/test959
+++ b/tests/data/test959
@@ -20,7 +20,7 @@ REPLY MAIL 501 not fine enough
 smtp
 </server>
 <features>
-!idn
+!IDN
 !win32
 </features>
 <setenv>
diff --git a/tests/data/test960 b/tests/data/test960
index bcb9bf44c5..9f33fdc797 100644
--- a/tests/data/test960
+++ b/tests/data/test960
@@ -17,7 +17,7 @@ SMTP
 smtp
 </server>
 <features>
-!idn
+!IDN
 !win32
 </features>
 <setenv>
diff --git a/tests/data/test961 b/tests/data/test961
index 750943ab47..c416b97614 100644
--- a/tests/data/test961
+++ b/tests/data/test961
@@ -18,7 +18,7 @@ VRFY
 smtp
 </server>
 <features>
-!idn
+!IDN
 !win32
 </features>
 <setenv>
diff --git a/tests/data/test962 b/tests/data/test962
index 503761b46f..09bfb51000 100644
--- a/tests/data/test962
+++ b/tests/data/test962
@@ -18,7 +18,7 @@ IDN
 smtp
 </server>
 <features>
-idn
+IDN
 !win32
 </features>
 <setenv>
diff --git a/tests/data/test963 b/tests/data/test963
index 1b977f0070..02fc0b851b 100644
--- a/tests/data/test963
+++ b/tests/data/test963
@@ -18,7 +18,7 @@ IDN
 smtp
 </server>
 <features>
-idn
+IDN
 !win32
 </features>
 <setenv>
diff --git a/tests/data/test964 b/tests/data/test964
index e2d69881ae..e03dc333e4 100644
--- a/tests/data/test964
+++ b/tests/data/test964
@@ -19,7 +19,7 @@ IDN
 smtp
 </server>
 <features>
-idn
+IDN
 !win32
 </features>
 <setenv>
diff --git a/tests/data/test965 b/tests/data/test965
index 71adef8f67..f8adbdefe9 100644
--- a/tests/data/test965
+++ b/tests/data/test965
@@ -21,7 +21,7 @@ CAPA SMTPUTF8
 smtp
 </server>
 <features>
-idn
+IDN
 !win32
 </features>
 <setenv>
diff --git a/tests/data/test966 b/tests/data/test966
index acc248a573..e43f860ec4 100644
--- a/tests/data/test966
+++ b/tests/data/test966
@@ -21,7 +21,7 @@ CAPA SMTPUTF8
 smtp
 </server>
 <features>
-idn
+IDN
 !win32
 </features>
 <setenv>
diff --git a/tests/data/test967 b/tests/data/test967
index 95fb153bdc..898fbb106b 100644
--- a/tests/data/test967
+++ b/tests/data/test967
@@ -25,7 +25,7 @@ CAPA SMTPUTF8
 smtp
 </server>
 <features>
-idn
+IDN
 !win32
 </features>
 <setenv>
diff --git a/tests/data/test968 b/tests/data/test968
index 099f6fd290..c27a3675f8 100644
--- a/tests/data/test968
+++ b/tests/data/test968
@@ -22,7 +22,7 @@ CAPA SMTPUTF8
 smtp
 </server>
 <features>
-idn
+IDN
 !win32
 </features>
 <setenv>
diff --git a/tests/data/test969 b/tests/data/test969
index bb4cc316ea..c7bffb9b8f 100644
--- a/tests/data/test969
+++ b/tests/data/test969
@@ -28,7 +28,7 @@ CAPA SMTPUTF8
 smtp
 </server>
 <features>
-idn
+IDN
 !win32
 </features>
 <name>
diff --git a/tests/data/test970 b/tests/data/test970
index 4b77ad6b7f..bf1235da58 100644
--- a/tests/data/test970
+++ b/tests/data/test970
@@ -32,7 +32,7 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor i
 http
 </server>
 <features>
-debug
+Debug
 proxy
 </features>
 <setenv>
diff --git a/tests/data/test972 b/tests/data/test972
index 3ac080dc53..c6def29867 100644
--- a/tests/data/test972
+++ b/tests/data/test972
@@ -33,7 +33,7 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor i
 http
 </server>
 <features>
-debug
+Debug
 proxy
 </features>
 <setenv>
diff --git a/tests/data/test99 b/tests/data/test99
index db11a059b1..b0e769a7e3 100644
--- a/tests/data/test99
+++ b/tests/data/test99
@@ -35,7 +35,7 @@ Funny-head: yesyes
 # Client-side
 <client>
 <features>
-large_file
+Largefile
 </features>
 <server>
 http
diff --git a/tests/runner.pm b/tests/runner.pm
index 5bc3b0cd9e..22ca0c7fdc 100644
--- a/tests/runner.pm
+++ b/tests/runner.pm
@@ -662,7 +662,7 @@ sub singletest_setenv {
                         logmsg "Skipping LD_PRELOAD due to lack of OS support\n" if($verbose);
                         next;
                     }
-                    if($feature{"debug"} || !$has_shared) {
+                    if($feature{"Debug"} || !$has_shared) {
                         logmsg "Skipping LD_PRELOAD due to no release shared build\n" if($verbose);
                         next;
                     }
diff --git a/tests/runtests.pl b/tests/runtests.pl
index f814479820..dd0b9bc291 100755
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -618,19 +618,19 @@ sub checksystemfeatures {
             # built with memory tracking support (--enable-curldebug); may be disabled later
             $feature{"TrackMemory"} = $feat =~ /TrackMemory/i;
             # curl was built with --enable-debug
-            $feature{"debug"} = $feat =~ /debug/i;
+            $feature{"Debug"} = $feat =~ /Debug/i;
             # ssl enabled
             $feature{"SSL"} = $feat =~ /SSL/i;
             # multiple ssl backends available.
             $feature{"MultiSSL"} = $feat =~ /MultiSSL/i;
             # large file support
-            $feature{"large_file"} = $feat =~ /Largefile/i;
+            $feature{"Largefile"} = $feat =~ /Largefile/i;
             # IDN support
-            $feature{"idn"} = $feat =~ /IDN/i;
+            $feature{"IDN"} = $feat =~ /IDN/i;
             # IPv6 support
-            $feature{"ipv6"} = $feat =~ /IPv6/i;
+            $feature{"IPv6"} = $feat =~ /IPv6/i;
             # Unix sockets support
-            $feature{"unix-sockets"} = $feat =~ /UnixSockets/i;
+            $feature{"UnixSockets"} = $feat =~ /UnixSockets/i;
             # libz compression
             $feature{"libz"} = $feat =~ /libz/i;
             # Brotli compression
@@ -675,8 +675,8 @@ sub checksystemfeatures {
                 push @protocols, 'http/3';
             }
             # https proxy support
-            $feature{"https-proxy"} = $feat =~ /HTTPS-proxy/;
-            if($feature{"https-proxy"}) {
+            $feature{"HTTPS-proxy"} = $feat =~ /HTTPS-proxy/;
+            if($feature{"HTTPS-proxy"}) {
                 # 'https-proxy' is used as "server" so consider it a protocol
                 push @protocols, 'https-proxy';
             }
@@ -742,9 +742,9 @@ sub checksystemfeatures {
     }
 
     # allow this feature only if debug mode is disabled
-    $feature{"ld_preload"} = $feature{"ld_preload"} && !$feature{"debug"};
+    $feature{"ld_preload"} = $feature{"ld_preload"} && !$feature{"Debug"};
 
-    if($feature{"ipv6"}) {
+    if($feature{"IPv6"}) {
         # client has IPv6 support
 
         # check if the HTTP server has it!
@@ -764,7 +764,7 @@ sub checksystemfeatures {
         }
     }
 
-    if($feature{"unix-sockets"}) {
+    if($feature{"UnixSockets"}) {
         # client has Unix sockets support, check whether the HTTP server has it
         my $cmd = "server/sws".exe_ext('SRV')." --version";
         my @sws = `$cmd`;
@@ -782,7 +782,7 @@ sub checksystemfeatures {
     }
     close($manh);
 
-    $feature{"unittest"} = $feature{"debug"};
+    $feature{"unittest"} = $feature{"Debug"};
     $feature{"nghttpx"} = !!$ENV{'NGHTTPX'};
     $feature{"nghttpx-h3"} = !!$nghttpx_h3;