diff --git a/tests/data/test1 b/tests/data/test1
index 78815a3048839101032c4f5434c1ff059dfbb915..42d3ffbe3ee527d74266300169b99b93d05ef885 100644
--- a/tests/data/test1
+++ b/tests/data/test1
@@ -20,6 +20,9 @@ Funny-head: yesyes
 #
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 simple HTTP GET
  </name>
diff --git a/tests/data/test10 b/tests/data/test10
index ef34e87121d8263996adc4ffd3c443df9713b28e..3b8674943d166228d33fd1d7675e9b858f487a19 100644
--- a/tests/data/test10
+++ b/tests/data/test10
@@ -12,6 +12,9 @@ blablabla
 
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 simple HTTP PUT from file
  </name>
diff --git a/tests/data/test100 b/tests/data/test100
index c5ccce786e61659efbdefc27b816fcc194c39775..8fbb1714e9c414598195c2369e23fd2ce8e2a159 100644
--- a/tests/data/test100
+++ b/tests/data/test100
@@ -19,6 +19,9 @@ dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
 #
 # Client-side
 <client>
+<server>
+ftp
+</server>
  <name>
 FTP dir list PASV
  </name>
diff --git a/tests/data/test101 b/tests/data/test101
index a191c4ba20ab7528b269969c8129b5806ad4e5e2..eabc6e2efcd96cf743cc3f7fb2ff48f967d29a89 100644
--- a/tests/data/test101
+++ b/tests/data/test101
@@ -17,6 +17,9 @@ dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
 
 # Client-side
 <client>
+<server>
+ftp
+</server>
  <name>
 FTP dir list, PORT with specified IP
  </name>
diff --git a/tests/data/test102 b/tests/data/test102
index 186732625b9aa2f3f27b338688a35b6f7525ebb4..a124581fd85faa864d68b5c7ebdf46a36aff5225 100644
--- a/tests/data/test102
+++ b/tests/data/test102
@@ -12,6 +12,9 @@ works
 
 # Client-side
 <client>
+<server>
+ftp
+</server>
  <name>
 FTP RETR PASV
  </name>
diff --git a/tests/data/test103 b/tests/data/test103
index d362feaee7383f9896307d3355ee7a20d66a9589..e46391318615a7fa2c98c002b594a2b279d2a9bf 100644
--- a/tests/data/test103
+++ b/tests/data/test103
@@ -12,6 +12,9 @@ works
 
 # Client-side
 <client>
+<server>
+ftp
+</server>
  <name>
 FTP RETR PORT with CWD
  </name>
diff --git a/tests/data/test104 b/tests/data/test104
index ef6b9fc5dbcd89bcfe24a28117c04974a959e70f..a37b84f5d22f227d5bf18d754028419ef260b9f6 100644
--- a/tests/data/test104
+++ b/tests/data/test104
@@ -7,6 +7,9 @@
 
 # Client-side
 <client>
+<server>
+ftp
+</server>
  <name>
 FTP --head to get file size only
  </name>
diff --git a/tests/data/test105 b/tests/data/test105
index 3ae69d4e59db98667aac03c251b525c2669f1884..b077ecc750990863ee5265831061d2579c15e743 100644
--- a/tests/data/test105
+++ b/tests/data/test105
@@ -12,6 +12,9 @@ works
 
 # Client-side
 <client>
+<server>
+ftp
+</server>
  <name>
 FTP user+password in URL and ASCII transfer
  </name>
diff --git a/tests/data/test106 b/tests/data/test106
index 4f8a3b3171608e5e7087624db95a04f134dbe74b..4b18095f539e59549c5602c274712cfac353f5cd 100644
--- a/tests/data/test106
+++ b/tests/data/test106
@@ -12,6 +12,9 @@ works
 
 # Client-side
 <client>
+<server>
+ftp
+</server>
  <name>
 FTP GET with type=A style ASCII URL using %20 codes
  </name>
diff --git a/tests/data/test107 b/tests/data/test107
index ebbeefee9822a61928c478fea3034ed46611775c..bb69f16b79fb003e0b044f17d54047fd931e52bd 100644
--- a/tests/data/test107
+++ b/tests/data/test107
@@ -1,6 +1,9 @@
 
 # Client-side
 <client>
+<server>
+ftp
+</server>
  <name>
 FTP PASV upload file
  </name>
diff --git a/tests/data/test108 b/tests/data/test108
index eadc076f527397b68b49f866b8af8da82f6203de..27c5c6d237a66e52e0a3d5bb60080fb9d854b49b 100644
--- a/tests/data/test108
+++ b/tests/data/test108
@@ -6,6 +6,9 @@
 
 # Client-side
 <client>
+<server>
+ftp
+</server>
  <name>
 FTP PORT upload with CWD
  </name>
diff --git a/tests/data/test109 b/tests/data/test109
index a109c62c000fe4187259c0e4b6ce2c54973c3583..4aad721236089d4d52af9c9fb97d07490c8911a0 100644
--- a/tests/data/test109
+++ b/tests/data/test109
@@ -6,6 +6,9 @@
 
 # Client-side
 <client>
+<server>
+ftp
+</server>
  <name>
 FTP PASV upload append
  </name>
diff --git a/tests/data/test11 b/tests/data/test11
index 9a9ccdd8a52dd86177a1bd80075a757f67486429..d06cb64f64663ff496f4373b1c5c43ca2c1c72c7 100644
--- a/tests/data/test11
+++ b/tests/data/test11
@@ -36,6 +36,9 @@ If this is received, the location following worked
 
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 simple HTTP Location: following
  </name>
diff --git a/tests/data/test110 b/tests/data/test110
index 310517468aa581bb2ae36e81b1facd035e4320a9..4014daa82caaaf777bf51ab0f6dff3820a72bee6 100644
--- a/tests/data/test110
+++ b/tests/data/test110
@@ -11,6 +11,9 @@ but we emulate that
 
 # Client-side
 <client>
+<server>
+ftp
+</server>
  <name>
 FTP download resume with set limit
  </name>
