Bug 1257249 - Replace a use of cStringIO with StringIO to avoid a problem with old Python versions, r=Ms2ger
authorJames Graham <james@hoppipolla.co.uk>
Tue, 06 Dec 2016 10:30:34 -1000
changeset 325337 f863d5050b3f71218c001804f97ca98474b2bae6
parent 325336 f0c1e6b61ded83d3b646f55bb0f7cabdf822912b
child 325338 c401d72933641748f3738e90e7bbe539705e2f1c
child 325374 eef062272d1951b7c2e650b69cace6ba6f1023d0
push id24
push usermaklebus@msu.edu
push dateTue, 20 Dec 2016 03:11:33 +0000
reviewersMs2ger
bugs1257249
milestone53.0a1
Bug 1257249 - Replace a use of cStringIO with StringIO to avoid a problem with old Python versions, r=Ms2ger MozReview-Commit-ID: D1wkrdaejQB
testing/web-platform/meta/FileAPI/blob/Blob-constructor.html.ini
testing/web-platform/meta/fetch/api/basic/request-headers-worker.html.ini
testing/web-platform/meta/fetch/api/basic/request-headers.html.ini
testing/web-platform/meta/mathml/presentation-markup/fractions/frac-1.html.ini
testing/web-platform/meta/presentation-api/controlling-ua/startNewPresentation_error.html.ini
testing/web-platform/meta/referrer-policy/generic/unsupported-csp-referrer-directive.html.ini
testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/generic.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/generic.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/generic.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/generic.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/generic.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/generic.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/generic.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/generic.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/generic.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/generic.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/generic.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/generic.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/generic.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/generic.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/generic.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/generic.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/cross-origin.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/cross-origin.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/cross-origin.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/cross-origin.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/cross-origin.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/cross-origin.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/same-origin-insecure.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/same-origin-insecure.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/same-origin-downgrade.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/same-origin-downgrade.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/same-origin-downgrade.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/same-origin-upgrade.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/same-origin-upgrade.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/same-origin-upgrade.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/cross-origin.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/cross-origin.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/cross-origin.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/cross-origin.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/cross-origin.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/cross-origin.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/same-origin-insecure.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/same-origin-insecure.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/same-origin-downgrade.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/same-origin-downgrade.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/same-origin-downgrade.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/same-origin-upgrade.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/same-origin-upgrade.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/same-origin-upgrade.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/generic.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/generic.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/generic.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/generic.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/generic.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/generic.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/generic.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/generic.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/generic.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/generic.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/generic.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/generic.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/origin/http-rp/same-origin/http-http/img-tag/generic.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/origin/http-rp/same-origin/http-http/img-tag/generic.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/origin/http-rp/same-origin/http-http/img-tag/generic.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/generic.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/generic.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/generic.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/generic.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/generic.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/generic.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/generic.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/generic.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/generic.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/cross-origin.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/cross-origin.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/cross-origin.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/cross-origin.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/cross-origin.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/cross-origin.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/same-origin-insecure.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/same-origin-insecure.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/same-origin/attr-referrer/same-origin/http-https/img-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/cross-origin.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/cross-origin.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/cross-origin.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/cross-origin.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/cross-origin.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/cross-origin.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/same-origin-insecure.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/same-origin-insecure.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/same-origin/http-rp/same-origin/http-https/img-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/cross-origin.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/cross-origin.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/cross-origin.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/cross-origin.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/cross-origin.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/cross-origin.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/same-origin-insecure.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/same-origin-insecure.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/same-origin/meta-referrer/same-origin/http-https/img-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/cross-insecure.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/cross-insecure.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/cross-insecure.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/same-insecure.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/same-insecure.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/same-insecure.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/cross-insecure.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/cross-insecure.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/cross-insecure.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/same-insecure.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/same-insecure.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/same-insecure.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/cross-insecure.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/cross-insecure.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/cross-insecure.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/same-insecure.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/same-insecure.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/same-insecure.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/generic.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/generic.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/generic.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/generic.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/generic.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/generic.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/generic.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/generic.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/generic.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/generic.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/generic.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/generic.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/generic.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/generic.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/generic.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/generic.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html.ini
testing/web-platform/meta/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
testing/web-platform/tests/referrer-policy/generic/subresource/image.py
--- a/testing/web-platform/meta/FileAPI/blob/Blob-constructor.html.ini
+++ b/testing/web-platform/meta/FileAPI/blob/Blob-constructor.html.ini
@@ -1,6 +1,8 @@
 [Blob-constructor.html]
