--- a/testing/web-platform/tests/lint.ignore
+++ b/testing/web-platform/tests/lint.ignore
@@ -196,18 +196,18 @@ SET TIMEOUT: service-workers/service-wor
 SET TIMEOUT: service-workers/service-worker/resources/fetch-event-test-worker.js
 SET TIMEOUT: service-workers/service-worker/resources/opaque-response-being-preloaded-xhr.html
 SET TIMEOUT: service-workers/service-worker/resources/opaque-response-preloaded-xhr.html
 SET TIMEOUT: service-workers/service-worker/resources/performance-timeline-worker.js
 SET TIMEOUT: service-workers/service-worker/resources/resource-timing-worker.js
 SET TIMEOUT: shadow-dom/Document-prototype-currentScript.html
 SET TIMEOUT: shadow-dom/scroll-to-the-fragment-in-shadow-tree.html
 SET TIMEOUT: shadow-dom/slotchange-event.html
-SET TIMEOUT: trusted-types/block-string-assignment-to-DOMWindowTimers-setTimeout-setInterval.tentative.https.html
-SET TIMEOUT: trusted-types/DOMWindowTimers-setTimeout-setInterval.tentative.https.html
+SET TIMEOUT: trusted-types/block-string-assignment-to-DOMWindowTimers-setTimeout-setInterval.tentative.html
+SET TIMEOUT: trusted-types/DOMWindowTimers-setTimeout-setInterval.tentative.html
 SET TIMEOUT: user-timing/*
 SET TIMEOUT: web-animations/timing-model/animations/*
 SET TIMEOUT: webaudio/the-audio-api/the-mediaelementaudiosourcenode-interface/mediaElementAudioSourceToScriptProcessorTest.html
 SET TIMEOUT: webauthn/*timeout.https.html
 SET TIMEOUT: webdriver/*
 SET TIMEOUT: webmessaging/*
 SET TIMEOUT: webstorage/eventTestHarness.js
 SET TIMEOUT: webvtt/*

rename from testing/web-platform/tests/trusted-types/DOMParser-parseFromString-regression.tentative.https.html
rename to testing/web-platform/tests/trusted-types/DOMParser-parseFromString-regression.tentative.html

rename from testing/web-platform/tests/trusted-types/DOMParser-parseFromString.tentative.https.html
rename to testing/web-platform/tests/trusted-types/DOMParser-parseFromString.tentative.html

rename from testing/web-platform/tests/trusted-types/DOMWindowTimers-setTimeout-setInterval.tentative.https.html
rename to testing/web-platform/tests/trusted-types/DOMWindowTimers-setTimeout-setInterval.tentative.html

rename from testing/web-platform/tests/trusted-types/Document-write.tentative.https.html
rename to testing/web-platform/tests/trusted-types/Document-write.tentative.html

rename from testing/web-platform/tests/trusted-types/Element-insertAdjacentHTML.tentative.https.html
rename to testing/web-platform/tests/trusted-types/Element-insertAdjacentHTML.tentative.html

rename from testing/web-platform/tests/trusted-types/Element-insertAdjacentText.tentative.https.html
rename to testing/web-platform/tests/trusted-types/Element-insertAdjacentText.tentative.html

rename from testing/web-platform/tests/trusted-types/Element-outerHTML.tentative.https.html
rename to testing/web-platform/tests/trusted-types/Element-outerHTML.tentative.html

rename from testing/web-platform/tests/trusted-types/Element-setAttribute.tentative.https.html
rename to testing/web-platform/tests/trusted-types/Element-setAttribute.tentative.html

rename from testing/web-platform/tests/trusted-types/Element-setAttributeNS.tentative.https.html
rename to testing/web-platform/tests/trusted-types/Element-setAttributeNS.tentative.html

rename from testing/web-platform/tests/trusted-types/GlobalEventHandlers-onclick.tentative.https.html
rename to testing/web-platform/tests/trusted-types/GlobalEventHandlers-onclick.tentative.html

rename from testing/web-platform/tests/trusted-types/HTMLElement-generic.tentative.https.html
rename to testing/web-platform/tests/trusted-types/HTMLElement-generic.tentative.html

rename from testing/web-platform/tests/trusted-types/HTMLScriptElement-internal-slot.tentative.https.html
rename to testing/web-platform/tests/trusted-types/HTMLScriptElement-internal-slot.tentative.html

rename from testing/web-platform/tests/trusted-types/Node-multiple-arguments.tentative.https.html
rename to testing/web-platform/tests/trusted-types/Node-multiple-arguments.tentative.html

rename from testing/web-platform/tests/trusted-types/Range-createContextualFragment.tentative.https.html
rename to testing/web-platform/tests/trusted-types/Range-createContextualFragment.tentative.html

rename from testing/web-platform/tests/trusted-types/TrustedType-AttributeNodes.tentative.https.html
rename to testing/web-platform/tests/trusted-types/TrustedType-AttributeNodes.tentative.html

rename from testing/web-platform/tests/trusted-types/TrustedTypePolicy-CSP-no-name.tentative.https.html
rename to testing/web-platform/tests/trusted-types/TrustedTypePolicy-CSP-no-name.tentative.html

rename from testing/web-platform/tests/trusted-types/TrustedTypePolicy-CSP-wildcard.tentative.https.html
rename to testing/web-platform/tests/trusted-types/TrustedTypePolicy-CSP-wildcard.tentative.html

rename from testing/web-platform/tests/trusted-types/TrustedTypePolicy-createXXX.tentative.https.html
rename to testing/web-platform/tests/trusted-types/TrustedTypePolicy-createXXX.tentative.html

rename from testing/web-platform/tests/trusted-types/TrustedTypePolicyFactory-constants.tentative.https.html
rename to testing/web-platform/tests/trusted-types/TrustedTypePolicyFactory-constants.tentative.html

rename from testing/web-platform/tests/trusted-types/TrustedTypePolicyFactory-createPolicy-createXYZTests.tentative.https.html
rename to testing/web-platform/tests/trusted-types/TrustedTypePolicyFactory-createPolicy-createXYZTests.tentative.html

rename from testing/web-platform/tests/trusted-types/TrustedTypePolicyFactory-createPolicy-cspTests-noNamesGiven.tentative.https.html
rename to testing/web-platform/tests/trusted-types/TrustedTypePolicyFactory-createPolicy-cspTests-noNamesGiven.tentative.html

rename from testing/web-platform/tests/trusted-types/TrustedTypePolicyFactory-createPolicy-cspTests-wildcard.tentative.https.html
rename to testing/web-platform/tests/trusted-types/TrustedTypePolicyFactory-createPolicy-cspTests-wildcard.tentative.html

rename from testing/web-platform/tests/trusted-types/TrustedTypePolicyFactory-createPolicy-cspTests.tentative.https.html
rename to testing/web-platform/tests/trusted-types/TrustedTypePolicyFactory-createPolicy-cspTests.tentative.html

rename from testing/web-platform/tests/trusted-types/TrustedTypePolicyFactory-createPolicy-nameTests.tentative.https.html
rename to testing/web-platform/tests/trusted-types/TrustedTypePolicyFactory-createPolicy-nameTests.tentative.html

rename from testing/web-platform/tests/trusted-types/TrustedTypePolicyFactory-createPolicy-unenforced.tentative.https.html
rename to testing/web-platform/tests/trusted-types/TrustedTypePolicyFactory-createPolicy-unenforced.tentative.html

rename from testing/web-platform/tests/trusted-types/TrustedTypePolicyFactory-defaultPolicy.tentative.https.html
rename to testing/web-platform/tests/trusted-types/TrustedTypePolicyFactory-defaultPolicy.tentative.html

rename from testing/web-platform/tests/trusted-types/TrustedTypePolicyFactory-getPropertyType.tentative.https.html
rename to testing/web-platform/tests/trusted-types/TrustedTypePolicyFactory-getPropertyType.tentative.html

rename from testing/web-platform/tests/trusted-types/TrustedTypePolicyFactory-isXXX.tentative.https.html
rename to testing/web-platform/tests/trusted-types/TrustedTypePolicyFactory-isXXX.tentative.html

rename from testing/web-platform/tests/trusted-types/TrustedTypePolicyFactory-metadata.tentative.https.html
rename to testing/web-platform/tests/trusted-types/TrustedTypePolicyFactory-metadata.tentative.html

rename from testing/web-platform/tests/trusted-types/Window-TrustedTypes.tentative.https.html
rename to testing/web-platform/tests/trusted-types/Window-TrustedTypes.tentative.html

rename from testing/web-platform/tests/trusted-types/WorkerGlobalScope-importScripts.https.html
rename to testing/web-platform/tests/trusted-types/WorkerGlobalScope-importScripts.html

rename from testing/web-platform/tests/trusted-types/block-Node-multiple-arguments.tentative.https.html
rename to testing/web-platform/tests/trusted-types/block-Node-multiple-arguments.tentative.html

rename from testing/web-platform/tests/trusted-types/block-string-assignment-to-DOMParser-parseFromString.tentative.https.html
rename to testing/web-platform/tests/trusted-types/block-string-assignment-to-DOMParser-parseFromString.tentative.html

rename from testing/web-platform/tests/trusted-types/block-string-assignment-to-DOMWindowTimers-setTimeout-setInterval.tentative.https.html
rename to testing/web-platform/tests/trusted-types/block-string-assignment-to-DOMWindowTimers-setTimeout-setInterval.tentative.html

rename from testing/web-platform/tests/trusted-types/block-string-assignment-to-Document-write.tentative.https.html
rename to testing/web-platform/tests/trusted-types/block-string-assignment-to-Document-write.tentative.html

rename from testing/web-platform/tests/trusted-types/block-string-assignment-to-Element-insertAdjacentHTML.tentative.https.html
rename to testing/web-platform/tests/trusted-types/block-string-assignment-to-Element-insertAdjacentHTML.tentative.html

rename from testing/web-platform/tests/trusted-types/block-string-assignment-to-Element-outerHTML.tentative.https.html
rename to testing/web-platform/tests/trusted-types/block-string-assignment-to-Element-outerHTML.tentative.html

rename from testing/web-platform/tests/trusted-types/block-string-assignment-to-Element-setAttribute.tentative.https.html
rename to testing/web-platform/tests/trusted-types/block-string-assignment-to-Element-setAttribute.tentative.html

rename from testing/web-platform/tests/trusted-types/block-string-assignment-to-Element-setAttributeNS.tentative.https.html
rename to testing/web-platform/tests/trusted-types/block-string-assignment-to-Element-setAttributeNS.tentative.html

rename from testing/web-platform/tests/trusted-types/block-string-assignment-to-HTMLElement-generic.tentative.https.html
rename to testing/web-platform/tests/trusted-types/block-string-assignment-to-HTMLElement-generic.tentative.html

rename from testing/web-platform/tests/trusted-types/block-string-assignment-to-Range-createContextualFragment.tentative.https.html
rename to testing/web-platform/tests/trusted-types/block-string-assignment-to-Range-createContextualFragment.tentative.html

rename from testing/web-platform/tests/trusted-types/block-text-node-insertion-into-script-element.tentative.https.html
rename to testing/web-platform/tests/trusted-types/block-text-node-insertion-into-script-element.tentative.html

rename from testing/web-platform/tests/trusted-types/csp-block-eval.tentative.https.html
rename to testing/web-platform/tests/trusted-types/csp-block-eval.tentative.html

rename from testing/web-platform/tests/trusted-types/default-policy-callback-arguments.tentative.https.html
rename to testing/web-platform/tests/trusted-types/default-policy-callback-arguments.tentative.html

rename from testing/web-platform/tests/trusted-types/default-policy-report-only.tentative.https.html
rename to testing/web-platform/tests/trusted-types/default-policy-report-only.tentative.html

rename from testing/web-platform/tests/trusted-types/default-policy-report-only.tentative.https.html.headers
rename to testing/web-platform/tests/trusted-types/default-policy-report-only.tentative.html.headers

rename from testing/web-platform/tests/trusted-types/default-policy.tentative.https.html
rename to testing/web-platform/tests/trusted-types/default-policy.tentative.html

rename from testing/web-platform/tests/trusted-types/default-policy.tentative.https.html.headers
rename to testing/web-platform/tests/trusted-types/default-policy.tentative.html.headers

rename from testing/web-platform/tests/trusted-types/empty-default-policy-report-only.tentative.https.html
rename to testing/web-platform/tests/trusted-types/empty-default-policy-report-only.tentative.html

rename from testing/web-platform/tests/trusted-types/empty-default-policy-report-only.tentative.https.html.headers
rename to testing/web-platform/tests/trusted-types/empty-default-policy-report-only.tentative.html.headers

rename from testing/web-platform/tests/trusted-types/empty-default-policy.tentative.https.html
rename to testing/web-platform/tests/trusted-types/empty-default-policy.tentative.html

rename from testing/web-platform/tests/trusted-types/empty-default-policy.tentative.https.html.headers
rename to testing/web-platform/tests/trusted-types/empty-default-policy.tentative.html.headers

rename from testing/web-platform/tests/trusted-types/eval-csp-no-tt.tentative.https.html
rename to testing/web-platform/tests/trusted-types/eval-csp-no-tt.tentative.html

rename from testing/web-platform/tests/trusted-types/eval-csp-tt-default-policy.tentative.https.html
rename to testing/web-platform/tests/trusted-types/eval-csp-tt-default-policy.tentative.html

rename from testing/web-platform/tests/trusted-types/eval-csp-tt-no-default-policy.tentative.https.html
rename to testing/web-platform/tests/trusted-types/eval-csp-tt-no-default-policy.tentative.html

rename from testing/web-platform/tests/trusted-types/eval-no-csp-no-tt-default-policy.tentative.https.html
rename to testing/web-platform/tests/trusted-types/eval-no-csp-no-tt-default-policy.tentative.html

rename from testing/web-platform/tests/trusted-types/eval-no-csp-no-tt.tentative.https.html
rename to testing/web-platform/tests/trusted-types/eval-no-csp-no-tt.tentative.html

rename from testing/web-platform/tests/trusted-types/eval-with-permissive-csp.tentative.https.html
rename to testing/web-platform/tests/trusted-types/eval-with-permissive-csp.tentative.html

rename from testing/web-platform/tests/trusted-types/idlharness.tentative.https.window.js
rename to testing/web-platform/tests/trusted-types/idlharness.tentative.window.js

rename from testing/web-platform/tests/trusted-types/no-require-trusted-types-for-report-only.tentative.https.html
rename to testing/web-platform/tests/trusted-types/no-require-trusted-types-for-report-only.tentative.html

rename from testing/web-platform/tests/trusted-types/no-require-trusted-types-for-report-only.tentative.https.html.headers
rename to testing/web-platform/tests/trusted-types/no-require-trusted-types-for-report-only.tentative.html.headers

rename from testing/web-platform/tests/trusted-types/no-require-trusted-types-for.tentative.https.html
rename to testing/web-platform/tests/trusted-types/no-require-trusted-types-for.tentative.html

deleted file mode 100644
--- a/testing/web-platform/tests/trusted-types/nonsecure-require-trusted-types-for.tentative.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE html>
-<head>
-  <script src="/resources/testharness.js"></script>
-  <script src="/resources/testharnessreport.js"></script>
-  <meta http-equiv="Content-Security-Policy" content="require-trusted-types-for 'script'">
-</head>
-<body>
-<script>
-  const testCases = [
-    ["script", "src"],
-    ["div", "innerHTML"],
-    ["script", "text"],
-  ];
-
-  testCases.forEach(c => {
-    const name = `${c[0]}.${c[1]} `;
-    test(t => {
-      s = document.createElement(c[0]);
-      s[c[1]] = "https://example.com/";
-      assert_equals("https://example.com/", s[c[1]].toString());
-    }, name + "without trusted types is not blocked by require-trusted-types-for on non-secure pages");
-  });
-</script>
-</body>

deleted file mode 100644
--- a/testing/web-platform/tests/trusted-types/nonsecure-require-trusted-types-for.tentative.html.headers
+++ /dev/null
@@ -1,1 +0,0 @@
-Content-Security-Policy: require-trusted-types-for 'script'

rename from testing/web-platform/tests/trusted-types/require-trusted-types-for-report-only.tentative.https.html
rename to testing/web-platform/tests/trusted-types/require-trusted-types-for-report-only.tentative.html

rename from testing/web-platform/tests/trusted-types/require-trusted-types-for-report-only.tentative.https.html.headers
rename to testing/web-platform/tests/trusted-types/require-trusted-types-for-report-only.tentative.html.headers

rename from testing/web-platform/tests/trusted-types/require-trusted-types-for.tentative.https.html
rename to testing/web-platform/tests/trusted-types/require-trusted-types-for.tentative.html

rename from testing/web-platform/tests/trusted-types/trusted-types-createHTMLDocument.tentative.https.html
rename to testing/web-platform/tests/trusted-types/trusted-types-createHTMLDocument.tentative.html

rename from testing/web-platform/tests/trusted-types/trusted-types-duplicate-names-list-report-only.tentative.https.html
rename to testing/web-platform/tests/trusted-types/trusted-types-duplicate-names-list-report-only.tentative.html

rename from testing/web-platform/tests/trusted-types/trusted-types-duplicate-names-list-report-only.tentative.https.html.headers
rename to testing/web-platform/tests/trusted-types/trusted-types-duplicate-names-list-report-only.tentative.html.headers

rename from testing/web-platform/tests/trusted-types/trusted-types-duplicate-names-list.tentative.https.html
rename to testing/web-platform/tests/trusted-types/trusted-types-duplicate-names-list.tentative.html

rename from testing/web-platform/tests/trusted-types/trusted-types-duplicate-names.tentative.https.html
rename to testing/web-platform/tests/trusted-types/trusted-types-duplicate-names.tentative.html

rename from testing/web-platform/tests/trusted-types/trusted-types-eval-reporting-no-unsafe-eval.tentative.https.html
rename to testing/web-platform/tests/trusted-types/trusted-types-eval-reporting-no-unsafe-eval.tentative.html

rename from testing/web-platform/tests/trusted-types/trusted-types-eval-reporting-no-unsafe-eval.tentative.https.html.headers
rename to testing/web-platform/tests/trusted-types/trusted-types-eval-reporting-no-unsafe-eval.tentative.html.headers

rename from testing/web-platform/tests/trusted-types/trusted-types-eval-reporting-report-only.tentative.https.html
rename to testing/web-platform/tests/trusted-types/trusted-types-eval-reporting-report-only.tentative.html

rename from testing/web-platform/tests/trusted-types/trusted-types-eval-reporting-report-only.tentative.https.html.headers
rename to testing/web-platform/tests/trusted-types/trusted-types-eval-reporting-report-only.tentative.html.headers

rename from testing/web-platform/tests/trusted-types/trusted-types-eval-reporting.tentative.https.html
rename to testing/web-platform/tests/trusted-types/trusted-types-eval-reporting.tentative.html

rename from testing/web-platform/tests/trusted-types/trusted-types-eval-reporting.tentative.https.html.headers
rename to testing/web-platform/tests/trusted-types/trusted-types-eval-reporting.tentative.html.headers

rename from testing/web-platform/tests/trusted-types/trusted-types-navigation.tentative.https.html
rename to testing/web-platform/tests/trusted-types/trusted-types-navigation.tentative.html

rename from testing/web-platform/tests/trusted-types/trusted-types-report-only.tentative.https.html
rename to testing/web-platform/tests/trusted-types/trusted-types-report-only.tentative.html

rename from testing/web-platform/tests/trusted-types/trusted-types-report-only.tentative.https.html.headers
rename to testing/web-platform/tests/trusted-types/trusted-types-report-only.tentative.html.headers

rename from testing/web-platform/tests/trusted-types/trusted-types-reporting-check-report.https.html
rename to testing/web-platform/tests/trusted-types/trusted-types-reporting-check-report.html

rename from testing/web-platform/tests/trusted-types/trusted-types-reporting-check-report.https.html.sub.headers
rename to testing/web-platform/tests/trusted-types/trusted-types-reporting-check-report.html.sub.headers

rename from testing/web-platform/tests/trusted-types/trusted-types-reporting.tentative.https.html
rename to testing/web-platform/tests/trusted-types/trusted-types-reporting.tentative.html

rename from testing/web-platform/tests/trusted-types/trusted-types-reporting.tentative.https.html.headers
rename to testing/web-platform/tests/trusted-types/trusted-types-reporting.tentative.html.headers

rename from testing/web-platform/tests/trusted-types/trusted-types-svg-script.tentative.https.html
rename to testing/web-platform/tests/trusted-types/trusted-types-svg-script.tentative.html

rename from testing/web-platform/tests/trusted-types/tt-block-eval.tentative.https.html
rename to testing/web-platform/tests/trusted-types/tt-block-eval.tentative.html