diff --git a/tests/data/test111 b/tests/data/test111
index 8e80ecb620a90cb9707c2282c0d1a05e2603fa34..78b6141af08d83f50944b5867da2f0d8f93ad37e 100644
--- a/tests/data/test111
+++ b/tests/data/test111
@@ -7,6 +7,9 @@
 
 # Client-side
 <client>
+<server>
+ftp
+</server>
  <name>
 FTP download resume beyond file size
  </name>
diff --git a/tests/data/test112 b/tests/data/test112
index b55152242877b31cb60cfb54cea32c6fde46a974..e519d675658f4c09f12628e9694a2be8f86ae10e 100644
--- a/tests/data/test112
+++ b/tests/data/test112
@@ -4,6 +4,9 @@
 
 # Client-side
 <client>
+<server>
+ftp
+</server>
  <name>
 FTP PASV upload resume
  </name>
diff --git a/tests/data/test113 b/tests/data/test113
index 5dcc6afaf16f8a2b802fe4ff60a4e37de31804d5..6357897b44ba39ff3c280aa36e31c970883a6766 100644
--- a/tests/data/test113
+++ b/tests/data/test113
@@ -4,6 +4,9 @@
 
 # Client-side
 <client>
+<server>
+ftp
+</server>
  <name>
 FTP download, failed login: USER not valid
  </name>
diff --git a/tests/data/test114 b/tests/data/test114
index 52f4378b215d599b32b3bd99d3c8ed3a265ac4ab..0dfff77a06693ace69c288c447c4ef28abe451f7 100644
--- a/tests/data/test114
+++ b/tests/data/test114
@@ -4,6 +4,9 @@
 
 # Client-side
 <client>
+<server>
+ftp
+</server>
  <name>
 FTP download, failed login: PASS not valid
  </name>
diff --git a/tests/data/test115 b/tests/data/test115
index 73ee731f211ed027db7ad828c1636f6b64195c9a..204b0ccd987903a41c70c111eadc750f743e0f76 100644
--- a/tests/data/test115
+++ b/tests/data/test115
@@ -4,6 +4,9 @@
 
 # Client-side
 <client>
+<server>
+ftp
+</server>
  <name>
 FTP download, failed PASV
  </name>
diff --git a/tests/data/test116 b/tests/data/test116
index 618c26d0087c6f13c2f4c14e9e87ea739250241b..0bc8620c8a6442094e33013cf67057ca5bccc5e9 100644
--- a/tests/data/test116
+++ b/tests/data/test116
@@ -4,6 +4,9 @@
 
 # Client-side
 <client>
+<server>
+ftp
+</server>
  <name>
 FTP download, failed PORT
  </name>
diff --git a/tests/data/test117 b/tests/data/test117
index edd5b7e09f4acccce21248dd7a680166c9eadd24..428cbee9da8ac4bcc56895c4f658e0bfc29270e1 100644
--- a/tests/data/test117
+++ b/tests/data/test117
@@ -4,6 +4,9 @@
 
 # Client-side
 <client>
+<server>
+ftp
+</server>
  <name>
 FTP download, failed TYPE
  </name>
diff --git a/tests/data/test118 b/tests/data/test118
index ffd3e0130cc8a91142bb51b1d79548aecd4b866e..b97c0c961550490582361fc8ba24486fe65aa1e4 100644
--- a/tests/data/test118
+++ b/tests/data/test118
@@ -4,6 +4,9 @@
 
 # Client-side
 <client>
+<server>
+ftp
+</server>
  <name>
 FTP download, failed RETR
  </name>
diff --git a/tests/data/test119 b/tests/data/test119
index 4aa681482cd4d821a2df1d682feaf1a024b2cde6..2e53a82b2cc060f5b51661cb21e9fe2a00e206f1 100644
--- a/tests/data/test119
+++ b/tests/data/test119
@@ -4,6 +4,9 @@
 
 # Client-side
 <client>
+<server>
+ftp
+</server>
  <name>
 FTP download, failed RETR with PORT
  </name>
diff --git a/tests/data/test12 b/tests/data/test12
index 9f105f0cff46c5a8c1468a52cb8ef1d13d99342c..98dc39f5590c7f961b1663f1b97cdbb187602b11 100644
--- a/tests/data/test12
+++ b/tests/data/test12
@@ -20,6 +20,9 @@ ink="#ffffff" vlink="#cccccc">
 
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 HTTP range support
  </name>
diff --git a/tests/data/test120 b/tests/data/test120
index bb97eff4a96204ab0959443cb57be373b3b14580..2fcf0153901894ebd232176a127884ee1d6a5500 100644
--- a/tests/data/test120
+++ b/tests/data/test120
@@ -12,6 +12,9 @@ works
 
 # Client-side
 <client>
+<server>
+ftp
+</server>
  <name>
 ftp download with post-quote delete operation
  </name>
diff --git a/tests/data/test121 b/tests/data/test121
index c94b6262f0fa32c0304ec44a8bbc38314ffd781c..64d26f9e29f405b00de94ada6af86f2acb474c3d 100644
--- a/tests/data/test121
+++ b/tests/data/test121
@@ -12,6 +12,9 @@ works
 
 # Client-side
 <client>
+<server>
+ftp
+</server>
  <name>
 ftp download with post- and pre-transfer delete operations
  </name>
diff --git a/tests/data/test122 b/tests/data/test122
index f1a481b1ba29edcf5c782b169275a08e09cd1821..3e385502aab4221378fb4b0441a8a4b6d3d77c03 100644
--- a/tests/data/test122
+++ b/tests/data/test122
@@ -7,6 +7,9 @@
 
 # Client-side
 <client>
+<server>
+ftp
+</server>
  <name>
 FTP download resume with whole file already downloaded
  </name>
diff --git a/tests/data/test123 b/tests/data/test123
index 218548aa70cfe09ec0e9a46d3f9f838cf112d69b..066d70960510e179eda453f9c6eaf3555e627835 100644
--- a/tests/data/test123
+++ b/tests/data/test123
@@ -4,6 +4,9 @@
 
 # Client-side
 <client>
