diff --git a/tests/data/test1001 b/tests/data/test1001
index 9f8e53432c..8d1a2d4227 100644
--- a/tests/data/test1001
+++ b/tests/data/test1001
@@ -2,8 +2,9 @@
 <info>
 <keywords>
 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 6e51ff610d..bf9bbed914 100644
--- a/tests/data/test1002
+++ b/tests/data/test1002
@@ -2,8 +2,9 @@
 <info>
 <keywords>
 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 09b8406f6f..a710af25bb 100644
--- a/tests/data/test1034
+++ b/tests/data/test1034
@@ -3,6 +3,7 @@
 <keywords>
 HTTP
 HTTP GET
+HTTP proxy
 IDN
 FAILURE
 </keywords>
diff --git a/tests/data/test1035 b/tests/data/test1035
index f982d9d4cf..7f104c7b60 100644
--- a/tests/data/test1035
+++ b/tests/data/test1035
@@ -3,6 +3,7 @@
 <keywords>
 HTTP
 HTTP GET
+HTTP proxy
 IDN
 FAILURE
 </keywords>
diff --git a/tests/data/test16 b/tests/data/test16
index 05e630e9ed..d926a1fb19 100644
--- a/tests/data/test16
+++ b/tests/data/test16
@@ -3,9 +3,11 @@
 <keywords>
 HTTP
 HTTP GET
+HTTP proxy
 HTTP proxy Basic auth
 </keywords>
 </info>
+
 # Server-side
 <reply>
 <data>
diff --git a/tests/data/test165 b/tests/data/test165
index 264d59c998..2893696a36 100644
--- a/tests/data/test165
+++ b/tests/data/test165
@@ -3,6 +3,7 @@
 <keywords>
 HTTP
 HTTP GET
+HTTP proxy
 IDN
 </keywords>
 </info>
diff --git a/tests/data/test170 b/tests/data/test170
index ec9116a672..4db486722d 100644
--- a/tests/data/test170
+++ b/tests/data/test170
@@ -1,4 +1,13 @@
 <testcase>
+<info>
+<keywords>
+HTTP
+HTTP POST
+HTTP proxy
+HTTP proxy NTLM auth
+</keywords>
+</info>
+
 # Server-side
 <reply>
 </reply>
diff --git a/tests/data/test171 b/tests/data/test171
index 6b79588a5e..de02d79b58 100644
--- a/tests/data/test171
+++ b/tests/data/test171
@@ -3,6 +3,7 @@
 <keywords>
 HTTP
 HTTP GET
+HTTP proxy
 cookies
 </keywords>
 </info>
diff --git a/tests/data/test183 b/tests/data/test183
index 5fd01442a8..e9db2ba0cc 100644
--- a/tests/data/test183
+++ b/tests/data/test183
@@ -3,6 +3,7 @@
 <keywords>
 HTTP
 HTTP GET
+HTTP proxy
 persistent connection
 </keywords>
 </info>
diff --git a/tests/data/test184 b/tests/data/test184
index 48767e2166..0727750f73 100644
--- a/tests/data/test184
+++ b/tests/data/test184
@@ -3,6 +3,7 @@
 <keywords>
 HTTP
 HTTP GET
+HTTP proxy
 followlocation
 </keywords>
 </info>
diff --git a/tests/data/test185 b/tests/data/test185
index 02bb3d37f3..93542aa211 100644
--- a/tests/data/test185
+++ b/tests/data/test185
@@ -3,6 +3,7 @@
 <keywords>
 HTTP
 HTTP GET
+HTTP proxy
 followlocation
 </keywords>
 </info>
diff --git a/tests/data/test208 b/tests/data/test208
index eac3d5572c..3c8028e1fc 100644
--- a/tests/data/test208
+++ b/tests/data/test208
@@ -1,4 +1,13 @@
 <testcase>
+<info>
+<keywords>
+FTP
+HTTP
+HTTP PUT
+HTTP proxy
+</keywords>
+</info>
+
 # Server-side
 <reply>
 <data>
@@ -20,7 +29,7 @@ http
 ftp
 </features>
  <name>
-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
  </name>
  <command>
 -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 47cd0270eb..8ea79aef10 100644
--- a/tests/data/test234
+++ b/tests/data/test234
@@ -1,4 +1,14 @@
 <testcase>
+<info>
+<keywords>
+HTTP
+HTTP GET
+HTTP proxy
+HTTP proxy Basic auth
+followlocation
+</keywords>
+</info>
+
 #
 # Server-side
 <reply>
diff --git a/tests/data/test239 b/tests/data/test239
index 29d44af7e0..1d0610b57c 100644
--- a/tests/data/test239
+++ b/tests/data/test239
@@ -1,4 +1,13 @@
 <testcase>
+<info>
+<keywords>
+HTTP
+HTTP POST
+HTTP proxy
+HTTP proxy NTLM auth
+</keywords>
+</info>
+
 # Server-side
 <reply>
 
