diff --git a/tests/data/test1425 b/tests/data/test1425
index 76e96a4e2f..63032181b2 100644
--- a/tests/data/test1425
+++ b/tests/data/test1425
@@ -31,7 +31,7 @@ Funny-head: yesyes
 http
 </server>
 
-# this test needs to be a debug build in order to fake it being a TTY output
+# this test needs to be a Debug build in order to fake it being a TTY output
 <features>
 Debug
 </features>
diff --git a/tests/data/test1426 b/tests/data/test1426
index 5fec3360ba..737c7514f1 100644
--- a/tests/data/test1426
+++ b/tests/data/test1426
@@ -31,7 +31,7 @@ Funny-head: yesyes
 http
 </server>
 
-# this test needs to be a debug build in order to fake it being a TTY output
+# this test needs to be a Debug build in order to fake it being a TTY output
 <features>
 Debug
 </features>
diff --git a/tests/data/test1908 b/tests/data/test1908
index e4ec639cd8..fe0b5d626a 100644
--- a/tests/data/test1908
+++ b/tests/data/test1908
@@ -34,7 +34,7 @@ alt-svc: h2="second.example:443"; ma=315360000;
 http
 </server>
 
-# require debug so that alt-svc can work over plain old HTTP
+# require Debug so that alt-svc can work over plain old HTTP
 <features>
 alt-svc
 Debug
@@ -43,7 +43,7 @@ Debug
 alt-svc cache save after resetting the handle
 </name>
 <setenv>
-# make debug-curl accept Alt-Svc over plain HTTP
+# make Debug-curl accept Alt-Svc over plain HTTP
 CURL_ALTSVC_HTTP="yeah"
 </setenv>
 <tool>
diff --git a/tests/data/test1913 b/tests/data/test1913
index b9ac2cbdfe..ac04f5110d 100644
--- a/tests/data/test1913
+++ b/tests/data/test1913
@@ -19,7 +19,7 @@ REPLY SIZE 550 no such file
 ftp
 </server>
 
-# require debug so that alt-svc can work over plain old HTTP
+# require Debug so that alt-svc can work over plain old HTTP
 <name>
 FTP with NOBODY set, getting a missing file
 </name>
diff --git a/tests/data/test1914 b/tests/data/test1914
index 1aa3e48c01..7aee1807b8 100644
--- a/tests/data/test1914
+++ b/tests/data/test1914
@@ -20,7 +20,7 @@ REPLY MDTM 550 no such file
 ftp
 </server>
 
-# require debug so that alt-svc can work over plain old HTTP
+# require Debug so that alt-svc can work over plain old HTTP
 <name>
 FTP with NOBODY and FILETIME set, getting a missing file
 </name>
diff --git a/tests/data/test1933 b/tests/data/test1933
index 2486b8ccbc..ef4013caa4 100644
--- a/tests/data/test1933
+++ b/tests/data/test1933
@@ -32,7 +32,7 @@ Content-Length: 0
 <server>
 http
 </server>
-# this relies on the debug feature which allows tests to set the time
+# this relies on the Debug feature which allows tests to set the time
 <features>
 SSL
 Debug
diff --git a/tests/data/test1934 b/tests/data/test1934
index 853817e2dc..86553a4633 100644
--- a/tests/data/test1934
+++ b/tests/data/test1934
@@ -32,7 +32,7 @@ Content-Length: 0
 <server>
 http
 </server>
-# this relies on the debug feature which allows tests to set the time
+# this relies on the Debug feature which allows tests to set the time
 <features>
 SSL
 Debug
diff --git a/tests/data/test1935 b/tests/data/test1935
index 6cb67ab842..26701aee8d 100644
--- a/tests/data/test1935
+++ b/tests/data/test1935
@@ -32,7 +32,7 @@ Content-Length: 0
 <server>
 http
 </server>
-# this relies on the debug feature which allows tests to set the time
+# this relies on the Debug feature which allows tests to set the time
 <features>
 SSL
 Debug
diff --git a/tests/data/test1936 b/tests/data/test1936
index 6e762493fe..0d100c55e1 100644
--- a/tests/data/test1936
+++ b/tests/data/test1936
@@ -32,7 +32,7 @@ Content-Length: 0
 <server>
 http
 </server>
-# this relies on the debug feature which allows tests to set the time
+# this relies on the Debug feature which allows tests to set the time
 <features>
 SSL
 Debug
diff --git a/tests/data/test1937 b/tests/data/test1937
index fc50a06dd8..b1bd518a9f 100644
--- a/tests/data/test1937
+++ b/tests/data/test1937
@@ -33,7 +33,7 @@ Content-Length: 0
 <server>
 http
 </server>