+<server>
+ftp
+</server>
  <name>
 FTP upload resume with whole file already downloaded
  </name>
diff --git a/tests/data/test124 b/tests/data/test124
index 6ae97b78027a1fe27e87ef133baa499181175345..721f3271f33430c1b36e8ce6e74a39097fd82df2 100644
--- a/tests/data/test124
+++ b/tests/data/test124
@@ -7,6 +7,9 @@ we can still send data even if pwd fails!
 
 # Client-side
 <client>
+<server>
+ftp
+</server>
  <name>
 FTP download, failed PWD
  </name>
diff --git a/tests/data/test125 b/tests/data/test125
index 6fa05add55aeacad3b2f7803043b3d1cfeb0d01d..57f8e01057e8f6f64e69d16bebec1e20555ebe68 100644
--- a/tests/data/test125
+++ b/tests/data/test125
@@ -4,6 +4,9 @@
 
 # Client-side
 <client>
+<server>
+ftp
+</server>
  <name>
 FTP download, failed CWD
  </name>
diff --git a/tests/data/test126 b/tests/data/test126
index 060eefc507270231e16c379c4c0a65cd38960fbc..1c3216523067af3e5b3decc66f54e5900916da58 100644
--- a/tests/data/test126
+++ b/tests/data/test126
@@ -7,6 +7,9 @@ this is file contents
 
 # Client-side
 <client>
+<server>
+ftp
+</server>
  <name>
 FTP download with multiple replies at once in RETR
  </name>
diff --git a/tests/data/test127 b/tests/data/test127
index 34618308d082ec240bfdec63b35e7f9ff948c26a..aafe559d11036d2be8ba5b26297ea651fee932ec 100644
--- a/tests/data/test127
+++ b/tests/data/test127
@@ -7,6 +7,9 @@ moooooooo
 
 # Client-side
 <client>
+<server>
+ftp
+</server>
  <name>
 FTP --disable-epsv
  </name>
diff --git a/tests/data/test128 b/tests/data/test128
index bb09ec749c3abde4b6bb6ac93b46fa35129dd7c0..a09631e0ca74cdbd17afc10dbb437293dfd06fc0 100644
--- a/tests/data/test128
+++ b/tests/data/test128
@@ -4,6 +4,9 @@
 
 # Client-side
 <client>
+<server>
+ftp
+</server>
  <name>
 FTP upload with --crlf
  </name>
diff --git a/tests/data/test13 b/tests/data/test13
index 5049946aadc786b5e26cf1e9484b5eb39e2479bb..251a12d181ef0febe352e97eddf9f3400d1a3323 100644
--- a/tests/data/test13
+++ b/tests/data/test13
@@ -11,6 +11,9 @@ blabla custom request result
 
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 HTTP custom request 'DELETE'
  </name>
diff --git a/tests/data/test130 b/tests/data/test130
index 21a69c02bbe745d7263586469badc3a156c98838..86a422564ebd0538f8d79dcd9bd3333e230cc3bc 100644
--- a/tests/data/test130
+++ b/tests/data/test130
@@ -19,6 +19,9 @@ dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
 #
 # Client-side
 <client requires=netrc_debug>
+<server>
+ftp
+</server>
  <name>
 FTP (optional .netrc; no user/pass) dir list PASV
  </name>
diff --git a/tests/data/test131 b/tests/data/test131
index 9576ac847617990c69c5c76b0c806753a5f65883..e1a8de78f29ef451cf8e60aadda9b6e72e61c9bf 100644
--- a/tests/data/test131
+++ b/tests/data/test131
@@ -19,6 +19,9 @@ dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
 #
 # Client-side
 <client requires=netrc_debug>
+<server>
+ftp
+</server>
  <name>
 FTP (optional .netrc; user/no pass) dir list PASV
  </name>
diff --git a/tests/data/test132 b/tests/data/test132
index 128de5a0e659c53ef973188ea084b413503b6974..4d1f10b43357b8c1d041af138d384cbe3881e097 100644
--- a/tests/data/test132
+++ b/tests/data/test132
@@ -19,6 +19,9 @@ dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
 #
 # Client-side
 <client requires=netrc_debug>
+<server>
+ftp
+</server>
  <name>
 FTP (optional .netrc; user/passwd supplied) dir list PASV
  </name>
diff --git a/tests/data/test133 b/tests/data/test133
index f496e8f35f98d7a82726d286fe13d6c214cb32c6..d30a6d5a1373433dce0c6e92a99470830656e93c 100644
--- a/tests/data/test133
+++ b/tests/data/test133
@@ -19,6 +19,9 @@ dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
 #
 # Client-side
 <client requires=netrc_debug>
+<server>
+ftp
+</server>
  <name>
 FTP (compulsory .netrc; ignored user/passwd) dir list PASV
  </name>
diff --git a/tests/data/test134 b/tests/data/test134
index 484946fe6fbd8e9aa0b1af4c35d21b1c5c2018a6..258a4f3a9372383b576e19cec6dc7b7075771b6c 100644
--- a/tests/data/test134
+++ b/tests/data/test134
@@ -19,6 +19,9 @@ dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
 #
 # Client-side
 <client requires=netrc_debug>
+<server>
+ftp
+</server>
  <name>
 FTP (optional .netrc; programmatic user/passwd) dir list PASV
  </name>
diff --git a/tests/data/test135 b/tests/data/test135
index ec39ecd0b7e976f026f293354e1feb85a18394df..5d63c2954c1e4226947a917ddb1ec4c9c9fbca0f 100644
--- a/tests/data/test135
+++ b/tests/data/test135
@@ -16,6 +16,9 @@
 
 # Client-side
 <client>
+<server>
+ftp
+</server>
  <name>
 FTP retrieve a byte-range
  </name>
diff --git a/tests/data/test136 b/tests/data/test136
index d17bb043330ca59218dde38bb43909da839e6c7e..3847f8f46f7686b705b6b9f9ffc6f9bc6f7723af 100644
--- a/tests/data/test136
+++ b/tests/data/test136
@@ -7,6 +7,9 @@
 
 # Client-side
 <client>
