diff --git a/tests/data/test1001 b/tests/data/test1001
index 9f8e53432..8d1a2d422 100644
--- a/tests/data/test1001
+++ b/tests/data/test1001
@@ -2,8 +2,9 @@
HTTP
-HTTP Digest auth
HTTP PUT
+HTTP proxy
+HTTP Digest auth
Resume
Content-Range
CUSTOMREQUEST
diff --git a/tests/data/test1002 b/tests/data/test1002
index 6e51ff610..bf9bbed91 100644
--- a/tests/data/test1002
+++ b/tests/data/test1002
@@ -2,8 +2,9 @@
HTTP
-HTTP Digest auth
HTTP PUT
+HTTP proxy
+HTTP Digest auth
Resume
Content-Range
CUSTOMREQUEST
diff --git a/tests/data/test1034 b/tests/data/test1034
index 09b8406f6..a710af25b 100644
--- a/tests/data/test1034
+++ b/tests/data/test1034
@@ -3,6 +3,7 @@
HTTP
HTTP GET
+HTTP proxy
IDN
FAILURE
diff --git a/tests/data/test1035 b/tests/data/test1035
index f982d9d4c..7f104c7b6 100644
--- a/tests/data/test1035
+++ b/tests/data/test1035
@@ -3,6 +3,7 @@
HTTP
HTTP GET
+HTTP proxy
IDN
FAILURE
diff --git a/tests/data/test16 b/tests/data/test16
index 05e630e9e..d926a1fb1 100644
--- a/tests/data/test16
+++ b/tests/data/test16
@@ -3,9 +3,11 @@
HTTP
HTTP GET
+HTTP proxy
HTTP proxy Basic auth
+
# Server-side
diff --git a/tests/data/test165 b/tests/data/test165
index 264d59c99..2893696a3 100644
--- a/tests/data/test165
+++ b/tests/data/test165
@@ -3,6 +3,7 @@
HTTP
HTTP GET
+HTTP proxy
IDN
diff --git a/tests/data/test170 b/tests/data/test170
index ec9116a67..4db486722 100644
--- a/tests/data/test170
+++ b/tests/data/test170
@@ -1,4 +1,13 @@
+
+
+HTTP
+HTTP POST
+HTTP proxy
+HTTP proxy NTLM auth
+
+
+
# Server-side
diff --git a/tests/data/test171 b/tests/data/test171
index 6b79588a5..de02d79b5 100644
--- a/tests/data/test171
+++ b/tests/data/test171
@@ -3,6 +3,7 @@
HTTP
HTTP GET
+HTTP proxy
cookies
diff --git a/tests/data/test183 b/tests/data/test183
index 5fd01442a..e9db2ba0c 100644
--- a/tests/data/test183
+++ b/tests/data/test183
@@ -3,6 +3,7 @@
HTTP
HTTP GET
+HTTP proxy
persistent connection
diff --git a/tests/data/test184 b/tests/data/test184
index 48767e216..0727750f7 100644
--- a/tests/data/test184
+++ b/tests/data/test184
@@ -3,6 +3,7 @@
HTTP
HTTP GET
+HTTP proxy
followlocation
diff --git a/tests/data/test185 b/tests/data/test185
index 02bb3d37f..93542aa21 100644
--- a/tests/data/test185
+++ b/tests/data/test185
@@ -3,6 +3,7 @@
HTTP
HTTP GET
+HTTP proxy
followlocation
diff --git a/tests/data/test208 b/tests/data/test208
index eac3d5572..3c8028e1f 100644
--- a/tests/data/test208
+++ b/tests/data/test208
@@ -1,4 +1,13 @@
+
+
+FTP
+HTTP
+HTTP PUT
+HTTP proxy
+
+
+
# Server-side
@@ -20,7 +29,7 @@ http
ftp
-HTTP PUT a to a FTP URL with username+password - over HTTP proxy
+HTTP PUT to a FTP URL with username+password - over HTTP proxy
-x http://%HOSTIP:%HTTPPORT ftp://daniel:mysecret@host.com/we/want/208 -T log/test208.txt
diff --git a/tests/data/test234 b/tests/data/test234
index 47cd0270e..8ea79aef1 100644
--- a/tests/data/test234
+++ b/tests/data/test234
@@ -1,4 +1,14 @@
+
+
+HTTP
+HTTP GET
+HTTP proxy
+HTTP proxy Basic auth
+followlocation
+
+
+
#
# Server-side
diff --git a/tests/data/test239 b/tests/data/test239
index 29d44af7e..1d0610b57 100644
--- a/tests/data/test239
+++ b/tests/data/test239
@@ -1,4 +1,13 @@
+
+
+HTTP
+HTTP POST
+HTTP proxy
+HTTP proxy NTLM auth
+
+
+
# Server-side
diff --git a/tests/data/test243 b/tests/data/test243
index a20bd750a..3c5a7a213 100644
--- a/tests/data/test243
+++ b/tests/data/test243
@@ -3,10 +3,12 @@
HTTP
HTTP GET
---proxy-anyauth
+HTTP proxy
HTTP proxy NTLM auth
+--proxy-anyauth
+
# Server-side
diff --git a/tests/data/test257 b/tests/data/test257
index 1020c613e..c8a11a0ee 100644
--- a/tests/data/test257
+++ b/tests/data/test257
@@ -3,10 +3,13 @@
HTTP
HTTP GET
+HTTP proxy
+HTTP Basic auth
followlocation
netrc
+
# Server-side
diff --git a/tests/data/test275 b/tests/data/test275
index e07b1a83e..17bdfc1cb 100644
--- a/tests/data/test275
+++ b/tests/data/test275
@@ -5,9 +5,12 @@ HTTP
HTTP GET
HTTP CONNECT
HTTP Basic auth
+HTTP proxy
HTTP proxy Basic auth
+proxytunnel
+
#
# Server-side
diff --git a/tests/data/test523 b/tests/data/test523
index 0459d2caf..ff582bdeb 100644
--- a/tests/data/test523
+++ b/tests/data/test523
@@ -3,6 +3,7 @@
HTTP
HTTP GET
+HTTP proxy
CURLOPT_PORT
CURLOPT_PROXY
diff --git a/tests/data/test547 b/tests/data/test547
index 7b0c7324d..b43efc94d 100644
--- a/tests/data/test547
+++ b/tests/data/test547
@@ -4,6 +4,7 @@
HTTP
HTTP POST
POST callback
+HTTP proxy
HTTP proxy NTLM auth
diff --git a/tests/data/test548 b/tests/data/test548
index 5db476386..267adeb5e 100644
--- a/tests/data/test548
+++ b/tests/data/test548
@@ -3,9 +3,11 @@
HTTP
HTTP POST
+HTTP proxy
HTTP proxy NTLM auth
+
# Server-side
diff --git a/tests/data/test549 b/tests/data/test549
index 0c53afa64..654bcea26 100644
--- a/tests/data/test549
+++ b/tests/data/test549
@@ -4,6 +4,7 @@
FTP
CURLOPT_PROXY_TRANSFER_MODE
CURLOPT_PROXY
+HTTP proxy
diff --git a/tests/data/test550 b/tests/data/test550
index 8d27d8a4f..16002ba88 100644
--- a/tests/data/test550
+++ b/tests/data/test550
@@ -2,6 +2,7 @@
FTP
+HTTP proxy
CURLOPT_PROXY_TRANSFER_MODE
CURLOPT_PROXY
@@ -36,7 +37,7 @@ ftp
lib549
-FTP RETR over proxy with CURLOPT_PROXY_TRANSFER_MODE and ascii transfer
+FTP RETR over proxy with CURLOPT_PROXY_TRANSFER_MODE and ASCII transfer
# first URL then proxy
diff --git a/tests/data/test551 b/tests/data/test551
index b3b6110a0..9319a349c 100644
--- a/tests/data/test551
+++ b/tests/data/test551
@@ -5,9 +5,11 @@
HTTP
HTTP POST
POST callback
+HTTP proxy
HTTP proxy Digest auth
+
# Server-side
diff --git a/tests/data/test552 b/tests/data/test552
index 30d533a92..f971be7de 100644
Binary files a/tests/data/test552 and b/tests/data/test552 differ
diff --git a/tests/data/test555 b/tests/data/test555
index 45b38c203..d63197ae9 100644
--- a/tests/data/test555
+++ b/tests/data/test555
@@ -7,6 +7,7 @@
HTTP
HTTP POST
POST callback
+HTTP proxy
HTTP proxy NTLM auth
multi
diff --git a/tests/data/test80 b/tests/data/test80
index 419242638..dded9681a 100644
--- a/tests/data/test80
+++ b/tests/data/test80
@@ -5,9 +5,12 @@ HTTP
HTTP GET
HTTP CONNECT
HTTP Basic auth
+HTTP proxy
HTTP proxy Basic auth
+proxytunnel
+
#
# Server-side
diff --git a/tests/data/test81 b/tests/data/test81
index 3d2ac68fe..f66c354c8 100644
--- a/tests/data/test81
+++ b/tests/data/test81
@@ -3,9 +3,11 @@
HTTP
HTTP GET
+HTTP proxy
HTTP proxy NTLM auth
+
# Server-side
diff --git a/tests/data/test82 b/tests/data/test82
index 7c7f52633..b0eb62956 100644
--- a/tests/data/test82
+++ b/tests/data/test82
@@ -3,6 +3,7 @@
HTTP
HTTP GET
+HTTP proxy
HTTP proxy Basic auth
HTTP proxy NTLM auth
diff --git a/tests/data/test85 b/tests/data/test85
index bab5d09ce..043ef7dab 100644
--- a/tests/data/test85
+++ b/tests/data/test85
@@ -4,9 +4,11 @@
HTTP
HTTP GET
HTTP Basic auth
+HTTP proxy
HTTP proxy Basic auth
+
#
# Server-side