Each test case now specifies which server(s) it needs, without relying on the

test number.

114 files changed, 342 insertions, 0 deletions

diff --git a/tests/data/test1 b/tests/data/test1
index 78815a304..42d3ffbe3 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 ef34e8712..3b8674943 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 c5ccce786..8fbb1714e 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 a191c4ba2..eabc6e2ef 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 186732625..a124581fd 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 d362feaee..e46391318 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 ef6b9fc5d..a37b84f5d 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 3ae69d4e5..b077ecc75 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 4f8a3b317..4b18095f5 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 ebbeefee9..bb69f16b7 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 eadc076f5..27c5c6d23 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 a109c62c0..4aad72123 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 9a9ccdd8a..d06cb64f6 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 310517468..4014daa82 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 8e80ecb62..78b6141af 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 b55152242..e519d6756 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 5dcc6afaf..6357897b4 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 52f4378b2..0dfff77a0 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 73ee731f2..204b0ccd9 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 618c26d00..0bc8620c8 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 edd5b7e09..428cbee9d 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 ffd3e0130..b97c0c961 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 4aa681482..2e53a82b2 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 9f105f0cf..98dc39f55 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 bb97eff4a..2fcf01539 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 c94b6262f..64d26f9e2 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 f1a481b1b..3e385502a 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 218548aa7..066d70960 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 6ae97b780..721f3271f 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 6fa05add5..57f8e0105 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 060eefc50..1c3216523 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 34618308d..aafe559d1 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 bb09ec749..a09631e0c 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 5049946aa..251a12d18 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 21a69c02b..86a422564 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 9576ac847..e1a8de78f 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 128de5a0e..4d1f10b43 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 f496e8f35..d30a6d5a1 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 484946fe6..258a4f3a9 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 ec39ecd0b..5d63c2954 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 d17bb0433..3847f8f46 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 3138f1773..65a7bc762 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 0d8bb90ab..af862e74e 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 dd87118f1..8d58a9b4e 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 795a9b4db..722383d79 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 eecec6029..e0718e111 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 649609586..d12003a51 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 680e08a01..b9470ab3f 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 4a8953739..224c0d5aa 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 eadcedd83..c31cf1acd 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 ae799bd62..a3f30b2bd 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 04fb5ad8c..053909c94 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 5e2b352c3..0313ec7de 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 947fda9ad..5c75b9f41 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 d8c72d074..e1357130c 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 943596430..0b47595d7 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 709de52fe..a8af499e3 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 f441be801..3e6d93797 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 4a7fd313e..ef679e07a 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 168731db6..cbd22947f 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 86e3da100..686a6bb9d 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 1a30b303d..dfd0967f8 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 2b0167c39..74a012ff7 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 cdad6ee18..2ee484a21 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 7e08efcc1..df42f20eb 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 b5851c240..c0aa6a5ec 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 57349e138..d59949fa6 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 66ff5b9fc..465223f98 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 ac1bf51b9..e6bb28f22 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 8a5de32b6..16b3ad124 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 7daf261e9..4840f63ff 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 88ee14b3b..9226a476b 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 61202bf78..70f5791d4 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 1b2253d41..d7a55a780 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 69f654ba2..c715cd69e 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 70432039f..92d9d67d7 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 bb07b524d..1704d7c93 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 8ff61a0df..f4bb62215 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 69573945b..176639a71 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 f255bc4e0..3b94f044e 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 ea7d239b2..f8a526d4d 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 75b05ccee..effaeb73a 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 18df0c706..d184b5684 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 dca54e36d..327981617 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 e4f7f3cf7..6ef41078e 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 9ca90c9a1..cf2a64a5c 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 c8b361992..47f5f288b 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 a733eb2b3..12a72746f 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 f9622c6dd..96fbcec42 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 4c04366a5..8092fd0c6 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 a3fba868a..adef3bdd1 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 14fa41b8c..0460df5f3 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 06eda2ff4..9897007ea 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 aa4691d4f..b4ff3e6b6 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 f6831b780..2a3359372 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 66a0c2a07..36aee249a 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 8c31ed4b4..b9c3419fb 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 8ced1d739..c04c66a82 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 8b304265c..38b274b92 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 b2271e846..717a5e016 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 ddaa2d725..c9ec09e7f 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 2975b31c8..9ccac219b 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 1cedf902d..5582ee1e9 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 c65d95327..11e25ae0a 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 7173f5f23..889182a26 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 ce7bed526..e091a39cb 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 7b38dde16..b7f413d5b 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 90a813c60..198e4828f 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 c1bf5b34d..0e1c3c715 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 7ee2dfc87..623dbe1f0 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 0c25385e6..49cc48448 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 80f7b560c..5299529a5 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 ec12248db..5ee7fc857 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 ec5b3d35b..3eb6f4878 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>