+<server>
+ftp
+</server>
  <name>
 FTP with user and no password
  </name>
diff --git a/tests/data/test137 b/tests/data/test137
index 3138f177365c91dddb6c0242543f9903dbfd9d65..65a7bc762c27ae2b226bd826fe4e478e39951d3d 100644
--- a/tests/data/test137
+++ b/tests/data/test137
@@ -7,6 +7,9 @@ this is file contents
 
 # Client-side
 <client>
+<server>
+ftp
+</server>
  <name>
 FTP download without size in RETR string
  </name>
diff --git a/tests/data/test138 b/tests/data/test138
index 0d8bb90abde0399efabfd1689edcd0684b90b6cb..af862e74ee5a730de464880f21a89f68755fa740 100644
--- a/tests/data/test138
+++ b/tests/data/test138
@@ -10,6 +10,9 @@ this is file contents
 
 # Client-side
 <client>
+<server>
+ftp
+</server>
  <name>
 FTP download without size in RETR string and no SIZE command
  </name>
diff --git a/tests/data/test139 b/tests/data/test139
index dd87118f1547700dcc4eabedf045a6a745f1bb4f..8d58a9b4ee2cc922475fd9073af75c7c6173dcf6 100644
--- a/tests/data/test139
+++ b/tests/data/test139
@@ -10,6 +10,9 @@ this is file contents
 
 # Client-side
 <client>
+<server>
+ftp
+</server>
  <name>
 FTP download a newer file with -z
  </name>
diff --git a/tests/data/test14 b/tests/data/test14
index 795a9b4dbfae5b4fcae9a6fa6daf6dd71745e9f3..722383d7965f1212390ff63d7cdc455719c43f46 100644
--- a/tests/data/test14
+++ b/tests/data/test14
@@ -10,6 +10,9 @@ Connection: close
 
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 HTTP HEAD with Connection: close
  </name>
diff --git a/tests/data/test140 b/tests/data/test140
index eecec6029fb390bbd7b98795bd687db06b95203a..e0718e111aefa108d54d0eb27a235f31cf634393 100644
--- a/tests/data/test140
+++ b/tests/data/test140
@@ -9,6 +9,9 @@
 
 # Client-side
 <client>
+<server>
+ftp
+</server>
  <name>
 FTP download file with -z, expected to not transfer
  </name>
diff --git a/tests/data/test141 b/tests/data/test141
index 64960958686f926fdfcd8253e01aade2a18271fb..d12003a5122758cabd4fd9c8f6899d9b52ed6ead 100644
--- a/tests/data/test141
+++ b/tests/data/test141
@@ -9,6 +9,9 @@
 
 # Client-side
 <client>
+<server>
+ftp
+</server>
  <name>
 FTP download info with -I
  </name>
diff --git a/tests/data/test142 b/tests/data/test142
index 680e08a01a27c33e9c7abcacf0d090c2292777a5..b9470ab3fb9c72de6aff2b000b898c9b4cf7aabe 100644
--- a/tests/data/test142
+++ b/tests/data/test142
@@ -6,6 +6,9 @@
 
 # Client-side
 <client>
+<server>
+ftp
+</server>
  <name>
 FTP URL with too deep (100+) dir hierarchy
  </name>
diff --git a/tests/data/test15 b/tests/data/test15
index 4a89537397669b657a90e10bf0f69bc8e3e2ab7d..224c0d5aaecf008a749fa980304c57c8f798e31f 100644
--- a/tests/data/test15
+++ b/tests/data/test15
@@ -12,6 +12,9 @@ Repeated nonsense-headers
 
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 --write-out test
  </name>
diff --git a/tests/data/test16 b/tests/data/test16
index eadcedd832c4ea0e7764b425e471b8e817f59a69..c31cf1acd15044507272fcbf94d696044a595279 100644
--- a/tests/data/test16
+++ b/tests/data/test16
@@ -13,6 +13,9 @@ the content goes here
 
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 HTTP with proxy athorization
  </name>
diff --git a/tests/data/test17 b/tests/data/test17
index ae799bd629e925bf657e73c26e60eb72790a2dc5..a3f30b2bd3380c66ab7617110b13190e13fed91e 100644
--- a/tests/data/test17
+++ b/tests/data/test17
@@ -10,6 +10,9 @@ This is the proof it works
 
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 HTTP with config file on stdin
  </name>
diff --git a/tests/data/test18 b/tests/data/test18
index 04fb5ad8c726f5a2d4a9cb045fee59a81c3caca7..053909c947128bbfe3c1f7c593b2f7152c2554c7 100644
--- a/tests/data/test18
+++ b/tests/data/test18
@@ -22,6 +22,9 @@ hoo
 
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 multiple requests using {} in URL
  </name>
diff --git a/tests/data/test19 b/tests/data/test19
index 5e2b352c38465948551a15da887ec189b6171a71..0313ec7de9ce8de0c16098a3ef7674e6c663023b 100644
--- a/tests/data/test19
+++ b/tests/data/test19
@@ -6,6 +6,9 @@
 
 # Client-side
 <client>
+<server>
+none
+</server>
  <name>
 attempt connect to non-listening socket
  </name>
diff --git a/tests/data/test190 b/tests/data/test190
index 947fda9ad5beabb506e9f47998ca1eee495c9dbd..5c75b9f41270ee0dc68da7f537e97ce786720571 100644
--- a/tests/data/test190
+++ b/tests/data/test190
@@ -5,6 +5,9 @@ moooooooo
 
 # Client-side
 <client>
+<server>
+ftp
+</server>
  <name>
 FTP download with strict timeout and slow CWD
  </name>
diff --git a/tests/data/test2 b/tests/data/test2
index d8c72d0742521f10ea15c21652c0344efbe63411..e1357130c41a3337e6958be83f911c070eafd64f 100644
--- a/tests/data/test2
+++ b/tests/data/test2
@@ -14,6 +14,9 @@ Funny-head: yesyes
 #
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 HTTP GET with user and password
  </name>