-# this relies on the debug feature which allows tests to set the time
+# this relies on the Debug feature which allows tests to set the time
 <features>
 SSL
 Debug
diff --git a/tests/data/test1938 b/tests/data/test1938
index 77e68789d1..c06306c4ca 100644
--- a/tests/data/test1938
+++ b/tests/data/test1938
@@ -33,7 +33,7 @@ Content-Length: 0
 <server>
 http
 </server>
-# this relies on the debug feature which allows tests to set the time
+# this relies on the Debug feature which allows tests to set the time
 <features>
 SSL
 Debug
diff --git a/tests/data/test1955 b/tests/data/test1955
index 35f87cdad7..67de2a1e8d 100644
--- a/tests/data/test1955
+++ b/tests/data/test1955
@@ -32,16 +32,13 @@ Content-Length: 0
 <server>
 http
 </server>
-# this relies on the debug feature which allows tests to set the time
+# this relies on the Debug feature which allows tests to set the time
 <features>
 SSL
 Debug
 crypto
 aws
 </features>
-<setenv>
-CURL_FORCEHOST=1
-</setenv>
 
 <name>
 HTTP AWS_SIGV4 without X-Xxx-Content-Sha256
diff --git a/tests/data/test1956 b/tests/data/test1956
index b7ee7b7280..84b2a81e02 100644
--- a/tests/data/test1956
+++ b/tests/data/test1956
@@ -32,16 +32,13 @@ Content-Length: 0
 <server>
 http
 </server>
-# this relies on the debug feature which allows tests to set the time
+# this relies on the Debug feature which allows tests to set the time
 <features>
 SSL
 Debug
 crypto
 aws
 </features>
-<setenv>
-CURL_FORCEHOST=1
-</setenv>
 
 <name>
 HTTP AWS_SIGV4 with X-Xxx-Content-Sha256 of empty payload
diff --git a/tests/data/test1957 b/tests/data/test1957
index b024def6c0..2f538cc8e2 100644
--- a/tests/data/test1957
+++ b/tests/data/test1957
@@ -32,16 +32,13 @@ Content-Length: 0
 <server>
 http
 </server>
-# this relies on the debug feature which allows tests to set the time
+# this relies on the Debug feature which allows tests to set the time
 <features>
 SSL
 Debug
 crypto
 aws
 </features>
-<setenv>
-CURL_FORCEHOST=1
-</setenv>
 
 <name>
 HTTP AWS_SIGV4 with X-Xxx-Content-Sha256 of arbitrary payload
diff --git a/tests/data/test1958 b/tests/data/test1958
index 1c59d4a521..27be746d37 100644
--- a/tests/data/test1958
+++ b/tests/data/test1958
@@ -32,16 +32,13 @@ Content-Length: 0
 <server>
 http
 </server>
-# this relies on the debug feature which allows tests to set the time
+# this relies on the Debug feature which allows tests to set the time
 <features>
 SSL
 Debug
 crypto
 aws
 </features>
-<setenv>
-CURL_FORCEHOST=1
-</setenv>
 
 <name>
 HTTP AWS_SIGV4 with X-Xxx-Content-Sha256 with whitespace
diff --git a/tests/data/test1959 b/tests/data/test1959
index 11d8987080..c6c15cadf4 100644
--- a/tests/data/test1959
+++ b/tests/data/test1959
@@ -32,16 +32,13 @@ Content-Length: 0
 <server>
 http
 </server>
-# this relies on the debug feature which allows tests to set the time
+# this relies on the Debug feature which allows tests to set the time
 <features>
 SSL
 Debug
 crypto
 aws
 </features>
-<setenv>
-CURL_FORCEHOST=1
-</setenv>
 
 <name>
 HTTP AWS_SIGV4 with long value for X-Xxx-Content-Sha256
diff --git a/tests/data/test1964 b/tests/data/test1964
index f49d7894c7..cd148faf71 100644
--- a/tests/data/test1964
+++ b/tests/data/test1964
@@ -32,7 +32,7 @@ Content-Length: 0
 <server>
 http
 </server>
-# this relies on the debug feature which allows tests to set the time
+# this relies on the Debug feature which allows tests to set the time
 <features>
 SSL
 crypto
diff --git a/tests/data/test1970 b/tests/data/test1970
index 673d310115..106a0e3162 100644
--- a/tests/data/test1970
+++ b/tests/data/test1970
@@ -32,16 +32,13 @@ Content-Length: 0
 <server>
 http
 </server>
-# this relies on the debug feature which allows tests to set the time
+# this relies on the Debug feature which allows tests to set the time
 <features>
 SSL
 Debug
 crypto
 aws
 </features>
-<setenv>
-CURL_FORCEHOST=1
-</setenv>
 
 <name>
 HTTP AWS_SIGV4 for AWS S3: UPLOAD with INFILESIZE=0