+  type: testharness
   [The 'endings' property should be ignored.]
     expected: FAIL
 
   [Newlines should not change when endings is 'native'.]
     expected: FAIL
+
--- a/testing/web-platform/meta/fetch/api/basic/request-headers-worker.html.ini
+++ b/testing/web-platform/meta/fetch/api/basic/request-headers-worker.html.ini
@@ -1,5 +1,6 @@
 [request-headers-worker.html]
   type: testharness
   [Fetch with POST with FormData body]
     expected: FAIL
     bug: https://github.com/whatwg/fetch/issues/422
+
--- a/testing/web-platform/meta/fetch/api/basic/request-headers.html.ini
+++ b/testing/web-platform/meta/fetch/api/basic/request-headers.html.ini
@@ -1,5 +1,6 @@
 [request-headers.html]
   type: testharness
   [Fetch with POST with FormData body]
     expected: FAIL
     bug: https://github.com/whatwg/fetch/issues/422
+
--- a/testing/web-platform/meta/mathml/presentation-markup/fractions/frac-1.html.ini
+++ b/testing/web-platform/meta/mathml/presentation-markup/fractions/frac-1.html.ini
@@ -7,11 +7,13 @@
       if not debug and e10s and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): FAIL
       if not debug and not e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
       if debug and e10s and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): FAIL
       if debug and not e10s and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): FAIL
       if not debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
       if not debug and not e10s and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): FAIL
       if not debug and e10s and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): FAIL
       if debug and e10s and (os == "win") and (version == "5.1.2600") and (processor == "x86") and (bits == 32): FAIL
+
   [Fraction axis is aligned on the math axis]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): FAIL
+
--- a/testing/web-platform/meta/presentation-api/controlling-ua/startNewPresentation_error.html.ini
+++ b/testing/web-platform/meta/presentation-api/controlling-ua/startNewPresentation_error.html.ini
@@ -1,6 +1,7 @@
 [startNewPresentation_error.html]
   type: testharness
   disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1317194
   prefs: [dom.presentation.enabled: true, dom.presentation.controller.enabled: true, dom.presentation.discovery.enabled: true, dom.presentation.device.name: "Firefox"]
   [The presentation could not start, because a user gesture is required.]
     expected: FAIL
+
--- a/testing/web-platform/meta/referrer-policy/generic/unsupported-csp-referrer-directive.html.ini
+++ b/testing/web-platform/meta/referrer-policy/generic/unsupported-csp-referrer-directive.html.ini
@@ -1,8 +1,7 @@
 [unsupported-csp-referrer-directive.html]
   type: testharness
-  expected: TIMEOUT
   disabled:
     if (os == "linux") and (bits == 64): true
   [Image has a referrer despite CSP 'referrer' directive]
-    expected: NOTRUN
+    expected: FAIL
 