diff --git a/tests/data/test20 b/tests/data/test20
index 943596430bfc97c6118e906752b3d6e49e876af1..0b47595d7f39cb8e0ac5520500ed7fc7cb411dff 100644
--- a/tests/data/test20
+++ b/tests/data/test20
@@ -6,6 +6,9 @@
 
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 attempt connect to non-existing host name
  </name>
diff --git a/tests/data/test200 b/tests/data/test200
index 709de52fe61fd4dfe2771c571e589bc2e6e0181b..a8af499e30737aa2bd04b10c7a59d80c48165873 100644
--- a/tests/data/test200
+++ b/tests/data/test200
@@ -11,6 +11,9 @@ moo
 
 # Client-side
 <client>
+<server>
+none
+</server>
  <name>
 basic file:// file
  </name>
diff --git a/tests/data/test201 b/tests/data/test201
index f441be801a25dff9481435070044627cdf7a5f68..3e6d937972dc88a0079f0cd83532a52ef91813ab 100644
--- a/tests/data/test201
+++ b/tests/data/test201
@@ -6,6 +6,9 @@
 
 # Client-side
 <client>
+<server>
+none
+</server>
  <name>
 missing file:// file
  </name>
diff --git a/tests/data/test202 b/tests/data/test202
index 4a7fd313e81384d28227823e2c6df04836734d66..ef679e07a053b798915584fa63226934422e16a1 100644
--- a/tests/data/test202
+++ b/tests/data/test202
@@ -6,6 +6,9 @@
 
 # Client-side
 <client>
+<server>
+none
+</server>
  <name>
 two file:// URLs to stdout
  </name>
diff --git a/tests/data/test21 b/tests/data/test21
index 168731db6e8949a686b2ed59fd03266ffd3de4d6..cbd22947fb7d436101a53d404df50f77697bd034 100644
--- a/tests/data/test21
+++ b/tests/data/test21
@@ -6,6 +6,9 @@
 
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 use curl with multiple request methods
  </name>
diff --git a/tests/data/test22 b/tests/data/test22
index 86e3da100387740d173b81f58553a803b532fe41..686a6bb9daf8a064058b4228003682c166a1084c 100644
--- a/tests/data/test22
+++ b/tests/data/test22
@@ -10,6 +10,9 @@ This is the proof it works
 
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 get HTTP with URL > 10000 bytes
  </name>
diff --git a/tests/data/test23 b/tests/data/test23
index 1a30b303d4d68f63e758386591a8e9131bc71dbc..dfd0967f893496ae406d62c36fc1862ae584963f 100644
--- a/tests/data/test23
+++ b/tests/data/test23
@@ -6,6 +6,9 @@
 
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 unsupported protocol:// URL
  </name>
diff --git a/tests/data/test24 b/tests/data/test24
index 2b0167c390f6179b7b93884784fc176c0911ef4c..74a012ff71f22aaf952fb7d87d46257323fce478 100644
--- a/tests/data/test24
+++ b/tests/data/test24
@@ -10,6 +10,9 @@ This silly page doesn't reaaaaaly exist so you should not get it.
 
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 HTTP GET fail silently on HTTP error return
  </name>
diff --git a/tests/data/test25 b/tests/data/test25
index cdad6ee183ec313f6d7438a19e3ff890df7e1f08..2ee484a21bf987e5dfa2f0f08380c328e5e2799c 100644
--- a/tests/data/test25
+++ b/tests/data/test25
@@ -51,6 +51,9 @@ Connection: close
 
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 looping HTTP Location: following with --max-redirs, no persistance
  </name>
diff --git a/tests/data/test26 b/tests/data/test26
index 7e08efcc19873788468b548f8daadf5a3987ac99..df42f20eb588ef330ffd741925d7db7ae8b27dd6 100644
--- a/tests/data/test26
+++ b/tests/data/test26
@@ -11,6 +11,9 @@ Connection: close
 
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 specify more -o than URLs
  </name>
diff --git a/tests/data/test27 b/tests/data/test27
index b5851c2406bd6ed6be694479be384a7e3bf87cf6..c0aa6a5ec8d530b9423cc588cd27e462773d3650 100644
--- a/tests/data/test27
+++ b/tests/data/test27
@@ -11,6 +11,9 @@ Set-Cookie: path=/; thewinneris=nowayyouwin;
 
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 Get same cookie page several times
  </name>
diff --git a/tests/data/test28 b/tests/data/test28
index 57349e138f676b6a23cbbf1c1d200cd8652571f4..d59949fa6fe019e5e090fb7edd6496cfe0b6526f 100644
--- a/tests/data/test28
+++ b/tests/data/test28
@@ -36,6 +36,9 @@ If this is received, the location following worked
 
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 HTTP Location: following with extra spaces in header
  </name>
diff --git a/tests/data/test29 b/tests/data/test29
index 66ff5b9fca33056ffd40b1e206c4894d1c653585..465223f984a10cfbfbe4deb678a9b836e13329c6 100644
--- a/tests/data/test29
+++ b/tests/data/test29
@@ -14,6 +14,9 @@ wait 10
 
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 HTTP with 2 secs timeout
  </name>
diff --git a/tests/data/test3 b/tests/data/test3
index ac1bf51b9a2277c07b858e9bdce812362fa4f5a8..e6bb28f22c9a7ae1d69640d65882c980020c7837 100644
--- a/tests/data/test3
+++ b/tests/data/test3
@@ -14,6 +14,9 @@ this is data even though Content-Length is set to zero
 #
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 HTTP POST with user and password
  </name>
diff --git a/tests/data/test30 b/tests/data/test30
index 8a5de32b64fddcd99e991c14b595c41204082bd3..16b3ad124c37d56729cfb9b9f7667dbaf90e18f2 100644
--- a/tests/data/test30
+++ b/tests/data/test30
@@ -6,6 +6,9 @@
 
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 HTTP with no data in server reply
  </name>
