diff --git a/tests/data/test1024 b/tests/data/test1024
index 5fba9d325a..d8ceff10a3 100644
--- a/tests/data/test1024
+++ b/tests/data/test1024
@@ -77,6 +77,9 @@ HTTP Location: following with cookies
http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L -c log/jar%TESTNUMBER
+
+cookies
+
# Verify data after the test has been "shot"
diff --git a/tests/data/test1025 b/tests/data/test1025
index 5f96e11237..ef0b33fb0d 100644
--- a/tests/data/test1025
+++ b/tests/data/test1025
@@ -77,6 +77,9 @@ HTTP Location: following with command-line and server cookies
http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L -c log/jar%TESTNUMBER -b forcedcookie=yes
+
+cookies
+
# Verify data after the test has been "shot"
diff --git a/tests/data/test1104 b/tests/data/test1104
index 27c43009ec..0d89bde8ee 100644
--- a/tests/data/test1104
+++ b/tests/data/test1104
@@ -62,6 +62,7 @@ HTTP cookie expiry date at Jan 1 00:00:00 GMT 1970
http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L -x %HOSTIP:%HTTPPORT -c log/cookies%TESTNUMBER.jar
+cookies
proxy
diff --git a/tests/data/test1105 b/tests/data/test1105
index 3969338382..73a33a3c53 100644
--- a/tests/data/test1105
+++ b/tests/data/test1105
@@ -40,6 +40,9 @@ HTTP with cookie parser and header recording
perl -e "print 'Test requires default test server host' if ( '%HOSTIP' ne '127.0.0.1' );"
+
+cookies
+
# Verify data after the test has been "shot"
diff --git a/tests/data/test1151 b/tests/data/test1151
index c31382c9ea..52e912ef90 100644
--- a/tests/data/test1151
+++ b/tests/data/test1151
@@ -41,6 +41,9 @@ HTTP with too long cookies
http://%HOSTIP:%HTTPPORT/%TESTNUMBER -c log/cookies%TESTNUMBER.txt
+
+cookies
+
# Verify data after the test has been "shot"
diff --git a/tests/data/test1155 b/tests/data/test1155
index 65d76b6f51..011d310f57 100644
--- a/tests/data/test1155
+++ b/tests/data/test1155
@@ -30,6 +30,9 @@ HTTP cookie with parameter word as name
http://%HOSTIP:%HTTPPORT/%TESTNUMBER -c log/cookies%TESTNUMBER.txt
+
+cookies
+
# Verify data after the test has been "shot"
diff --git a/tests/data/test1160 b/tests/data/test1160
index e24ce93e1b..7e31aa5dce 100644
--- a/tests/data/test1160
+++ b/tests/data/test1160
@@ -31,6 +31,9 @@ HTTP with long funny format cookie
http://%HOSTIP:%HTTPPORT/%TESTNUMBER -c log/cookies%TESTNUMBER.txt
+
+cookies
+
# Verify data after the test has been "shot"
diff --git a/tests/data/test1161 b/tests/data/test1161
index 89c1e657c5..88ed491da1 100644
--- a/tests/data/test1161
+++ b/tests/data/test1161
@@ -30,6 +30,9 @@ HTTP cookie with path set twice
http://%HOSTIP:%HTTPPORT/%TESTNUMBER -c log/cookies%TESTNUMBER.txt
+
+cookies
+
# Verify data after the test has been "shot"
diff --git a/tests/data/test1216 b/tests/data/test1216
index 6686c758a5..0b1bad606d 100644
--- a/tests/data/test1216
+++ b/tests/data/test1216
@@ -40,6 +40,7 @@ example.fake FALSE /c FALSE 2139150993 moo2 indeed
example.fake TRUE /c FALSE 2139150993 moo3 indeed
+cookies
proxy
diff --git a/tests/data/test1218 b/tests/data/test1218
index ff80233488..e176c47fa3 100644
--- a/tests/data/test1218
+++ b/tests/data/test1218
@@ -33,6 +33,7 @@ HTTP cookies and domains with same prefix
http://example.fake/c/%TESTNUMBER http://example.fake/c/%TESTNUMBER http://bexample.fake/c/%TESTNUMBER -b nonexisting -x %HOSTIP:%HTTPPORT
+cookies
proxy
diff --git a/tests/data/test1228 b/tests/data/test1228
index 2a7faff48d..d33b742892 100644
--- a/tests/data/test1228
+++ b/tests/data/test1228
@@ -32,6 +32,7 @@ HTTP cookie path match
http://example.fake/hoge/%TESTNUMBER http://example.fake/hogege/ -b nonexisting -x %HOSTIP:%HTTPPORT
+cookies
proxy
diff --git a/tests/data/test1258 b/tests/data/test1258
index a4cef156c9..5a4ce0b73b 100644
--- a/tests/data/test1258
+++ b/tests/data/test1258
@@ -32,6 +32,9 @@ HTTP, use cookies with localhost
http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER http://%HOSTIP:%HTTPPORT/we/want?hoge=fuga -b non-existing -H "Host: localhost"
+
+cookies
+
# Verify data after the test has been "shot"
diff --git a/tests/data/test1331 b/tests/data/test1331
index 4ef0c14df2..7683d6272e 100644
--- a/tests/data/test1331
+++ b/tests/data/test1331
@@ -65,6 +65,7 @@ HTTP --proxy-anyauth and 407 with cookies
-U myname:mypassword -x %HOSTIP:%HTTPPORT http://z.x.com/%TESTNUMBER --proxy-anyauth -c log/dump%TESTNUMBER
+cookies
proxy
diff --git a/tests/data/test1408 b/tests/data/test1408
index d4f40f72e9..adecc9bf5f 100644
--- a/tests/data/test1408
+++ b/tests/data/test1408
@@ -39,6 +39,7 @@ Set-Cookie: time=2
# Client-side
+cookies
ipv6
diff --git a/tests/data/test1415 b/tests/data/test1415
index 79b14e6bd5..7d460be236 100644
--- a/tests/data/test1415
+++ b/tests/data/test1415
@@ -47,6 +47,7 @@ TZ=GMT
http://example.com/we/want/%TESTNUMBER -b none -c log/jar%TESTNUMBER.txt -x %HOSTIP:%HTTPPORT
+cookies
proxy
diff --git a/tests/data/test171 b/tests/data/test171
index c4f5b6c40f..dc46fe287c 100644
--- a/tests/data/test171
+++ b/tests/data/test171
@@ -34,6 +34,7 @@ HTTP, get cookie with dot prefixed full domain
-c log/jar%TESTNUMBER -x %HOSTIP:%HTTPPORT http://z.x.com/%TESTNUMBER
+cookies
proxy
diff --git a/tests/data/test172 b/tests/data/test172
index 9dbe64c23e..276856ae0f 100644
--- a/tests/data/test172
+++ b/tests/data/test172
@@ -38,6 +38,9 @@ http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -b log/jar%TESTNUMBER.txt -b "tool=
.%HOSTIP TRUE / FALSE 0 partmatch present
%HOSTIP FALSE /we/want/ FALSE 2139150993 nodomain value
+
+cookies
+
# Verify data after the test has been "shot"
diff --git a/tests/data/test179 b/tests/data/test179
index b5aaec2f46..61c633440f 100644
--- a/tests/data/test179
+++ b/tests/data/test179
@@ -39,6 +39,7 @@ supertrooper.fake FALSE /b FALSE 0 moo1 indeed
supertrooper.fake FALSE /c FALSE 2139150993 moo2 indeed
+cookies
proxy
diff --git a/tests/data/test1905 b/tests/data/test1905
index 4d04f8183b..7a19e68b7f 100644
--- a/tests/data/test1905
+++ b/tests/data/test1905
@@ -35,6 +35,9 @@ lib%TESTNUMBER
http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER
+
+cookies
+
# Verify data after the test has been "shot"
diff --git a/tests/data/test27 b/tests/data/test27
index 414741363a..fba169510f 100644
--- a/tests/data/test27
+++ b/tests/data/test27
@@ -29,6 +29,9 @@ Get same cookie page several times
"http://%HOSTIP:%HTTPPORT/want/{%TESTNUMBER,%TESTNUMBER,%TESTNUMBER}" -b none
+
+cookies
+
# Verify data after the test has been "shot"
diff --git a/tests/data/test31 b/tests/data/test31
index 6dfd2d268d..ad71792d4a 100644
--- a/tests/data/test31
+++ b/tests/data/test31
@@ -133,6 +133,9 @@ http://test31.curl:%HTTPPORT/we/want/%TESTNUMBER -b none -c log/jar%TESTNUMBER.t
perl -e "print 'Test requires default test server host' if ( '%HOSTIP' ne '127.0.0.1' );"
+
+cookies
+
# Verify data after the test has been "shot"
diff --git a/tests/data/test327 b/tests/data/test327
index 73cedb657f..0014b1fe5a 100644
--- a/tests/data/test327
+++ b/tests/data/test327
@@ -45,6 +45,9 @@ HTTP with cookiejar without cookies left
http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -b none -c log/cookies%TESTNUMBER http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER0002
+
+cookies
+
# Verify data after the test has been "shot"
diff --git a/tests/data/test329 b/tests/data/test329
index 86f7a82751..5d3d26338d 100644
--- a/tests/data/test329
+++ b/tests/data/test329
@@ -52,6 +52,9 @@ TZ=GMT
http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -b log/jar%TESTNUMBER.txt -b log/jar%TESTNUMBER-2.txt -H "Host: host.foo.com" http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER0002
+
+cookies
+
# Verify data after the test has been "shot"
diff --git a/tests/data/test331 b/tests/data/test331
index 8fc68984e4..34d9a78a68 100644
--- a/tests/data/test331
+++ b/tests/data/test331
@@ -43,6 +43,7 @@ HTTP with cookie using host name 'moo'
-x http://%HOSTIP:%HTTPPORT http://moo/we/want/%TESTNUMBER -b none http://moo/we/want/%TESTNUMBER0002
+cookies
proxy
diff --git a/tests/data/test392 b/tests/data/test392
index 24430c1311..71d4486e22 100644
--- a/tests/data/test392
+++ b/tests/data/test392
@@ -40,6 +40,9 @@ http://localhost:%HTTPPORT/%TESTNUMBER -b none http://localhost:%HTTPPORT/%TESTN
perl -e "print 'Test requires default test server host' if ( '%HOSTIP' ne '127.0.0.1' );"
+
+cookies
+
# Verify data after the test has been "shot"
diff --git a/tests/data/test420 b/tests/data/test420
index 766ffb88ce..b7fe4edda1 100644
--- a/tests/data/test420
+++ b/tests/data/test420
@@ -48,6 +48,9 @@ http://%HOSTIP:%HTTPPORT/func_test/del_cookie -b log/cookie%TESTNUMBER -c log/sa
#HttpOnly_%HOSTIP FALSE / FALSE 1709598616 mycookie1 4900
#HttpOnly_%HOSTIP FALSE /func_test/ FALSE 0 mycookie 1200
+
+cookies
+
#
diff --git a/tests/data/test442 b/tests/data/test442
index baab4aade0..cd750eddef 100644
--- a/tests/data/test442
+++ b/tests/data/test442
@@ -193,6 +193,9 @@ attack.invalid TRUE / FALSE 0 name149 could-be-large-149
attack.invalid TRUE / FALSE 0 name150 could-be-large-150
attack.invalid TRUE / FALSE 0 name151 could-be-large-151
+
+cookies
+
#
diff --git a/tests/data/test443 b/tests/data/test443
index f984e73974..ea413b90c9 100644
--- a/tests/data/test443
+++ b/tests/data/test443
@@ -62,6 +62,9 @@ attack.invalid TRUE / FALSE 0 huge-18 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
attack.invalid TRUE / FALSE 0 huge-19 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-19
attack.invalid TRUE / FALSE 0 huge-20 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-20
+
+cookies
+
#
diff --git a/tests/data/test444 b/tests/data/test444
index 89d671c727..e1f87fe38d 100644
--- a/tests/data/test444
+++ b/tests/data/test444
@@ -118,6 +118,9 @@ Many Set-Cookie response headers
http://attack.invalid:%HTTPPORT/a/b/%TESTNUMBER -c log/cookie%TESTNUMBER --resolve attack.invalid:%HTTPPORT:%HOSTIP
+
+cookies
+
#
diff --git a/tests/data/test46 b/tests/data/test46
index 91e24cbaff..9e30c5278f 100644
--- a/tests/data/test46
+++ b/tests/data/test46
@@ -56,6 +56,9 @@ domain..tld FALSE / FALSE 2139150993 mooo indeed
#HttpOnly_domain..tld FALSE /want FALSE 2139150993 mooo2 indeed2
domain..tld FALSE /want FALSE 0 empty
+
+cookies
+
# Verify data after the test has been "shot"
diff --git a/tests/data/test53 b/tests/data/test53
index e3b9ec9625..4034a4c662 100644
--- a/tests/data/test53
+++ b/tests/data/test53
@@ -36,6 +36,9 @@ HTTP, junk session cookies
%HOSTIP FALSE / FALSE 0 moo1 indeed
%HOSTIP FALSE / FALSE 1 moo2 indeed
+
+cookies
+
# Verify data after the test has been "shot"
diff --git a/tests/data/test598 b/tests/data/test598
index 5e52315ebb..a000dca55b 100644
--- a/tests/data/test598
+++ b/tests/data/test598
@@ -58,6 +58,9 @@ curl_easy_reset with referer and other strings set
http://%HOSTIP:%HTTPPORT/%TESTNUMBER
+
+cookies
+
#
diff --git a/tests/data/test6 b/tests/data/test6
index d8231cbdb9..6e83125cd4 100644
--- a/tests/data/test6
+++ b/tests/data/test6
@@ -31,6 +31,9 @@ HTTP with simple cookie send
http://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER -b "name=contents;name2=content2" -b name3=content3
+
+cookies
+
# Verify data after the test has been "shot"
diff --git a/tests/data/test61 b/tests/data/test61
index 6d98ba7706..98c56498f2 100644
--- a/tests/data/test61
+++ b/tests/data/test61
@@ -47,6 +47,9 @@ TZ=GMT
http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -c log/jar%TESTNUMBER.txt -H "Host: www.host.foo.com"
+
+cookies
+
# Verify data after the test has been "shot"
diff --git a/tests/data/test62 b/tests/data/test62
index 92396d9f66..08fbf8e5dd 100644
--- a/tests/data/test62
+++ b/tests/data/test62
@@ -42,6 +42,9 @@ http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER http://%HOSTIP:%HTTPPORT/we/want/%T
.foo.com TRUE /moo TRUE 0 test3 maybe
+
+cookies
+
# Verify data after the test has been "shot"
diff --git a/tests/data/test676 b/tests/data/test676
index a3916e5261..1197ec5152 100644
--- a/tests/data/test676
+++ b/tests/data/test676
@@ -61,6 +61,9 @@ verify setting CURLOPT_COOKIEFILE to NULL again
http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER
+
+cookies
+
#
diff --git a/tests/data/test73 b/tests/data/test73
index e211f21486..4248db525e 100644
--- a/tests/data/test73
+++ b/tests/data/test73
@@ -31,6 +31,9 @@ HTTP, receive cookies when using custom Host:, domain using only two dots
http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -c log/jar%TESTNUMBER.txt -H "Host: host.NOT_DISCLOSED.se"
+
+cookies
+
# Verify data after the test has been "shot"
diff --git a/tests/data/test8 b/tests/data/test8
index fa44a5a6aa..93f2a99459 100644
--- a/tests/data/test8
+++ b/tests/data/test8
@@ -81,6 +81,9 @@ Set-Cookie: cookie31=%hex[%7f-junk]hex%
perl -e 'if ("%HOSTIP" !~ /\.0\.0\.1$/) {print "Test only works for HOSTIPs ending with .0.0.1"; exit(1)}'
+
+cookies
+
# Verify data after the test has been "shot"
diff --git a/tests/data/test977 b/tests/data/test977
index cecfd13f0b..65167ee0ee 100644
--- a/tests/data/test977
+++ b/tests/data/test977
@@ -27,6 +27,7 @@ Set-Cookie: a=b; Domain=.me.;
# Client-side
+cookies
proxy