--- a/testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [insecure-protocol.keep-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [insecure-protocol.no-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [insecure-protocol.swap-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [upgrade-protocol.keep-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [upgrade-protocol.no-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [upgrade-protocol.swap-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [insecure-protocol.keep-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [insecure-protocol.no-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [insecure-protocol.swap-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [upgrade-protocol.keep-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [upgrade-protocol.no-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [upgrade-protocol.swap-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [insecure-protocol.keep-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [insecure-protocol.no-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [insecure-protocol.swap-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [upgrade-protocol.keep-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [upgrade-protocol.no-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [upgrade-protocol.swap-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [insecure-protocol.keep-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [insecure-protocol.no-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [insecure-protocol.swap-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [upgrade-protocol.keep-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [upgrade-protocol.no-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [upgrade-protocol.swap-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/generic.keep-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/generic.no-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/generic.no-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.no-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/generic.swap-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/generic.no-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/generic.no-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.no-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/generic.keep-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/generic.no-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/generic.no-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.no-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/generic.swap-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/generic.no-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/generic.no-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.no-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/generic.keep-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/generic.no-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/generic.no-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.no-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/generic.swap-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/generic.no-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/generic.no-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.no-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/generic.keep-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/generic.no-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/generic.no-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.no-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/generic.swap-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/generic.no-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/generic.no-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.no-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/cross-origin.keep-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/cross-origin.keep-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [cross-origin.keep-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/cross-origin.no-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/cross-origin.no-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [cross-origin.no-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/cross-origin.swap-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/cross-origin.swap-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [cross-origin.swap-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/cross-origin.keep-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/cross-origin.keep-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [cross-origin.keep-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/cross-origin.no-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/cross-origin.no-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [cross-origin.no-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/cross-origin.swap-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/cross-origin.swap-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [cross-origin.swap-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/same-origin-insecure.keep-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/same-origin-insecure.keep-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [same-origin-insecure.keep-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/same-origin-insecure.no-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/same-origin-insecure.no-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [same-origin-insecure.no-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [same-origin-insecure.swap-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/same-origin-downgrade.keep-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/same-origin-downgrade.keep-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [same-origin-downgrade.keep-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/same-origin-downgrade.no-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/same-origin-downgrade.no-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [same-origin-downgrade.no-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/same-origin-downgrade.swap-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/same-origin-downgrade.swap-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [same-origin-downgrade.swap-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [same-origin-insecure.swap-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/same-origin-upgrade.keep-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/same-origin-upgrade.keep-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [same-origin-upgrade.keep-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/same-origin-upgrade.no-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/same-origin-upgrade.no-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [same-origin-upgrade.no-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/same-origin-upgrade.swap-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/same-origin-upgrade.swap-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [same-origin-upgrade.swap-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/cross-origin.keep-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/cross-origin.keep-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [cross-origin.keep-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/cross-origin.no-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/cross-origin.no-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [cross-origin.no-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/cross-origin.swap-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/cross-origin.swap-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [cross-origin.swap-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/cross-origin.keep-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/cross-origin.keep-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [cross-origin.keep-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/cross-origin.no-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/cross-origin.no-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [cross-origin.no-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/cross-origin.swap-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/cross-origin.swap-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [cross-origin.swap-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/same-origin-insecure.keep-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/same-origin-insecure.keep-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [same-origin-insecure.keep-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/same-origin-insecure.no-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/same-origin-insecure.no-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [same-origin-insecure.no-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [same-origin-insecure.swap-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/same-origin-downgrade.keep-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/same-origin-downgrade.keep-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [same-origin-downgrade.keep-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/same-origin-downgrade.no-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/same-origin-downgrade.no-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [same-origin-downgrade.no-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/same-origin-downgrade.swap-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/same-origin-downgrade.swap-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [same-origin-downgrade.swap-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [same-origin-insecure.swap-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/same-origin-upgrade.keep-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/same-origin-upgrade.keep-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [same-origin-upgrade.keep-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/same-origin-upgrade.no-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/same-origin-upgrade.no-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [same-origin-upgrade.no-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/same-origin-upgrade.swap-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/same-origin-upgrade.swap-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [same-origin-upgrade.swap-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/generic.keep-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/generic.no-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/generic.no-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.no-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/generic.swap-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/generic.no-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/generic.no-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.no-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/generic.keep-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/generic.no-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/generic.no-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.no-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/generic.swap-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/generic.no-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/generic.no-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.no-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/generic.keep-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/generic.no-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/generic.no-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.no-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/generic.swap-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/generic.no-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/generic.no-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.no-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/origin/http-rp/same-origin/http-http/img-tag/generic.keep-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/origin/http-rp/same-origin/http-http/img-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/origin/http-rp/same-origin/http-http/img-tag/generic.no-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/origin/http-rp/same-origin/http-http/img-tag/generic.no-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.no-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/origin/http-rp/same-origin/http-http/img-tag/generic.swap-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/origin/http-rp/same-origin/http-http/img-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/generic.no-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/generic.no-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.no-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/generic.keep-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/generic.no-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/generic.no-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.no-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/generic.swap-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/generic.no-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/generic.no-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.no-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/generic.keep-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/generic.no-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/generic.no-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.no-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/generic.swap-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/generic.no-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/generic.no-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.no-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/cross-origin.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[cross-origin.keep-origin-redirect.http.html]
-  type: testharness
-  expected:
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected:
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/cross-origin.no-redirect.http.html.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[cross-origin.no-redirect.http.html]
-  type: testharness
-  expected:
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected:
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/cross-origin.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[cross-origin.swap-origin-redirect.http.html]
-  type: testharness
-  expected:
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected:
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/cross-origin.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[cross-origin.keep-origin-redirect.http.html]
-  type: testharness
-  expected:
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected:
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/cross-origin.no-redirect.http.html.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[cross-origin.no-redirect.http.html]
-  type: testharness
-  expected:
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected:
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/cross-origin.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[cross-origin.swap-origin-redirect.http.html]
-  type: testharness
-  expected:
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected:
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/same-origin-insecure.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[same-origin-insecure.keep-origin-redirect.http.html]
-  type: testharness
-  expected:
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected:
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/same-origin-insecure.no-redirect.http.html.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[same-origin-insecure.no-redirect.http.html]
-  type: testharness
-  expected:
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected:
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[same-origin-insecure.swap-origin-redirect.http.html]
-  type: testharness
-  expected:
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected:
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/same-origin/attr-referrer/same-origin/http-https/img-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[same-origin-insecure.swap-origin-redirect.http.html]
-  type: testharness
-  expected:
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected:
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/cross-origin.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[cross-origin.keep-origin-redirect.http.html]
-  type: testharness
-  expected:
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected:
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/cross-origin.no-redirect.http.html.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[cross-origin.no-redirect.http.html]
-  type: testharness
-  expected:
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected:
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/cross-origin.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[cross-origin.swap-origin-redirect.http.html]
-  type: testharness
-  expected:
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected:
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/cross-origin.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[cross-origin.keep-origin-redirect.http.html]
-  type: testharness
-  expected:
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected:
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/cross-origin.no-redirect.http.html.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[cross-origin.no-redirect.http.html]
-  type: testharness
-  expected:
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected:
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/cross-origin.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[cross-origin.swap-origin-redirect.http.html]
-  type: testharness
-  expected:
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected:
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/same-origin-insecure.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[same-origin-insecure.keep-origin-redirect.http.html]
-  type: testharness
-  expected:
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected:
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/same-origin-insecure.no-redirect.http.html.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[same-origin-insecure.no-redirect.http.html]
-  type: testharness
-  expected:
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected:
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[same-origin-insecure.swap-origin-redirect.http.html]
-  type: testharness
-  expected:
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected:
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/same-origin/http-rp/same-origin/http-https/img-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[same-origin-insecure.swap-origin-redirect.http.html]
-  type: testharness
-  expected:
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected:
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/cross-origin.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[cross-origin.keep-origin-redirect.http.html]
-  type: testharness
-  expected:
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected:
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/cross-origin.no-redirect.http.html.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[cross-origin.no-redirect.http.html]
-  type: testharness
-  expected:
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected:
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/cross-origin.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[cross-origin.swap-origin-redirect.http.html]
-  type: testharness
-  expected:
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected:
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/cross-origin.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[cross-origin.keep-origin-redirect.http.html]
-  type: testharness
-  expected:
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected:
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/cross-origin.no-redirect.http.html.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[cross-origin.no-redirect.http.html]
-  type: testharness
-  expected:
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected:
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/cross-origin.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[cross-origin.swap-origin-redirect.http.html]
-  type: testharness
-  expected:
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected:
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/same-origin-insecure.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[same-origin-insecure.keep-origin-redirect.http.html]
-  type: testharness
-  expected:
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected:
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/same-origin-insecure.no-redirect.http.html.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[same-origin-insecure.no-redirect.http.html]
-  type: testharness
-  expected:
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected:
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[same-origin-insecure.swap-origin-redirect.http.html]
-  type: testharness
-  expected:
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected:
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/same-origin/meta-referrer/same-origin/http-https/img-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[same-origin-insecure.swap-origin-redirect.http.html]
-  type: testharness
-  expected:
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected:
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/cross-insecure.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[cross-insecure.keep-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/cross-insecure.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[cross-insecure.no-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/cross-insecure.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[cross-insecure.swap-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.keep-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.no-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.swap-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/same-insecure.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[same-insecure.keep-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/same-insecure.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[same-insecure.no-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/same-insecure.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[same-insecure.swap-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.keep-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.no-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.swap-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/cross-insecure.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[cross-insecure.keep-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/cross-insecure.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[cross-insecure.no-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/cross-insecure.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[cross-insecure.swap-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.keep-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.no-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.swap-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/same-insecure.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[same-insecure.keep-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/same-insecure.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[same-insecure.no-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/same-insecure.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[same-insecure.swap-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.keep-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.no-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.swap-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/cross-insecure.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[cross-insecure.keep-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/cross-insecure.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[cross-insecure.no-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/cross-insecure.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[cross-insecure.swap-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.keep-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.no-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.swap-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/same-insecure.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[same-insecure.keep-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/same-insecure.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[same-insecure.no-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/same-insecure.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[same-insecure.swap-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.keep-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.no-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.swap-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[insecure-protocol.keep-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[insecure-protocol.no-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[insecure-protocol.swap-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.keep-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.no-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.swap-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[insecure-protocol.keep-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[insecure-protocol.no-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[insecure-protocol.swap-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.keep-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.no-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.swap-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[insecure-protocol.keep-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[insecure-protocol.no-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[insecure-protocol.swap-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.keep-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.no-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.swap-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[insecure-protocol.keep-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[insecure-protocol.no-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[insecure-protocol.swap-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.keep-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.no-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.swap-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[insecure-protocol.keep-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[insecure-protocol.no-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[insecure-protocol.swap-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.keep-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.no-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.swap-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[insecure-protocol.keep-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[insecure-protocol.no-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[insecure-protocol.swap-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.keep-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.no-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
deleted file mode 100644
--- a/testing/web-platform/meta/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[upgrade-protocol.swap-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
--- a/testing/web-platform/meta/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/generic.keep-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/generic.no-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/generic.no-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.no-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/generic.swap-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/generic.no-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/generic.no-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.no-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/generic.keep-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/generic.no-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/generic.no-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.no-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/generic.swap-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/generic.no-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/generic.no-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.no-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/generic.keep-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/generic.no-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/generic.no-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.no-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/generic.swap-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/generic.no-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/generic.no-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.no-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/generic.keep-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/generic.no-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/generic.no-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.no-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/generic.swap-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/generic.no-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/generic.no-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.no-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [insecure-protocol.keep-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [insecure-protocol.no-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [insecure-protocol.swap-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [upgrade-protocol.keep-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [upgrade-protocol.no-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [upgrade-protocol.swap-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [insecure-protocol.keep-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [insecure-protocol.no-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [insecure-protocol.swap-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [upgrade-protocol.keep-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [upgrade-protocol.no-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [upgrade-protocol.swap-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [insecure-protocol.keep-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [insecure-protocol.no-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [insecure-protocol.swap-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [upgrade-protocol.keep-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [upgrade-protocol.no-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [upgrade-protocol.swap-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [insecure-protocol.keep-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [insecure-protocol.no-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [insecure-protocol.swap-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [upgrade-protocol.keep-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [upgrade-protocol.no-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ b/testing/web-platform/meta/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
@@ -1,12 +1,8 @@
 [upgrade-protocol.swap-origin-redirect.http.html]
   type: testharness
   expected:
     if (os == "linux") and (version == "Ubuntu 16.04"): OK
-    if (os == "linux") and (version == "Ubuntu 12.04"): TIMEOUT
-    if not (os == "linux"): TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected:
       if (os == "linux") and (version == "Ubuntu 16.04"): PASS
-      if (os == "linux") and (version == "Ubuntu 12.04"): NOTRUN
-      if not (os == "linux"): NOTRUN
 
--- a/testing/web-platform/tests/referrer-policy/generic/subresource/image.py
+++ b/testing/web-platform/tests/referrer-policy/generic/subresource/image.py
@@ -1,9 +1,9 @@
-import os, sys, array, json, math, cStringIO
+import os, sys, array, json, math, StringIO
 sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
 import subresource
 
 class Image:
     """This class partially implements the interface of the PIL.Image.Image.
        One day in the future WPT might support the PIL module or another imaging
        library, so this hacky BMP implementation will no longer be required.
     """
@@ -77,17 +77,17 @@ def encode_string_as_bmp_image(string_da
 
     # Render image.
     num_pixels = len(color_data)
     sqrt = int(math.ceil(math.sqrt(num_pixels)))
     img = Image.new("RGB", (sqrt, sqrt), "black")
     img.putdata(color_data)
 
     # Flush image to string.
-    f = cStringIO.StringIO()
+    f = StringIO.StringIO()
     img.save(f, "BMP")
     f.seek(0)
 
     return f.read()
 
 def generate_payload(server_data):
     data = ('{"headers": %(headers)s}') % server_data
     return encode_string_as_bmp_image(data)