diff --git a/tests/data/test300 b/tests/data/test300
index 7daf261e9f02622e7d9259356df389fe2dfb4bde..4840f63ff1cd053bb3403e9d84270820c6754d15 100644
--- a/tests/data/test300
+++ b/tests/data/test300
@@ -14,6 +14,9 @@ MooMoo
 #
 # Client-side
 <client>
+<server>
+https
+</server>
  <name>
 simple HTTPS GET
  </name>
diff --git a/tests/data/test301 b/tests/data/test301
index 88ee14b3b7fd078475514008c2a49679e785ef08..9226a476b5d8c717c89e6c1a0ede86106b931b56 100644
--- a/tests/data/test301
+++ b/tests/data/test301
@@ -14,6 +14,9 @@ Funny-head: yesyes
 #
 # Client-side
 <client>
+<server>
+https
+</server>
  <name>
 HTTPS GET with user and password
  </name>
diff --git a/tests/data/test302 b/tests/data/test302
index 61202bf781cea593d6efa61e56c2885fe7fbe008..70f5791d44ec8c2d51d9a4b9b5710fec3164916b 100644
--- a/tests/data/test302
+++ b/tests/data/test302
@@ -7,6 +7,9 @@ MOOOOO
 #
 # Client-side
 <client>
+<server>
+https
+</server>
  <name>
 HTTPS GET over HTTP proxy fails
  </name>
diff --git a/tests/data/test303 b/tests/data/test303
index 1b2253d41097a1d7cd93d27cab22212509ae429a..d7a55a7804271ceddf12ba29cde5842cf6b50b9b 100644
--- a/tests/data/test303
+++ b/tests/data/test303
@@ -14,6 +14,9 @@ wait 10
 
 # Client-side
 <client>
+<server>
+https
+</server>
  <name>
 HTTPS with 2 secs timeout
  </name>
diff --git a/tests/data/test304 b/tests/data/test304
index 69f654ba2e6ea67c2e060893c7418768a981fd53..c715cd69e6ae12ae6b00f51eba4c6d223118fec9 100644
--- a/tests/data/test304
+++ b/tests/data/test304
@@ -12,6 +12,9 @@ blablabla
 
 # Client-side
 <client>
+<server>
+https
+</server>
  <name>
 HTTPS multipart formpost
  </name>
diff --git a/tests/data/test305 b/tests/data/test305
index 70432039f114954240a12696fd88c39edead68ef..92d9d67d7b9b903ab50dc4a22c1c3d02706ac804 100644
--- a/tests/data/test305
+++ b/tests/data/test305
@@ -6,6 +6,9 @@
 
 # Client-side
 <client>
+<server>
+https
+</server>
  <name>
 insecure HTTPS without permission
  </name>
diff --git a/tests/data/test306 b/tests/data/test306
index bb07b524d5426b83c47acd8ae9eb2d5bf79a0847..1704d7c93bde3c714fb7c72bf39647f4f7d32916 100644
--- a/tests/data/test306
+++ b/tests/data/test306
@@ -27,6 +27,9 @@ verify
 #
 # Client-side
 <client>
+<server>
+https
+</server>
  <name>
 HTTPS GET, receive no headers only data!
  </name>
diff --git a/tests/data/test31 b/tests/data/test31
index 8ff61a0dfacae2fea6685b1e1e398b3d47f31036..f4bb622151217a50a43ca109c9e1073bab1c5148 100644
--- a/tests/data/test31
+++ b/tests/data/test31
@@ -23,6 +23,9 @@ boo
 
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 HTTP with weirdly formatted cookies and cookiejar storage
  </name>
diff --git a/tests/data/test32 b/tests/data/test32
index 69573945b328d94f950ef0cbf96b83238cc35969..176639a71c4b0fdccf51d60d1266b486f0cdebcc 100644
--- a/tests/data/test32
+++ b/tests/data/test32
@@ -20,6 +20,9 @@ Funny-head: yesyes
 #
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 HTTP with -d and -G
  </name>
diff --git a/tests/data/test33 b/tests/data/test33
index f255bc4e0e7a8917fa573d7c93345cb08003e3e1..3b94f044e78385c377f5efc954c91b26b9c20da9 100644
--- a/tests/data/test33
+++ b/tests/data/test33
@@ -7,6 +7,9 @@
 
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 HTTP PUT with resume
  </name>
diff --git a/tests/data/test34 b/tests/data/test34
index ea7d239b24520c6f9e91058770dcad3d2451cd4d..f8a526d4d379f11b7ed82fffbf8cc84b325f5fab 100644
--- a/tests/data/test34
+++ b/tests/data/test34
@@ -30,6 +30,9 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbb
 #
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 HTTP GET with chunked Transfer-Encoding
  </name>
diff --git a/tests/data/test36 b/tests/data/test36
index 75b05ccee80baa9c6bed71e30958cf87ec21bfbb..effaeb73a4aece6d978558a53c06574e9d34b821 100644
--- a/tests/data/test36
+++ b/tests/data/test36
@@ -26,6 +26,9 @@ a
 #
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 HTTP GET with bad chunked Transfer-Encoding
  </name>
diff --git a/tests/data/test37 b/tests/data/test37
index 18df0c70690cbac9771ee3d894b371da067cdc3e..d184b5684e04bc82f27f444274352e5b8aead6f9 100644
--- a/tests/data/test37
+++ b/tests/data/test37
@@ -8,6 +8,9 @@
 #
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 HTTP GET with nothing returned from server
  </name>
diff --git a/tests/data/test38 b/tests/data/test38
index dca54e36d419fe8f7610bf79963f997cd8ce9565..32798161785a5218c649e966eb0d16bf45c2bcab 100644
--- a/tests/data/test38
+++ b/tests/data/test38
@@ -12,6 +12,9 @@ todelooooo lalalala yada yada, we know nothing about ranges ;-)
 
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 HTTP resume request without server supporting it
  </name>
diff --git a/tests/data/test39 b/tests/data/test39
index e4f7f3cf7315dc4b4199e40bc3e8124df6d19524..6ef41078e2f0cdc540954eb260f84ea62ce441b0 100644
--- a/tests/data/test39
+++ b/tests/data/test39
@@ -12,6 +12,9 @@ blablabla
 
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 HTTP RFC1867-type formposting with filename= and type=
  </name>
