diff --git a/tests/data/test1129 b/tests/data/test1129
index 9a81043b17..66f74fc1dc 100644
--- a/tests/data/test1129
+++ b/tests/data/test1129
@@ -50,7 +50,7 @@ http
HTTP POST expect 100-continue with a 404
-
+
-d @%LOGDIR/file%TESTNUMBER --expect100-timeout 99 http://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001
diff --git a/tests/data/test1130 b/tests/data/test1130
index 1057d06d72..839ba75398 100644
--- a/tests/data/test1130
+++ b/tests/data/test1130
@@ -51,7 +51,7 @@ http
HTTP POST forced expect 100-continue with a 404
-
+
-d @%LOGDIR/file%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 -H "Expect: 100-continue" --expect100-timeout 99
diff --git a/tests/data/test1131 b/tests/data/test1131
index 51601c03ad..8abf2a6245 100644
--- a/tests/data/test1131
+++ b/tests/data/test1131
@@ -51,7 +51,7 @@ http
HTTP PUT expect 100-continue with a 400
-
+
-H "Expect: 100-continue" -T %LOGDIR/file%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T %LOGDIR/file%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 --expect100-timeout 99
diff --git a/tests/data/test1164 b/tests/data/test1164
index 27934a7b75..ed58ffb22c 100644
--- a/tests/data/test1164
+++ b/tests/data/test1164
@@ -23,7 +23,7 @@ http
HTTP/0.9 GET and all zeroes
-
+
http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w '%{size_download}\n' --http0.9
diff --git a/tests/data/test1176 b/tests/data/test1176
index 6d38e8689f..f180236204 100644
--- a/tests/data/test1176
+++ b/tests/data/test1176
@@ -33,7 +33,7 @@ http
--output using #0
-
+
http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o '%LOGDIR/base-#0'
diff --git a/tests/data/test1327 b/tests/data/test1327
index 1a4ac89875..70b922c333 100644
--- a/tests/data/test1327
+++ b/tests/data/test1327
@@ -31,7 +31,7 @@ GET /ignore/for/%TESTNUMBER HTTP/1.0
GET /we/want/%TESTNUMBER HTTP/1.0
-
+
telnet://%HOSTIP:%HTTPPORT -T %LOGDIR/%TESTNUMBER.txt
diff --git a/tests/data/test1499 b/tests/data/test1499
index 54fec71049..01c8781dd8 100644
--- a/tests/data/test1499
+++ b/tests/data/test1499
@@ -48,10 +48,10 @@ writedelay: 10
http
-
+
HTTP chunked encoding and chunked trailer, twice
-
-
+
+
http://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER
diff --git a/tests/data/test1571 b/tests/data/test1571
index 8a2bfb4616..58091c0802 100644
--- a/tests/data/test1571
+++ b/tests/data/test1571
@@ -65,10 +65,10 @@ http
lib%TESTNUMBER
-
+
CURLFOLLOW_OBEYCODE with custom POST method, 302 => GET
-
-
+
+
http://%HOSTIP:%HTTPPORT/%TESTNUMBER
diff --git a/tests/data/test1572 b/tests/data/test1572
index 53683ed88f..b502ea9572 100644
--- a/tests/data/test1572
+++ b/tests/data/test1572
@@ -65,10 +65,10 @@ http
lib1571
-
+
CURLFOLLOW_OBEYCODE with custom POST method, 308 => custom
-
-
+
+
http://%HOSTIP:%HTTPPORT/%TESTNUMBER
diff --git a/tests/data/test1573 b/tests/data/test1573
index e13522964f..01f5abc117 100644
--- a/tests/data/test1573
+++ b/tests/data/test1573
@@ -65,10 +65,10 @@ http
lib1571
-
+
CURLFOLLOW_OBEYCODE with custom GET method, 301 => custom
-
-
+
+
http://%HOSTIP:%HTTPPORT/%TESTNUMBER
diff --git a/tests/data/test1581 b/tests/data/test1581
index f3f29757a2..3de7e7b400 100644
--- a/tests/data/test1581
+++ b/tests/data/test1581
@@ -65,10 +65,10 @@ http
lib1571
-
+
CURLFOLLOW_OBEYCODE with custom POST301 method, 301 => custom
-
-
+
+
http://%HOSTIP:%HTTPPORT/%TESTNUMBER
diff --git a/tests/data/test17 b/tests/data/test17
index 31e2a8e536..f0e5dea74c 100644
--- a/tests/data/test17
+++ b/tests/data/test17
@@ -25,7 +25,7 @@ http
HTTP with config file on stdin
-
+
#
# Use a silly request without '--':
request MOOO
@@ -35,7 +35,7 @@ request MOOO
#
# long option *with* '--':
--max-time 180
-
+
-K - %HOSTIP:%HTTPPORT/that.site.com/%TESTNUMBER
diff --git a/tests/data/test1909 b/tests/data/test1909
index a7be2d3076..bb81008588 100644
--- a/tests/data/test1909
+++ b/tests/data/test1909
@@ -35,7 +35,7 @@ http
HTTP GET --retry-all-errors to overcome partial transfer
-
+
--retry 1 --retry-all-errors -o %LOGDIR/outfile%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER
diff --git a/tests/data/test2033 b/tests/data/test2033
index 32c9edc67c..0526db9954 100644
--- a/tests/data/test2033
+++ b/tests/data/test2033
@@ -35,10 +35,10 @@ https test-localhost.pem
simple HTTPS GET with DER public key pinning (Schannel variant)
-
+
# This test is pointless if we are not using the Schannel backend
CURL_SSL_BACKEND=schannel
-
+
-4 --cacert %CERTDIR/certs/test-ca.crt --pinnedpubkey %CERTDIR/certs/test-localhost.pub.der --ssl-revoke-best-effort https://localhost:%HTTPSPORT/%TESTNUMBER
diff --git a/tests/data/test2070 b/tests/data/test2070
index 0dfa5db727..a3b5a4ba78 100644
--- a/tests/data/test2070
+++ b/tests/data/test2070
@@ -34,10 +34,10 @@ https test-localhost.pem
Ignore certificate revocation "best effort" strategy
-
+
# This test is pointless if we are not using the Schannel backend
CURL_SSL_BACKEND=schannel
-
+
-4 --cacert %CERTDIR/certs/test-ca.crt --ssl-revoke-best-effort https://localhost:%HTTPSPORT/%TESTNUMBER
diff --git a/tests/data/test2079 b/tests/data/test2079
index 78709f3a2c..701b55fb65 100644
--- a/tests/data/test2079
+++ b/tests/data/test2079
@@ -35,10 +35,10 @@ https test-localhost.pem
simple HTTPS GET with PEM public key pinning (Schannel variant)
-
+
# This test is pointless if we are not using the Schannel backend
CURL_SSL_BACKEND=schannel
-
+
-4 --cacert %CERTDIR/certs/test-ca.crt --pinnedpubkey %CERTDIR/certs/test-localhost.pub.pem --ssl-revoke-best-effort https://localhost:%HTTPSPORT/%TESTNUMBER
diff --git a/tests/data/test2087 b/tests/data/test2087
index 7c71767234..87fd29740a 100644
--- a/tests/data/test2087
+++ b/tests/data/test2087
@@ -35,10 +35,10 @@ https test-localhost.pem
simple HTTPS GET with base64-sha256 public key pinning (Schannel variant)
-
+
# This test is pointless if we are not using the Schannel backend
CURL_SSL_BACKEND=schannel
-
+
-4 --cacert %CERTDIR/certs/test-ca.crt --pinnedpubkey sha256//%sha256b64file[%CERTDIR/certs/test-localhost.pub.der]sha256b64file% --ssl-revoke-best-effort https://localhost:%HTTPSPORT/%TESTNUMBER
diff --git a/tests/data/test256 b/tests/data/test256
index ca76e73861..eb4acefb2c 100644
--- a/tests/data/test256
+++ b/tests/data/test256
@@ -28,7 +28,7 @@ http
HTTP resume request over proxy with auth without server supporting it
-
+
-x http://%HOSTIP:%HTTPPORT http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -C - --no-include -o %LOGDIR/fewl%TESTNUMBER.txt -U daniel:stenberg
diff --git a/tests/data/test319 b/tests/data/test319
index 6258a12720..c0cb54fb06 100644
--- a/tests/data/test319
+++ b/tests/data/test319
@@ -40,9 +40,9 @@ http
HTTP GET gobbledigook transfer-encoded data in raw mode
-
+
http://%HOSTIP:%HTTPPORT/%TESTNUMBER --raw
-
+
#
diff --git a/tests/data/test326 b/tests/data/test326
index 4c3ed3e085..3c004e2037 100644
--- a/tests/data/test326
+++ b/tests/data/test326
@@ -45,9 +45,9 @@ http
HTTP GET chunked data in raw mode
-
+
http://%HOSTIP:%HTTPPORT/%TESTNUMBER --raw
-
+
#
diff --git a/tests/data/test376 b/tests/data/test376
index 16c28002d6..1f25a3930a 100644
--- a/tests/data/test376
+++ b/tests/data/test376
@@ -34,7 +34,7 @@ http
--remove-on-error
-
+
http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/save-%TESTNUMBER --remove-on-error
diff --git a/tests/data/test38 b/tests/data/test38
index d48e743a46..31207b9596 100644
--- a/tests/data/test38
+++ b/tests/data/test38
@@ -27,7 +27,7 @@ http
HTTP resume request without server supporting it
-
+
http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -C - --no-include -o %LOGDIR/fewl%TESTNUMBER.txt
diff --git a/tests/data/test471 b/tests/data/test471
index e434198ad1..f32ccd1277 100644
--- a/tests/data/test471
+++ b/tests/data/test471
@@ -46,7 +46,7 @@ http
Reject HTTP/1.1 to HTTP/2 switch on the same connection
-
+
"http://%HOSTIP:%HTTPPORT/{%TESTNUMBER,%TESTNUMBER0001}" -o "%LOGDIR/dumpit#1.dump"
diff --git a/tests/data/test513 b/tests/data/test513
index d61d2be4a5..d63e071b90 100644
--- a/tests/data/test513
+++ b/tests/data/test513
@@ -25,7 +25,7 @@ lib%TESTNUMBER
send HTTP POST using read callback that returns CURL_READFUNC_ABORT
# the 1s post-command delay helps to prevent a spurious failure on s390
-
+
http://%HOSTIP:%HTTPPORT/%TESTNUMBER
diff --git a/tests/data/test514 b/tests/data/test514
index 9ab14de7c6..71dd74e42b 100644
--- a/tests/data/test514
+++ b/tests/data/test514
@@ -36,7 +36,7 @@ lib%TESTNUMBER
First set options to POST and then to make HEAD
# the 1s post-command delay helps to prevent a spurious failure on s390
-
+
http://%HOSTIP:%HTTPPORT/%TESTNUMBER
diff --git a/tests/data/test56 b/tests/data/test56
index 5ced385bb0..5dea16c0c1 100644
--- a/tests/data/test56
+++ b/tests/data/test56
@@ -26,7 +26,7 @@ http
HTTP POST with *HUGE* request and chunked transfer-encoding
-
+
#
data "we post this"
#
@@ -36,7 +36,7 @@ header "Transfer-Encoding: chunked"
# Set the user-agent using a short-option:
-A "%repeat[99999 x a]%"
#
-
+
-K - %HOSTIP:%HTTPPORT/that.site.com/%TESTNUMBER
diff --git a/tests/data/test587 b/tests/data/test587
index 44e1fb047d..85f7453735 100644
--- a/tests/data/test587
+++ b/tests/data/test587
@@ -33,7 +33,7 @@ HTTP multi-part formpost with aborted read callback
# Add a delay to give server time to write its output since we otherwise might
# not even give it enough time to write its lock file.
-
+
http://%HOSTIP:%HTTPPORT/%TESTNUMBER
diff --git a/tests/data/test728 b/tests/data/test728
index 3be1911390..19d45ab4e1 100644
--- a/tests/data/test728
+++ b/tests/data/test728
@@ -33,10 +33,10 @@ proxy
http
socks5
-
+
SOCKS5h with HTTP redirect to hostname too long
-
-
+
+
--no-progress-meter --location --proxy socks5h://%HOSTIP:%SOCKSPORT http://%HOSTIP:%HTTPPORT/%TESTNUMBER
diff --git a/tests/data/test74 b/tests/data/test74
index 0d10f20587..d23c5da450 100644
--- a/tests/data/test74
+++ b/tests/data/test74
@@ -42,7 +42,7 @@ http
HTTP, urlglob {}-retrieval and -o #[num] usage
-
+
"http://%HOSTIP:%HTTPPORT/{%TESTNUMBER,%TESTNUMBER0001}" -o "%LOGDIR/dumpit#1.dump"
diff --git a/tests/data/test75 b/tests/data/test75
index 3aa416a5b3..a79a929201 100644
--- a/tests/data/test75
+++ b/tests/data/test75
@@ -21,7 +21,7 @@ http
HTTP, urlglob retrieval with bad range
-
+
"http://a-site-never-accessed.example.org/[2-1]" -o "%LOGDIR/weee#1.dump" --stderr -
diff --git a/tests/data/test86 b/tests/data/test86
index ecd1f63214..2fe5ce837e 100644
--- a/tests/data/test86
+++ b/tests/data/test86
@@ -56,7 +56,7 @@ http
HTTP, urlglob []-retrieval and -o #[num] usage
-
+
"http://%HOSTIP:%HTTPPORT/[%TESTNUMBER0001-%TESTNUMBER0003]" -o "%LOGDIR/dumpit#1.dump"
diff --git a/tests/data/test87 b/tests/data/test87
index 6bbb35a4f0..b22578f82f 100644
--- a/tests/data/test87
+++ b/tests/data/test87
@@ -39,7 +39,7 @@ http
urlglob with out of range -o #[num] usage
-
+
"http://%HOSTIP:%HTTPPORT/[%TESTNUMBER0001-%TESTNUMBER0002]" -o "%LOGDIR/dumpit%TESTNUMBER-#2.dump"
diff --git a/tests/data/test982 b/tests/data/test982
index 6098b7255a..f250a6b88f 100644
--- a/tests/data/test982
+++ b/tests/data/test982
@@ -39,7 +39,7 @@ POP3 STARTTLS pipelined server response
pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret --ssl
-
+
#
diff --git a/tests/data/test985 b/tests/data/test985
index 816730c7f1..b0bd1dac15 100644
--- a/tests/data/test985
+++ b/tests/data/test985
@@ -37,7 +37,7 @@ POP3 require STARTTLS with failing capabilities
pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret --ssl-reqd
-
+
#