diff --git a/tests/data/test243 b/tests/data/test243
index a20bd750a6..3c5a7a2133 100644
--- a/tests/data/test243
+++ b/tests/data/test243
@@ -3,10 +3,12 @@
 <keywords>
 HTTP
 HTTP GET
---proxy-anyauth
+HTTP proxy
 HTTP proxy NTLM auth
+--proxy-anyauth
 </keywords>
 </info>
+
 # Server-side
 <reply>
 
diff --git a/tests/data/test257 b/tests/data/test257
index 1020c613ec..c8a11a0ee8 100644
--- a/tests/data/test257
+++ b/tests/data/test257
@@ -3,10 +3,13 @@
 <keywords>
 HTTP
 HTTP GET
+HTTP proxy
+HTTP Basic auth
 followlocation
 netrc
 </keywords>
 </info>
+
 # Server-side
 <reply>
 <data>
diff --git a/tests/data/test275 b/tests/data/test275
index e07b1a83e8..17bdfc1cb2 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
 </keywords>
 </info>
+
 #
 # Server-side
 <reply>
diff --git a/tests/data/test523 b/tests/data/test523
index 0459d2caf1..ff582bdeb4 100644
--- a/tests/data/test523
+++ b/tests/data/test523
@@ -3,6 +3,7 @@
 <keywords>
 HTTP
 HTTP GET
+HTTP proxy
 CURLOPT_PORT
 CURLOPT_PROXY
 </keywords>
diff --git a/tests/data/test547 b/tests/data/test547
index 7b0c7324da..b43efc94dd 100644
--- a/tests/data/test547
+++ b/tests/data/test547
@@ -4,6 +4,7 @@
 HTTP
 HTTP POST
 POST callback
+HTTP proxy
 HTTP proxy NTLM auth
 </keywords>
 </info>
diff --git a/tests/data/test548 b/tests/data/test548
index 5db4763861..267adeb5ee 100644
--- a/tests/data/test548
+++ b/tests/data/test548
@@ -3,9 +3,11 @@
 <keywords>
 HTTP
 HTTP POST
+HTTP proxy
 HTTP proxy NTLM auth
 </keywords>
 </info>
+
 # Server-side
 <reply>
 
diff --git a/tests/data/test549 b/tests/data/test549
index 0c53afa644..654bcea26f 100644
--- a/tests/data/test549
+++ b/tests/data/test549
@@ -4,6 +4,7 @@
 FTP
 CURLOPT_PROXY_TRANSFER_MODE
 CURLOPT_PROXY
+HTTP proxy
 </keywords>
 </info>
 
diff --git a/tests/data/test550 b/tests/data/test550
index 8d27d8a4f8..16002ba884 100644
--- a/tests/data/test550
+++ b/tests/data/test550
@@ -2,6 +2,7 @@
 <info>
 <keywords>
 FTP
+HTTP proxy
 CURLOPT_PROXY_TRANSFER_MODE
 CURLOPT_PROXY
 </keywords>
@@ -36,7 +37,7 @@ ftp
 lib549
 </tool>
  <name>
-FTP RETR over proxy with CURLOPT_PROXY_TRANSFER_MODE and ascii transfer
+FTP RETR over proxy with CURLOPT_PROXY_TRANSFER_MODE and ASCII transfer
  </name>
 # first URL then proxy
  <command>
diff --git a/tests/data/test551 b/tests/data/test551
index b3b6110a00..9319a349ca 100644
--- a/tests/data/test551
+++ b/tests/data/test551
@@ -5,9 +5,11 @@
 HTTP
 HTTP POST
 POST callback
+HTTP proxy
 HTTP proxy Digest auth
 </keywords>
 </info>
+
 # Server-side
 <reply>
 
diff --git a/tests/data/test552 b/tests/data/test552
index 30d533a92e..f971be7de6 100644
Binary files a/tests/data/test552 and b/tests/data/test552 differ
diff --git a/tests/data/test555 b/tests/data/test555
index 45b38c2038..d63197ae9d 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
 </keywords>
diff --git a/tests/data/test80 b/tests/data/test80
index 419242638c..dded9681a2 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
 </keywords>
 </info>
+
 #
 # Server-side
 <reply>
diff --git a/tests/data/test81 b/tests/data/test81
index 3d2ac68fe4..f66c354c8b 100644
--- a/tests/data/test81
+++ b/tests/data/test81
@@ -3,9 +3,11 @@
 <keywords>
 HTTP
 HTTP GET
+HTTP proxy
 HTTP proxy NTLM auth
 </keywords>
 </info>
+
 # Server-side
 <reply>
 
diff --git a/tests/data/test82 b/tests/data/test82
index 7c7f52633c..b0eb629569 100644
--- a/tests/data/test82
+++ b/tests/data/test82
@@ -3,6 +3,7 @@
 <keywords>
 HTTP
 HTTP GET
+HTTP proxy
 HTTP proxy Basic auth
 HTTP proxy NTLM auth
 </keywords>
diff --git a/tests/data/test85 b/tests/data/test85
index bab5d09ce4..043ef7dab8 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
 </keywords>
 </info>
+
 #
 # Server-side
 <reply>