diff --git a/tests/data/test4 b/tests/data/test4
index 9ca90c9a112007e270355ba941628a6b5472a793..cf2a64a5c91acdcb24818b5bfd0b4ce43327cbd4 100644
--- a/tests/data/test4
+++ b/tests/data/test4
@@ -14,6 +14,9 @@ Funny-head: yesyes
 #
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 Replaced internal and added custom HTTP headers
  </name>
diff --git a/tests/data/test400 b/tests/data/test400
index c8b361992e14a8ae1db8f4e9658917604c52f209..47f5f288b945106f2ecbcd22e2ffa1835ad35122 100644
--- a/tests/data/test400
+++ b/tests/data/test400
@@ -19,6 +19,9 @@ dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
 #
 # Client-side
 <client>
+<server>
+ftps
+</server>
  <name>
 FTPS dir list PASV
  </name>
diff --git a/tests/data/test401 b/tests/data/test401
index a733eb2b31be6dc24804f685adb04e52a0cbebcc..12a72746f46f8b7e8893b703ef46328eadf4cd77 100644
--- a/tests/data/test401
+++ b/tests/data/test401
@@ -5,6 +5,9 @@ moooooooo
 
 # Client-side
 <client>
+<server>
+ftps
+</server>
  <name>
 FTPS download with strict timeout and slow CWD
  </name>
diff --git a/tests/data/test402 b/tests/data/test402
index f9622c6dd22cb9b0c16bd74309b33d343894c3d4..96fbcec42bac1e1b6dbb6fc7e8d01d25612923f0 100644
--- a/tests/data/test402
+++ b/tests/data/test402
@@ -5,6 +5,9 @@ moooooooo
 
 # Client-side
 <client>
+<server>
+ftps
+</server>
 <killserver>
 ftp
 </killserver>
diff --git a/tests/data/test403 b/tests/data/test403
index 4c04366a52578dbe5d9f563ba763a9db04970bdc..8092fd0c656ee76a912a17e438822caa515906e4 100644
--- a/tests/data/test403
+++ b/tests/data/test403
@@ -8,6 +8,9 @@
 #
 # Client-side
 <client>
+<server>
+ftps
+</server>
  <name>
 insecure FTPS without permission
  </name>
diff --git a/tests/data/test43 b/tests/data/test43
index a3fba868ae0cc229cd7ec984f58f405939e9fc20..adef3bdd130e9283c6c5982b78befb8ac423eff1 100644
--- a/tests/data/test43
+++ b/tests/data/test43
@@ -36,6 +36,9 @@ If this is received, the location following worked
 
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 HTTP Location: following over HTTP proxy
  </name>
diff --git a/tests/data/test44 b/tests/data/test44
index 14fa41b8c0aa021554812c9d55554e1f53072941..0460df5f3064d824ca3198671f36593c3695af93 100644
--- a/tests/data/test44
+++ b/tests/data/test44
@@ -12,6 +12,9 @@ blablabla
 
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 HTTP RFC1867-type formposting without Expect: header
  </name>
diff --git a/tests/data/test45 b/tests/data/test45
index 06eda2ff4ab72f2f913505a9d604b1063f9f5e60..9897007ea890ec73783fc921188e4c0eb2e522d9 100644
--- a/tests/data/test45
+++ b/tests/data/test45
@@ -36,6 +36,9 @@ If this is received, the location following worked
 
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 simple HTTP Location: without protocol in initial URL
  </name>
diff --git a/tests/data/test46 b/tests/data/test46
index aa4691d4f0fce7976dd5c3be05b9e2e4a7da71c7..b4ff3e6b60ae1a4f1cbd6ea6f71a935d6f790ec2 100644
--- a/tests/data/test46
+++ b/tests/data/test46
@@ -17,6 +17,9 @@ This server reply is for testing a simple Location: following
 
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 HTTP, get cookies and store in cookie jar
  </name>
diff --git a/tests/data/test47 b/tests/data/test47
index f6831b7802517d48d6ac43743defa4bf48be90a3..2a33593724cc733b477a15d87b36b2a49136ff0e 100644
--- a/tests/data/test47
+++ b/tests/data/test47
@@ -13,6 +13,9 @@ Server: test-server/fake
 #
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 simple HTTP 1.0 GET
  </name>
diff --git a/tests/data/test48 b/tests/data/test48
index 66a0c2a072298f06c06b3f0ba20719be8cfbacc2..36aee249aa579e19b97b08953b6ffd1a28393407 100644
--- a/tests/data/test48
+++ b/tests/data/test48
@@ -12,6 +12,9 @@ Connection: close
 #
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 HTTP with -d and -G and -I
  </name>
diff --git a/tests/data/test49 b/tests/data/test49
index 8c31ed4b4d598efc4b37c2e8663b309b70bec307..b9c3419fba8832fd85964358ee396b07f3435a0c 100644
--- a/tests/data/test49
+++ b/tests/data/test49
@@ -34,6 +34,9 @@ body
 #
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 HTTP follow redirect with ../
  </name>
diff --git a/tests/data/test5 b/tests/data/test5
index 8ced1d739e235fa0d9cbc5514aa4a5868800b990..c04c66a82fc7daf33c69ae1beed9231e478e5ec7 100644
--- a/tests/data/test5
+++ b/tests/data/test5
@@ -14,6 +14,9 @@ Funny-head: yesyes
 #
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 HTTP over proxy
  </name>
diff --git a/tests/data/test50 b/tests/data/test50
index 8b304265cfe678562a3dec7bbf4990fe0cccb49f..38b274b922a6eecd7ea89c5cedb76bbf54ba4338 100644
--- a/tests/data/test50
+++ b/tests/data/test50
@@ -34,6 +34,9 @@ body
 #
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 HTTP follow redirect with ../../
  </name>