diff --git a/tests/data/test1971 b/tests/data/test1971
index 85a1eed810..d6f5507933 100644
--- a/tests/data/test1971
+++ b/tests/data/test1971
@@ -25,16 +25,13 @@ Content-Length: 0
 <server>
 http
 </server>
-# this relies on the debug feature which allows tests to set the time
+# this relies on the Debug feature which allows tests to set the time
 <features>
 SSL
 Debug
 crypto
 aws
 </features>
-<setenv>
-CURL_FORCEHOST=1
-</setenv>
 
 <name>
 HTTP AWS_SIGV4 for AWS S3: UPLOAD with unknown INFILESIZE
diff --git a/tests/data/test1972 b/tests/data/test1972
index c5d9c42330..1fb52b4e50 100644
--- a/tests/data/test1972
+++ b/tests/data/test1972
@@ -32,16 +32,13 @@ Content-Length: 0
 <server>
 http
 </server>
-# this relies on the debug feature which allows tests to set the time
+# this relies on the Debug feature which allows tests to set the time
 <features>
 SSL
 Debug
 crypto
 aws
 </features>
-<setenv>
-CURL_FORCEHOST=1
-</setenv>
 
 <name>
 HTTP AWS_SIGV4 for AWS S3: MIMEPOST
diff --git a/tests/data/test1973 b/tests/data/test1973
index 9e78cc4ad4..094810cf13 100644
--- a/tests/data/test1973
+++ b/tests/data/test1973
@@ -32,16 +32,13 @@ Content-Length: 0
 <server>
 http
 </server>
-# this relies on the debug feature which allows tests to set the time
+# this relies on the Debug feature which allows tests to set the time
 <features>
 SSL
 Debug
 crypto
 aws
 </features>
-<setenv>
-CURL_FORCEHOST=1
-</setenv>
 
 <name>
 HTTP AWS_SIGV4 for AWS S3: POSTFIELDS
diff --git a/tests/data/test1974 b/tests/data/test1974
index 48eb9da20a..b184ca4b5a 100644
--- a/tests/data/test1974
+++ b/tests/data/test1974
@@ -32,16 +32,13 @@ Content-Length: 0
 <server>
 http
 </server>
-# this relies on the debug feature which allows tests to set the time
+# this relies on the Debug feature which allows tests to set the time
 <features>
 SSL
 Debug
 crypto
 aws
 </features>
-<setenv>
-CURL_FORCEHOST=1
-</setenv>
 
 <name>
 HTTP AWS_SIGV4 for AWS S3: GET
diff --git a/tests/data/test1975 b/tests/data/test1975
index 29b9e5ebe8..1e980c5a82 100644
--- a/tests/data/test1975
+++ b/tests/data/test1975
@@ -25,16 +25,13 @@ Content-Length: 0
 <server>
 http
 </server>
-# this relies on the debug feature which allows tests to set the time
+# this relies on the Debug feature which allows tests to set the time
 <features>
 SSL
 Debug
 crypto
 aws
 </features>
-<setenv>
-CURL_FORCEHOST=1
-</setenv>
 
 <name>
 HTTP AWS_SIGV4 for AWS S3: UPLOAD with given x-amz-content-sha256
diff --git a/tests/data/test2100 b/tests/data/test2100
index 69ed43466c..efe54a6bc7 100644
--- a/tests/data/test2100
+++ b/tests/data/test2100
@@ -43,7 +43,7 @@ Funny-head: yesyes
 http
 </server>
 
-# requires debug so that it can use the DoH server without https
+# requires Debug so that it can use the DoH server without https
 # requires IPv6 so that we can assume and compare both DoH requests
 
 <features>
diff --git a/tests/data/test2101 b/tests/data/test2101
index 9402adfabf..3ca33cf89f 100644
--- a/tests/data/test2101
+++ b/tests/data/test2101
@@ -23,7 +23,7 @@ idle
 http
 </server>
 
-# requires debug so that it can use the DoH server without https
+# requires Debug so that it can use the DoH server without https
 
 <features>
 Debug
diff --git a/tests/data/test2301 b/tests/data/test2301
index cc728d89a8..61079d28c0 100644
--- a/tests/data/test2301
+++ b/tests/data/test2301
@@ -27,7 +27,7 @@ upgrade
 #
 # Client-side
 <client>
-# require debug for the forced CURL_ENTROPY
+# require Debug for the forced CURL_ENTROPY
 <features>
 Debug
 ws
diff --git a/tests/data/test2302 b/tests/data/test2302
index 01a8675369..52887e8b7d 100644
--- a/tests/data/test2302
+++ b/tests/data/test2302
@@ -27,7 +27,7 @@ upgrade
 #
 # Client-side
 <client>