diff --git a/tests/data/test51 b/tests/data/test51
index b2271e846e8ec8f391c1dc1dfad7b3b34a21ee50..717a5e016e4503ee359d4d5d1dc422dc1d17c54c 100644
--- a/tests/data/test51
+++ b/tests/data/test51
@@ -34,6 +34,9 @@ body
 #
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 HTTP follow redirect with exessive ../
  </name>
diff --git a/tests/data/test52 b/tests/data/test52
index ddaa2d7252065cdcaba26555b4c61d1f96d4c7b7..c9ec09e7f2d61a8aea6f12b981cf1185bcb5846c 100644
--- a/tests/data/test52
+++ b/tests/data/test52
@@ -34,6 +34,9 @@ body
 #
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 HTTP follow redirect with ./-prefix
  </name>
diff --git a/tests/data/test53 b/tests/data/test53
index 2975b31c8cab8de5541678a389562c1a610c58d8..9ccac219bafb62709bb49dd8421f2a71af2b0a5c 100644
--- a/tests/data/test53
+++ b/tests/data/test53
@@ -13,6 +13,9 @@ This server says moo
 
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 HTTP, junk session cookies
  </name>
diff --git a/tests/data/test54 b/tests/data/test54
index 1cedf902d3a1f86e635036318af49504faffe362..5582ee1e97af02f2d96f13044e2e5ce106ebea82 100644
--- a/tests/data/test54
+++ b/tests/data/test54
@@ -11,6 +11,9 @@ This server reply is for testing
 
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 HTTP with blank Location:
  </name>
diff --git a/tests/data/test55 b/tests/data/test55
index c65d95327c7ccbd83dac357a036bd0dd4cb132b3..11e25ae0ad572d2c769743c14d73bfde703935c8 100644
--- a/tests/data/test55
+++ b/tests/data/test55
@@ -28,6 +28,9 @@ body
 </reply>
 
 <client>
+<server>
+http
+</server>
  <name>
 HTTP follow redirect with single slash in path
  </name>
diff --git a/tests/data/test56 b/tests/data/test56
index 7173f5f23a20c10b47f431527be4e758d6659903..889182a26f679e42442b97b8cefd6fb0b4466c38 100644
--- a/tests/data/test56
+++ b/tests/data/test56
@@ -10,6 +10,9 @@ This is the proof it works
 
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 HTTP POST with *HUGE* request and chunked transfer-encoding
  </name>
diff --git a/tests/data/test57 b/tests/data/test57
index ce7bed52676ea9450427622962a69fb4ff59f451..e091a39cbe2b3f7ab9b4ab5837ab2f885fce76e1 100644
--- a/tests/data/test57
+++ b/tests/data/test57
@@ -10,6 +10,9 @@ Content-Type: text/html; charset=ISO-8859-4
 
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 HTTP content-type with spaces in
  </name>
diff --git a/tests/data/test58 b/tests/data/test58
index 7b38dde16cbf0f641a1b43d737979da1a1efb5d4..b7f413d5b0364cadc7931b2b30bb129ebcd84fb1 100644
--- a/tests/data/test58
+++ b/tests/data/test58
@@ -12,6 +12,9 @@ blablabla
 
 # Client-side
 <client>
+<server>
+http
+</server>
 <name>
 HTTP PUT from file with weird letters
 </name>
diff --git a/tests/data/test59 b/tests/data/test59
index 90a813c60022fac69f661424db7e4ff56a159185..198e4828fcef112fcc718174f401567a2901841f 100644
--- a/tests/data/test59
+++ b/tests/data/test59
@@ -13,6 +13,9 @@ hej
 #
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 HTTP URL with slash but with "parameter"
  </name>
diff --git a/tests/data/test6 b/tests/data/test6
index c1bf5b34d1e4d77c25671511a4c5867d19205b29..0e1c3c715a3bf980b7e5e52f7e1a68ffcb39096e 100644
--- a/tests/data/test6
+++ b/tests/data/test6
@@ -12,6 +12,9 @@ Funny-head: yesyes
 
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 HTTP with simple cookie send
  </name>
diff --git a/tests/data/test60 b/tests/data/test60
index 7ee2dfc877c7861401d3edbdf091c9c1faf05a4c..623dbe1f00e934575c0fd050352a4b28cd057b01 100644
--- a/tests/data/test60
+++ b/tests/data/test60
@@ -12,6 +12,9 @@ blablabla
 
 # Client-side
 <client>
+<server>
+http
+</server>
 <name>
 HTTP PUT from stdin with wrong content-length
 </name>
diff --git a/tests/data/test61 b/tests/data/test61
index 0c25385e6b9179c14b05fc3b2ef68d5b9c062d60..49cc48448c1970cb39e3ca585e1c5a1801d0301b 100644
--- a/tests/data/test61
+++ b/tests/data/test61
@@ -18,6 +18,9 @@ boo
 
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 HTTP with various cookies and custom Host:
  </name>
diff --git a/tests/data/test7 b/tests/data/test7
index 80f7b560c690bfbf28f806d3519ca144e7ab0e54..5299529a5f962b88728b7b87257849bcc5a229b9 100644
--- a/tests/data/test7
+++ b/tests/data/test7
@@ -15,6 +15,9 @@ Set-Cookie: partmatch=present; domain=.0.0.1; path=/;
 
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 HTTP with cookie parser and header recording
  </name>
diff --git a/tests/data/test8 b/tests/data/test8
index ec12248db77ba1a567e4ee1eac19e4a4b1547dd1..5ee7fc857d832d5e8ca32452a32f6676f00eaff8 100644
--- a/tests/data/test8
+++ b/tests/data/test8
@@ -10,6 +10,9 @@ Server: test-server/fake
 
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 HTTP with cookie parsing from header file
  </name>
diff --git a/tests/data/test9 b/tests/data/test9
index ec5b3d35b968cb798c0b0e9d70d6608b76ff9d71..3eb6f48785aedacc3ea4e75a1801844ea4827ea2 100644
--- a/tests/data/test9
+++ b/tests/data/test9
@@ -12,6 +12,9 @@ blablabla
 
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 HTTP RFC1867-type formposting
  </name>