-# require debug for the forced CURL_ENTROPY
+# require Debug for the forced CURL_ENTROPY
 <features>
 Debug
 ws
diff --git a/tests/data/test2303 b/tests/data/test2303
index f6ed9a5f67..ab1edb2f57 100644
--- a/tests/data/test2303
+++ b/tests/data/test2303
@@ -20,7 +20,7 @@ hello
 #
 # Client-side
 <client>
-# require debug for the forced CURL_ENTROPY
+# require Debug for the forced CURL_ENTROPY
 <features>
 Debug
 ws
diff --git a/tests/data/test2304 b/tests/data/test2304
index 7a0324c50f..a141f52ccc 100644
--- a/tests/data/test2304
+++ b/tests/data/test2304
@@ -26,7 +26,7 @@ upgrade
 #
 # Client-side
 <client>
-# require debug for the forced CURL_ENTROPY
+# require Debug for the forced CURL_ENTROPY
 <features>
 Debug
 ws
diff --git a/tests/data/test356 b/tests/data/test356
index 1d441d7e73..8d7cd45b17 100644
--- a/tests/data/test356
+++ b/tests/data/test356
@@ -39,7 +39,7 @@ http
 parse incoming Alt-Svc and save to file
 </name>
 <setenv>
-# make debug-curl accept Alt-Svc over plain HTTP
+# make Debug-curl accept Alt-Svc over plain HTTP
 CURL_ALTSVC_HTTP="yeah"
 </setenv>
 <command>
diff --git a/tests/data/test358 b/tests/data/test358
index 9db8b66f13..327662b41b 100644
--- a/tests/data/test358
+++ b/tests/data/test358
@@ -40,7 +40,7 @@ http/2
 HTTPS GET translated by alt-svc lookup to HTTP/2 GET
 </name>
 <setenv>
-# make debug-curl accept Alt-Svc over plain HTTP
+# make Debug-curl accept Alt-Svc over plain HTTP
 CURL_ALTSVC_HTTP="yeah"
 </setenv>
 <command>
diff --git a/tests/data/test359 b/tests/data/test359
index 2b7e52ce8e..2dd898118f 100644
--- a/tests/data/test359
+++ b/tests/data/test359
@@ -40,7 +40,7 @@ http/2
 HTTPS GET translated by alt-svc lookup to HTTP/2 GET
 </name>
 <setenv>
-# make debug-curl accept Alt-Svc over plain HTTP
+# make Debug-curl accept Alt-Svc over plain HTTP
 CURL_ALTSVC_HTTP="yeah"
 </setenv>
 <command>
diff --git a/tests/data/test412 b/tests/data/test412
index 5923054fc7..4c90c98ec1 100644
--- a/tests/data/test412
+++ b/tests/data/test412
@@ -37,7 +37,7 @@ http
 alt-svc using host name with trailing dot in URL
 </name>
 <setenv>
-# make debug-curl accept Alt-Svc over plain HTTP
+# make Debug-curl accept Alt-Svc over plain HTTP
 CURL_ALTSVC_HTTP="yeah"
 </setenv>
 <command>
diff --git a/tests/data/test413 b/tests/data/test413
index e0aec1eaad..913a444d9f 100644
--- a/tests/data/test413
+++ b/tests/data/test413
@@ -37,7 +37,7 @@ http
 alt-svc using host name with trailing dot on host from file
 </name>
 <setenv>
-# make debug-curl accept Alt-Svc over plain HTTP
+# make Debug-curl accept Alt-Svc over plain HTTP
 CURL_ALTSVC_HTTP="yeah"
 </setenv>
 <command>
diff --git a/tests/data/test437 b/tests/data/test437
index 0f781e0b9c..1322fb0594 100644
--- a/tests/data/test437
+++ b/tests/data/test437
@@ -37,7 +37,7 @@ http
 Alt-Svc to numerical IPv6 address
 </name>
 <setenv>
-# make debug-curl accept Alt-Svc over plain HTTP
+# make Debug-curl accept Alt-Svc over plain HTTP
 CURL_ALTSVC_HTTP="yeah"
 </setenv>
 <command>
diff --git a/tests/data/test438 b/tests/data/test438
index aad056aeec..b07b4ccd82 100644
--- a/tests/data/test438
+++ b/tests/data/test438
@@ -40,7 +40,7 @@ http-ipv6
 HTTPS IPv4 GET translated by alt-svc to IPv6 address
 </name>
 <setenv>
-# make debug-curl accept Alt-Svc over plain HTTP
+# make Debug-curl accept Alt-Svc over plain HTTP
 CURL_ALTSVC_HTTP="yeah"
 </setenv>
 <command>