diff --git a/testing/marionette/reftest.js b/testing/marionette/reftest.js
index 9a2802361d4e..3309289b1263 100644
--- a/testing/marionette/reftest.js
+++ b/testing/marionette/reftest.js
@@ -128,7 +128,7 @@ reftest.Runner = class {
     let reftestWin = this.parentWindow.open(
         "chrome://marionette/content/reftest.xul",
         "reftest",
-        `chrome,height=${height},width=${width}`);
+        `chrome,height=${width},width=${height}`);
 
     await new Promise(resolve => {
       reftestWin.addEventListener("load", resolve, {once: true});
@@ -460,21 +460,16 @@ max-width: ${width}px; max-height: ${height}px`;
 
       let ctxInterface = win.CanvasRenderingContext2D;
       let flags = ctxInterface.DRAWWINDOW_DRAW_CARET |
-          ctxInterface.DRAWWINDOW_DRAW_VIEW |
-          ctxInterface.DRAWWINDOW_USE_WIDGET_LAYERS;
+          ctxInterface.DRAWWINDOW_DRAW_VIEW;
 
-      if (!(0 <= browserRect.left &&
-            0 <= browserRect.top &&
-            win.innerWidth >= browserRect.width &&
-            win.innerHeight >= browserRect.height)) {
-        logger.error(`Invalid window dimensions:
-browserRect.left: ${browserRect.left}
-browserRect.top: ${browserRect.top}
-win.innerWidth: ${win.innerWidth}
-browserRect.width: ${browserRect.width}
-win.innerHeight: ${win.innerHeight}
-browserRect.height: ${browserRect.height}`);
-        throw new Error("Window has incorrect dimensions");
+      if (0 <= browserRect.left &&
+          0 <= browserRect.top &&
+          win.innerWidth >= browserRect.width &&
+          win.innerHeight >= browserRect.height) {
+        logger.debug("Using DRAWWINDOW_USE_WIDGET_LAYERS");
+        flags |= ctxInterface.DRAWWINDOW_USE_WIDGET_LAYERS;
+      } else {
+        logger.debug("Not using DRAWWINDOW_USE_WIDGET_LAYERS");
       }
 
       url = new URL(url).href; // normalize the URL
diff --git a/testing/web-platform/meta/2dcontext/imagebitmap/createImageBitmap-origin.sub.html.ini b/testing/web-platform/meta/2dcontext/imagebitmap/createImageBitmap-origin.sub.html.ini
index 11819fa5a725..4f8324efc8de 100644
--- a/testing/web-platform/meta/2dcontext/imagebitmap/createImageBitmap-origin.sub.html.ini
+++ b/testing/web-platform/meta/2dcontext/imagebitmap/createImageBitmap-origin.sub.html.ini
@@ -2,9 +2,7 @@
   prefs: [network.http.send_window_size:0]
   [redirected to same-origin HTMLVideoElement: origin unclear getImageData]
     expected: FAIL
-
   [redirected to same-origin HTMLVideoElement: origin unclear 2dContext.drawImage]
     expected: FAIL
-
   [redirected to same-origin HTMLVideoElement: origin unclear bitmaprenderer.transferFromImageBitmap]
     expected: FAIL
diff --git a/testing/web-platform/meta/2dcontext/shadows/2d.shadow.enable.blur.html.ini b/testing/web-platform/meta/2dcontext/shadows/2d.shadow.enable.blur.html.ini
deleted file mode 100644
index 7b9f9c8d9eeb..000000000000
--- a/testing/web-platform/meta/2dcontext/shadows/2d.shadow.enable.blur.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[2d.shadow.enable.blur.html]
-  [Shadows are drawn if shadowBlur is set]
-    expected:
-      if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-
diff --git a/testing/web-platform/meta/WebIDL/ecmascript-binding/constructors.html.ini b/testing/web-platform/meta/WebIDL/ecmascript-binding/constructors.html.ini
deleted file mode 100644
index 9d51bc5440c2..000000000000
--- a/testing/web-platform/meta/WebIDL/ecmascript-binding/constructors.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[constructors.html]
-  [Constructor in child window with bad NewTarget from parent window]
-    expected: FAIL
-
-  [Constructor in parent window with bad NewTarget from child window]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/animation-worklet/animate-multiple-effects-on-different-targets-via-main-thread.https.html.ini b/testing/web-platform/meta/animation-worklet/animate-multiple-effects-on-different-targets-via-main-thread.https.html.ini
deleted file mode 100644
index c5e9c45b3fda..000000000000
--- a/testing/web-platform/meta/animation-worklet/animate-multiple-effects-on-different-targets-via-main-thread.https.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[animate-multiple-effects-on-different-targets-via-main-thread.https.html]
-  [Animating multiple effects on different targets via main thread should produce new output values accordingly]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/animation-worklet/animate-non-accelerated-property.https.html.ini b/testing/web-platform/meta/animation-worklet/animate-non-accelerated-property.https.html.ini
deleted file mode 100644
index 6e7696499e42..000000000000
--- a/testing/web-platform/meta/animation-worklet/animate-non-accelerated-property.https.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[animate-non-accelerated-property.https.html]
-  [Individual worklet animation should output values at specified local time for corresponding targets and effects]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/animation-worklet/animator-animate.https.html.ini b/testing/web-platform/meta/animation-worklet/animator-animate.https.html.ini
deleted file mode 100644
index 930e2c63e464..000000000000
--- a/testing/web-platform/meta/animation-worklet/animator-animate.https.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[animator-animate.https.html]
-  [Simple worklet animation should output values at specified local time]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/animation-worklet/animator-with-options.https.html.ini b/testing/web-platform/meta/animation-worklet/animator-with-options.https.html.ini
deleted file mode 100644
index 3002077ecdd9..000000000000
--- a/testing/web-platform/meta/animation-worklet/animator-with-options.https.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[animator-with-options.https.html]
-  [Animator should be able to use options to update the animation]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/animation-worklet/cancel-non-accelerated-property.https.html.ini b/testing/web-platform/meta/animation-worklet/cancel-non-accelerated-property.https.html.ini
deleted file mode 100644
index 118894430033..000000000000
--- a/testing/web-platform/meta/animation-worklet/cancel-non-accelerated-property.https.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[cancel-non-accelerated-property.https.html]
-  [Animation should update the outputs after starting and then return to pre-animated values after being cancelled]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/animation-worklet/current-time.https.html.ini b/testing/web-platform/meta/animation-worklet/current-time.https.html.ini
index 95581e54be00..3bdb0f7dcbf4 100644
--- a/testing/web-platform/meta/animation-worklet/current-time.https.html.ini
+++ b/testing/web-platform/meta/animation-worklet/current-time.https.html.ini
@@ -1,5 +1,4 @@
 [current-time.https.html]
-  expected: ERROR
   [The current time returns the hold time when set]
     expected: FAIL
 
diff --git a/testing/web-platform/meta/animation-worklet/multiple-effects-on-same-target-driven-by-individual-local-time.https.html.ini b/testing/web-platform/meta/animation-worklet/multiple-effects-on-same-target-driven-by-individual-local-time.https.html.ini
deleted file mode 100644
index b65fd2fd53f7..000000000000
--- a/testing/web-platform/meta/animation-worklet/multiple-effects-on-same-target-driven-by-individual-local-time.https.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[multiple-effects-on-same-target-driven-by-individual-local-time.https.html]
-  [Animating multiple effects on the same target using effect specific local time should output values\n  relative to each effects unique local time]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/bluetooth/idl/idlharness.tentative.https.window.js.ini b/testing/web-platform/meta/bluetooth/idl/idlharness.tentative.https.window.js.ini
index 572085316b5c..f67d7c996fd1 100644
--- a/testing/web-platform/meta/bluetooth/idl/idlharness.tentative.https.window.js.ini
+++ b/testing/web-platform/meta/bluetooth/idl/idlharness.tentative.https.window.js.ini
@@ -533,12 +533,3 @@
   [Navigator interface: navigator must inherit property "bluetooth" with the proper type]
     expected: FAIL
 
-  [Bluetooth interface: navigator.bluetooth must inherit property "onadvertisementreceived" with the proper type]
-    expected: FAIL
-
-  [Bluetooth interface: attribute onadvertisementreceived]
-    expected: FAIL
-
-  [BluetoothDevice interface: attribute onadvertisementreceived]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/client-hints/sec-ch-ua.https.html.ini b/testing/web-platform/meta/client-hints/sec-ch-ua.https.html.ini
deleted file mode 100644
index f7d9c18935f9..000000000000
--- a/testing/web-platform/meta/client-hints/sec-ch-ua.https.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[sec-ch-ua.https.html]
-  [Open HTTPS window post-opt-in: `Sec-CH-UA` header with minor version.]
-    expected: FAIL
-
-  [Open HTTPS window prior to opt-in: `Sec-CH-UA` header with minor version.]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/clipboard-apis/async-navigator-clipboard-basics.https.html.ini b/testing/web-platform/meta/clipboard-apis/async-navigator-clipboard-basics.https.html.ini
index bfdb28731892..31b3fbcac5b0 100644
--- a/testing/web-platform/meta/clipboard-apis/async-navigator-clipboard-basics.https.html.ini
+++ b/testing/web-platform/meta/clipboard-apis/async-navigator-clipboard-basics.https.html.ini
@@ -11,12 +11,3 @@
   [navigator.clipboard.read() succeeds]
     expected: FAIL
 
-  [navigator.clipboard.write(text/plain Blob) succeeds]
-    expected: FAIL
-
-  [navigator.clipboard.read() succeeds]
-    expected: FAIL
-
-  [navigator.clipboard.write(image/png Blob) succeeds]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/compat/webkit-text-fill-color-property-002.html.ini b/testing/web-platform/meta/compat/webkit-text-fill-color-property-002.html.ini
index 52fd32a12bcf..a19f97970d42 100644
--- a/testing/web-platform/meta/compat/webkit-text-fill-color-property-002.html.ini
+++ b/testing/web-platform/meta/compat/webkit-text-fill-color-property-002.html.ini
@@ -1,4 +1,4 @@
 [webkit-text-fill-color-property-002.html]
   prefs: [layout.css.prefixes.webkit:true]
   expected:
-    if os == "android": FAIL
+    if (os == "android"): FAIL
diff --git a/testing/web-platform/meta/content-security-policy/navigate-to/child-navigates-parent-allowed.html.ini b/testing/web-platform/meta/content-security-policy/navigate-to/child-navigates-parent-allowed.html.ini
index feb383f40be9..9fb22e3c6c38 100644
--- a/testing/web-platform/meta/content-security-policy/navigate-to/child-navigates-parent-allowed.html.ini
+++ b/testing/web-platform/meta/content-security-policy/navigate-to/child-navigates-parent-allowed.html.ini
@@ -1,3 +1,3 @@
 [child-navigates-parent-allowed.html]
   disabled:
-    if os == "linux": https://bugzilla.mozilla.org/show_bug.cgi?id=1450660
+    if (os == "linux"): https://bugzilla.mozilla.org/show_bug.cgi?id=1450660
diff --git a/testing/web-platform/meta/css/CSS2/abspos/abspos-containing-block-initial-009a.xht.ini b/testing/web-platform/meta/css/CSS2/abspos/abspos-containing-block-initial-009a.xht.ini
deleted file mode 100644
index c530e1ad42bf..000000000000
--- a/testing/web-platform/meta/css/CSS2/abspos/abspos-containing-block-initial-009a.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[abspos-containing-block-initial-009a.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/abspos/abspos-containing-block-initial-009b.xht.ini b/testing/web-platform/meta/css/CSS2/abspos/abspos-containing-block-initial-009b.xht.ini
deleted file mode 100644
index 2fc1f5d8bf3b..000000000000
--- a/testing/web-platform/meta/css/CSS2/abspos/abspos-containing-block-initial-009b.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[abspos-containing-block-initial-009b.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/abspos/abspos-containing-block-initial-009e.xht.ini b/testing/web-platform/meta/css/CSS2/abspos/abspos-containing-block-initial-009e.xht.ini
deleted file mode 100644
index 98a73faccbab..000000000000
--- a/testing/web-platform/meta/css/CSS2/abspos/abspos-containing-block-initial-009e.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[abspos-containing-block-initial-009e.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/abspos/abspos-containing-block-initial-009f.xht.ini b/testing/web-platform/meta/css/CSS2/abspos/abspos-containing-block-initial-009f.xht.ini
deleted file mode 100644
index c4b1ad1aa46c..000000000000
--- a/testing/web-platform/meta/css/CSS2/abspos/abspos-containing-block-initial-009f.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[abspos-containing-block-initial-009f.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/backgrounds/background-003.xht.ini b/testing/web-platform/meta/css/CSS2/backgrounds/background-003.xht.ini
index 84394e2b2140..ff05b3b0573f 100644
--- a/testing/web-platform/meta/css/CSS2/backgrounds/background-003.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/backgrounds/background-003.xht.ini
@@ -1,3 +1,3 @@
 [background-003.xht]
   expected:
-    if os == "android": FAIL
+    if (os == "android"): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/backgrounds/background-root-002.xht.ini b/testing/web-platform/meta/css/CSS2/backgrounds/background-root-002.xht.ini
new file mode 100644
index 000000000000..e35fd17f4480
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/backgrounds/background-root-002.xht.ini
@@ -0,0 +1,3 @@
+[background-root-002.xht]
+  expected:
+    if (os == "linux"): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/backgrounds/background-root-006.xht.ini b/testing/web-platform/meta/css/CSS2/backgrounds/background-root-006.xht.ini
new file mode 100644
index 000000000000..c643f174cec9
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/backgrounds/background-root-006.xht.ini
@@ -0,0 +1,3 @@
+[background-root-006.xht]
+  expected:
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/borders/border-applies-to-001.xht.ini b/testing/web-platform/meta/css/CSS2/borders/border-applies-to-001.xht.ini
index 244adfa1ec7a..b4a59b059534 100644
--- a/testing/web-platform/meta/css/CSS2/borders/border-applies-to-001.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/borders/border-applies-to-001.xht.ini
@@ -1,3 +1,3 @@
 [border-applies-to-001.xht]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/borders/border-applies-to-002.xht.ini b/testing/web-platform/meta/css/CSS2/borders/border-applies-to-002.xht.ini
index 06c733874ba1..8981a40740d8 100644
--- a/testing/web-platform/meta/css/CSS2/borders/border-applies-to-002.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/borders/border-applies-to-002.xht.ini
@@ -1,3 +1,3 @@
 [border-applies-to-002.xht]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/borders/border-applies-to-003.xht.ini b/testing/web-platform/meta/css/CSS2/borders/border-applies-to-003.xht.ini
index ddbc130562c4..2336065f27c0 100644
--- a/testing/web-platform/meta/css/CSS2/borders/border-applies-to-003.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/borders/border-applies-to-003.xht.ini
@@ -1,3 +1,3 @@
 [border-applies-to-003.xht]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/borders/border-applies-to-005.xht.ini b/testing/web-platform/meta/css/CSS2/borders/border-applies-to-005.xht.ini
index a89e71f2b043..1c77edfffbe5 100644
--- a/testing/web-platform/meta/css/CSS2/borders/border-applies-to-005.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/borders/border-applies-to-005.xht.ini
@@ -1,3 +1,3 @@
 [border-applies-to-005.xht]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/borders/border-applies-to-006.xht.ini b/testing/web-platform/meta/css/CSS2/borders/border-applies-to-006.xht.ini
index d2f9e545ba29..ba5a558110b5 100644
--- a/testing/web-platform/meta/css/CSS2/borders/border-applies-to-006.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/borders/border-applies-to-006.xht.ini
@@ -1,4 +1,4 @@
 [border-applies-to-006.xht]
   expected:
-    if os == "win": FAIL
-    if os == "mac": FAIL
+    if (os == "win"): FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/borders/border-applies-to-012.xht.ini b/testing/web-platform/meta/css/CSS2/borders/border-applies-to-012.xht.ini
index 2556d87a1089..1ac0b269c4b4 100644
--- a/testing/web-platform/meta/css/CSS2/borders/border-applies-to-012.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/borders/border-applies-to-012.xht.ini
@@ -1,4 +1,4 @@
 [border-applies-to-012.xht]
   expected:
-    if os == "win": FAIL
-    if os == "mac": FAIL
+    if (os == "win"): FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/borders/border-applies-to-013.xht.ini b/testing/web-platform/meta/css/CSS2/borders/border-applies-to-013.xht.ini
index a283a8875ef4..cc2133bead5f 100644
--- a/testing/web-platform/meta/css/CSS2/borders/border-applies-to-013.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/borders/border-applies-to-013.xht.ini
@@ -1,3 +1,3 @@
 [border-applies-to-013.xht]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/borders/border-applies-to-014.xht.ini b/testing/web-platform/meta/css/CSS2/borders/border-applies-to-014.xht.ini
index d15c78d55e26..b9122cf24e46 100644
--- a/testing/web-platform/meta/css/CSS2/borders/border-applies-to-014.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/borders/border-applies-to-014.xht.ini
@@ -1,3 +1,3 @@
 [border-applies-to-014.xht]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/borders/border-right-width-095.xht.ini b/testing/web-platform/meta/css/CSS2/borders/border-right-width-095.xht.ini
new file mode 100644
index 000000000000..94e978fce1cc
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/borders/border-right-width-095.xht.ini
@@ -0,0 +1,4 @@
+[border-right-width-095.xht]
+  expected:
+    if (os == "linux"): FAIL
+    if (os == "android"): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/box-display/block-in-inline-001.xht.ini b/testing/web-platform/meta/css/CSS2/box-display/block-in-inline-001.xht.ini
index a97a9bd30d0c..943c8529398c 100644
--- a/testing/web-platform/meta/css/CSS2/box-display/block-in-inline-001.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/box-display/block-in-inline-001.xht.ini
@@ -1,5 +1,5 @@
 [block-in-inline-001.xht]
   expected:
-    if os == "win": FAIL
-    if os == "mac": FAIL
-    if os == "android": FAIL
+    if (os == "win"): FAIL
+    if (os == "mac"): FAIL
+    if (os == "android"): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/box-display/block-in-inline-002.xht.ini b/testing/web-platform/meta/css/CSS2/box-display/block-in-inline-002.xht.ini
index 016f2212965d..b632fed03ee4 100644
--- a/testing/web-platform/meta/css/CSS2/box-display/block-in-inline-002.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/box-display/block-in-inline-002.xht.ini
@@ -1,5 +1,5 @@
 [block-in-inline-002.xht]
   expected:
-    if os == "win": FAIL
-    if os == "mac": FAIL
-    if os == "android": FAIL
+    if (os == "win"): FAIL
+    if (os == "mac"): FAIL
+    if (os == "android"): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5525-fltmult-000.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5525-fltmult-000.xht.ini
new file mode 100644
index 000000000000..9168554d7e6f
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/css1/c5525-fltmult-000.xht.ini
@@ -0,0 +1,2 @@
+[c5525-fltmult-000.xht]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-011.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-011.xht.ini
index 8dfbe4dfbf20..6cdc34186e99 100644
--- a/testing/web-platform/meta/css/CSS2/fonts/font-011.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-011.xht.ini
@@ -1,3 +1,3 @@
 [font-011.xht]
   expected:
-    if os == "win": FAIL
+    if (os == "win"): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-012.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-012.xht.ini
index 4bc3eb359ef5..9b9717ae7823 100644
--- a/testing/web-platform/meta/css/CSS2/fonts/font-012.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-012.xht.ini
@@ -1,3 +1,3 @@
 [font-012.xht]
   expected:
-    if os == "win": FAIL
+    if (os == "win"): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-013.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-013.xht.ini
index bcda3290ae9f..b0e4ffbdb4f7 100644
--- a/testing/web-platform/meta/css/CSS2/fonts/font-013.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-013.xht.ini
@@ -1,3 +1,3 @@
 [font-013.xht]
   expected:
-    if os == "win": FAIL
+    if (os == "win"): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-014.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-014.xht.ini
index 33c1e67e6919..18e6de436139 100644
--- a/testing/web-platform/meta/css/CSS2/fonts/font-014.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-014.xht.ini
@@ -1,3 +1,3 @@
 [font-014.xht]
   expected:
-    if os == "win": FAIL
+    if (os == "win"): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-015.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-015.xht.ini
index 393f42c2ec6e..b449ac7ac630 100644
--- a/testing/web-platform/meta/css/CSS2/fonts/font-015.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-015.xht.ini
@@ -1,3 +1,3 @@
 [font-015.xht]
   expected:
-    if os == "win": FAIL
+    if (os == "win"): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-016.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-016.xht.ini
index 39abbd145a3d..4a31113804de 100644
--- a/testing/web-platform/meta/css/CSS2/fonts/font-016.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-016.xht.ini
@@ -1,3 +1,3 @@
 [font-016.xht]
   expected:
-    if os == "win": FAIL
+    if (os == "win"): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-029.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-029.xht.ini
index ee15192d0efb..120db0fa8593 100644
--- a/testing/web-platform/meta/css/CSS2/fonts/font-029.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-029.xht.ini
@@ -1,3 +1,3 @@
 [font-029.xht]
   expected:
-    if os == "win": FAIL
+    if (os == "win"): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-030.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-030.xht.ini
index f124773f9921..97ef4abb305a 100644
--- a/testing/web-platform/meta/css/CSS2/fonts/font-030.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-030.xht.ini
@@ -1,3 +1,3 @@
 [font-030.xht]
   expected:
-    if os == "win": FAIL
+    if (os == "win"): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-031.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-031.xht.ini
index 306004b7354f..968183cafe2b 100644
--- a/testing/web-platform/meta/css/CSS2/fonts/font-031.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-031.xht.ini
@@ -1,3 +1,3 @@
 [font-031.xht]
   expected:
-    if os == "win": FAIL
+    if (os == "win"): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-032.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-032.xht.ini
index c693ea66dada..37b5002e4c9c 100644
--- a/testing/web-platform/meta/css/CSS2/fonts/font-032.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-032.xht.ini
@@ -1,3 +1,3 @@
 [font-032.xht]
   expected:
-    if os == "win": FAIL
+    if (os == "win"): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-042.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-042.xht.ini
index 821041c1b4fe..f20150f0c859 100644
--- a/testing/web-platform/meta/css/CSS2/fonts/font-042.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-042.xht.ini
@@ -1,3 +1,3 @@
 [font-042.xht]
   expected:
-    if os == "win": FAIL
+    if (os == "win"): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-043.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-043.xht.ini
index ec58c5e6cbe2..33fe0e8c4af6 100644
--- a/testing/web-platform/meta/css/CSS2/fonts/font-043.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-043.xht.ini
@@ -1,3 +1,3 @@
 [font-043.xht]
   expected:
-    if os == "win": FAIL
+    if (os == "win"): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-applies-to-001.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-applies-to-001.xht.ini
index bf7caf274ce5..d4287c3b29d3 100644
--- a/testing/web-platform/meta/css/CSS2/fonts/font-applies-to-001.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-applies-to-001.xht.ini
@@ -1,3 +1,3 @@
 [font-applies-to-001.xht]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-applies-to-007.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-applies-to-007.xht.ini
index ea85e27b2329..5b1d0ab1d434 100644
--- a/testing/web-platform/meta/css/CSS2/fonts/font-applies-to-007.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-applies-to-007.xht.ini
@@ -1,3 +1,3 @@
 [font-applies-to-007.xht]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-applies-to-017.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-applies-to-017.xht.ini
index db6e174aae82..4e1d8467adc4 100644
--- a/testing/web-platform/meta/css/CSS2/fonts/font-applies-to-017.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-applies-to-017.xht.ini
@@ -1,3 +1,3 @@
 [font-applies-to-017.xht]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-family-013.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-family-013.xht.ini
index d1e4b938f095..fff831e14432 100644
--- a/testing/web-platform/meta/css/CSS2/fonts/font-family-013.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-family-013.xht.ini
@@ -1,3 +1,3 @@
 [font-family-013.xht]
   expected:
-    if os == "win": FAIL
+    if (os == "win"): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-001.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-001.xht.ini
index 9dbdcce0bb81..89edeb4f476c 100644
--- a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-001.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-001.xht.ini
@@ -1,4 +1,4 @@
 [font-family-applies-to-001.xht]
   expected:
-    if os == "win": FAIL
-    if os == "android": FAIL
+    if (os == "win"): FAIL
+    if (os == "android"): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-002.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-002.xht.ini
index 4f73566ac25e..d86671e371ec 100644
--- a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-002.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-002.xht.ini
@@ -1,4 +1,4 @@
 [font-family-applies-to-002.xht]
   expected:
-    if os == "win": FAIL
-    if os == "android": FAIL
+    if (os == "win"): FAIL
+    if (os == "android"): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-005.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-005.xht.ini
index ea7dc19eef91..223b80e72f95 100644
--- a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-005.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-005.xht.ini
@@ -1,4 +1,4 @@
 [font-family-applies-to-005.xht]
   expected:
-    if os == "win": FAIL
-    if os == "android": FAIL
+    if (os == "win"): FAIL
+    if (os == "android"): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-006.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-006.xht.ini
index ac83ba9febcf..d89e0812d4ac 100644
--- a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-006.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-006.xht.ini
@@ -1,4 +1,4 @@
 [font-family-applies-to-006.xht]
   expected:
-    if os == "win": FAIL
-    if os == "android": FAIL
+    if (os == "win"): FAIL
+    if (os == "android"): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-007.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-007.xht.ini
index 2eee58937de1..2cf62a682b8c 100644
--- a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-007.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-007.xht.ini
@@ -1,4 +1,4 @@
 [font-family-applies-to-007.xht]
   expected:
-    if os == "win": FAIL
-    if os == "android": FAIL
+    if (os == "win"): FAIL
+    if (os == "android"): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-008.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-008.xht.ini
index 1dc0c7cc6852..e4b8fb785c10 100644
--- a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-008.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-008.xht.ini
@@ -1,4 +1,4 @@
 [font-family-applies-to-008.xht]
   expected:
-    if os == "win": FAIL
-    if os == "android": FAIL
+    if (os == "win"): FAIL
+    if (os == "android"): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-009.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-009.xht.ini
index ee963373c1c2..713cadc269ce 100644
--- a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-009.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-009.xht.ini
@@ -1,4 +1,4 @@
 [font-family-applies-to-009.xht]
   expected:
-    if os == "win": FAIL
-    if os == "android": FAIL
+    if (os == "win"): FAIL
+    if (os == "android"): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-010.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-010.xht.ini
index fc4b764fa83c..985bd864c84e 100644
--- a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-010.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-010.xht.ini
@@ -1,4 +1,4 @@
 [font-family-applies-to-010.xht]
   expected:
-    if os == "win": FAIL
-    if os == "android": FAIL
+    if (os == "win"): FAIL
+    if (os == "android"): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-011.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-011.xht.ini
index f6bb8fdf7273..62b7bc77fa14 100644
--- a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-011.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-011.xht.ini
@@ -1,4 +1,4 @@
 [font-family-applies-to-011.xht]
   expected:
-    if os == "win": FAIL
-    if os == "android": FAIL
+    if (os == "win"): FAIL
+    if (os == "android"): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-014.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-014.xht.ini
index a3bd9eb2d84b..bb2d1a5ade7b 100644
--- a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-014.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-014.xht.ini
@@ -1,4 +1,4 @@
 [font-family-applies-to-014.xht]
   expected:
-    if os == "win": FAIL
-    if os == "android": FAIL
+    if (os == "win"): FAIL
+    if (os == "android"): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-015.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-015.xht.ini
index 20ce80431dce..516972ee878b 100644
--- a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-015.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-015.xht.ini
@@ -1,4 +1,4 @@
 [font-family-applies-to-015.xht]
   expected:
-    if os == "win": FAIL
-    if os == "android": FAIL
+    if (os == "win"): FAIL
+    if (os == "android"): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-017.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-017.xht.ini
index 996a1e970a57..a81b193f1ed2 100644
--- a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-017.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-017.xht.ini
@@ -1,4 +1,4 @@
 [font-family-applies-to-017.xht]
   expected:
-    if os == "win": FAIL
-    if os == "android": FAIL
+    if (os == "win"): FAIL
+    if (os == "android"): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/generated-content/content-175.xht.ini b/testing/web-platform/meta/css/CSS2/generated-content/content-175.xht.ini
new file mode 100644
index 000000000000..6d8d2bb07d3f
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/generated-content/content-175.xht.ini
@@ -0,0 +1,2 @@
+[content-175.xht]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/generated-content/content-177.xht.ini b/testing/web-platform/meta/css/CSS2/generated-content/content-177.xht.ini
index 89a2618c5be5..fe9b378983ad 100644
--- a/testing/web-platform/meta/css/CSS2/generated-content/content-177.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/generated-content/content-177.xht.ini
@@ -1,5 +1,5 @@
 [content-177.xht]
   expected:
-    if os == "win": FAIL
-    if os == "mac": FAIL
-    if os == "android": FAIL
+    if (os == "win"): FAIL
+    if (os == "mac"): FAIL
+    if (os == "android"): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/inline-svg-100-percent-in-body.html.ini b/testing/web-platform/meta/css/CSS2/inline-svg-100-percent-in-body.html.ini
index ce2506ec8442..476027f13c85 100644
--- a/testing/web-platform/meta/css/CSS2/inline-svg-100-percent-in-body.html.ini
+++ b/testing/web-platform/meta/css/CSS2/inline-svg-100-percent-in-body.html.ini
@@ -1,3 +1,3 @@
 [inline-svg-100-percent-in-body.html]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/empty-inline-003.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/empty-inline-003.xht.ini
index 50643c9d6b5b..531fec23761a 100644
--- a/testing/web-platform/meta/css/CSS2/linebox/empty-inline-003.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/linebox/empty-inline-003.xht.ini
@@ -1,4 +1,4 @@
 [empty-inline-003.xht]
   expected:
-    if os == "win": FAIL
-    if os == "mac": FAIL
+    if (os == "win"): FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-002.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-002.xht.ini
index 4d4697ccfdee..2438f8b47218 100644
--- a/testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-002.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-002.xht.ini
@@ -1,5 +1,5 @@
 [inline-formatting-context-002.xht]
   expected:
-    if os == "win": FAIL
-    if os == "mac": FAIL
-    if os == "android": FAIL
+    if (os == "win"): FAIL
+    if (os == "mac"): FAIL
+    if (os == "android"): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-003.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-003.xht.ini
index 805ecfd6f935..9884674ddcd0 100644
--- a/testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-003.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-003.xht.ini
@@ -1,5 +1,5 @@
 [inline-formatting-context-003.xht]
   expected:
-    if os == "win": FAIL
-    if os == "mac": FAIL
-    if os == "android": FAIL
+    if (os == "win"): FAIL
+    if (os == "mac"): FAIL
+    if (os == "android"): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-004.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-004.xht.ini
index 48b516d77eb3..ef9a3125b410 100644
--- a/testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-004.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-004.xht.ini
@@ -1,5 +1,5 @@
 [inline-formatting-context-004.xht]
   expected:
-    if os == "win": FAIL
-    if os == "mac": FAIL
-    if os == "android": FAIL
+    if (os == "win"): FAIL
+    if (os == "mac"): FAIL
+    if (os == "android"): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-005.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-005.xht.ini
index 6bdbde75dd3b..efa9ec924538 100644
--- a/testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-005.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-005.xht.ini
@@ -1,5 +1,5 @@
 [inline-formatting-context-005.xht]
   expected:
-    if os == "win": FAIL
-    if os == "mac": FAIL
-    if os == "android": FAIL
+    if (os == "win"): FAIL
+    if (os == "mac"): FAIL
+    if (os == "android"): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-006.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-006.xht.ini
index d81b800c6393..222862a832fa 100644
--- a/testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-006.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-006.xht.ini
@@ -1,5 +1,5 @@
 [inline-formatting-context-006.xht]
   expected:
-    if os == "win": FAIL
-    if os == "mac": FAIL
-    if os == "android": FAIL
+    if (os == "win"): FAIL
+    if (os == "mac"): FAIL
+    if (os == "android"): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-007.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-007.xht.ini
index 7c9eeb9cc504..974a65ac107d 100644
--- a/testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-007.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-007.xht.ini
@@ -1,5 +1,5 @@
 [inline-formatting-context-007.xht]
   expected:
-    if os == "win": FAIL
-    if os == "mac": FAIL
-    if os == "android": FAIL
+    if (os == "win"): FAIL
+    if (os == "mac"): FAIL
+    if (os == "android"): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-013.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-013.xht.ini
index f385302c5868..2f412541f028 100644
--- a/testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-013.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-013.xht.ini
@@ -1,3 +1,3 @@
 [inline-formatting-context-013.xht]
   expected:
-    if os == "android": FAIL
+    if (os == "android"): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-baseline-004a.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-baseline-004a.xht.ini
new file mode 100644
index 000000000000..746ea0bc088d
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-baseline-004a.xht.ini
@@ -0,0 +1,5 @@
+[vertical-align-baseline-004a.xht]
+  expected:
+    if debug and (os == "linux") and (processor == "x86"): FAIL
+    if e10s and (os == "linux") and (processor == "x86_64"): FAIL
+    if not debug and e10s and (os == "linux") and (processor == "x86"): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-baseline-005a.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-baseline-005a.xht.ini
new file mode 100644
index 000000000000..e53b7e907c1b
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-baseline-005a.xht.ini
@@ -0,0 +1,5 @@
+[vertical-align-baseline-005a.xht]
+  expected:
+    if debug and (os == "linux") and (processor == "x86"): FAIL
+    if e10s and (os == "linux") and (processor == "x86_64"): FAIL
+    if not debug and e10s and (os == "linux") and (processor == "x86"): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-sub-001.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-sub-001.xht.ini
index 95feb428ea37..33ce2fff5a55 100644
--- a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-sub-001.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-sub-001.xht.ini
@@ -1,5 +1,5 @@
 [vertical-align-sub-001.xht]
   expected:
-    if os == "win": FAIL
-    if os == "mac": FAIL
-    if os == "android": FAIL
+    if (os == "win"): FAIL
+    if (os == "mac"): FAIL
+    if (os == "android"): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-super-001.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-super-001.xht.ini
index 856ba9bf0703..64c18c7d2ab4 100644
--- a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-super-001.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-super-001.xht.ini
@@ -1,5 +1,5 @@
 [vertical-align-super-001.xht]
   expected:
-    if os == "win": FAIL
-    if os == "mac": FAIL
-    if os == "android": FAIL
+    if (os == "win"): FAIL
+    if (os == "mac"): FAIL
+    if (os == "android"): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-collapse-001.xht.ini b/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-collapse-001.xht.ini
new file mode 100644
index 000000000000..5c53f1fd7543
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-collapse-001.xht.ini
@@ -0,0 +1,2 @@
+[margin-collapse-001.xht]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-collapse-020.xht.ini b/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-collapse-020.xht.ini
index 36048df1267c..00412c7c8675 100644
--- a/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-collapse-020.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-collapse-020.xht.ini
@@ -1,3 +1,3 @@
 [margin-collapse-020.xht]
   expected:
-    if os == "android": FAIL
+    if (os == "android"): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-collapse-021.xht.ini b/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-collapse-021.xht.ini
index ea32baa0fbda..61337d409acb 100644
--- a/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-collapse-021.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-collapse-021.xht.ini
@@ -1,3 +1,3 @@
 [margin-collapse-021.xht]
   expected:
-    if os == "android": FAIL
+    if (os == "android"): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-em-inherit-001.xht.ini b/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-em-inherit-001.xht.ini
index ea82b7a668e0..080f73f7e08d 100644
--- a/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-em-inherit-001.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-em-inherit-001.xht.ini
@@ -1,16 +1,2 @@
 [margin-em-inherit-001.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    FAIL
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-right-103.xht.ini b/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-right-103.xht.ini
new file mode 100644
index 000000000000..6aabb949e432
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-right-103.xht.ini
@@ -0,0 +1,2 @@
+[margin-right-103.xht]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-right-104.xht.ini b/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-right-104.xht.ini
index 03690507e90c..c913e0f76446 100644
--- a/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-right-104.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-right-104.xht.ini
@@ -1,9 +1,2 @@
 [margin-right-104.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-right-113.xht.ini b/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-right-113.xht.ini
new file mode 100644
index 000000000000..38651170f441
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-right-113.xht.ini
@@ -0,0 +1,2 @@
+[margin-right-113.xht]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/blocks-020.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/blocks-020.xht.ini
new file mode 100644
index 000000000000..f3bfeeed7322
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/normal-flow/blocks-020.xht.ini
@@ -0,0 +1,2 @@
+[blocks-020.xht]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/blocks-021.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/blocks-021.xht.ini
index 1f65bbbb2591..8df6897991e7 100644
--- a/testing/web-platform/meta/css/CSS2/normal-flow/blocks-021.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/normal-flow/blocks-021.xht.ini
@@ -1,7 +1,2 @@
 [blocks-021.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/blocks-022.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/blocks-022.xht.ini
index 410e43563318..7c4822527545 100644
--- a/testing/web-platform/meta/css/CSS2/normal-flow/blocks-022.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/normal-flow/blocks-022.xht.ini
@@ -1,19 +1,2 @@
 [blocks-022.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    FAIL
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/blocks-025.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/blocks-025.xht.ini
index a6796a893347..5878e4ac0947 100644
--- a/testing/web-platform/meta/css/CSS2/normal-flow/blocks-025.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/normal-flow/blocks-025.xht.ini
@@ -1,3 +1,3 @@
 [blocks-025.xht]
   expected:
-    if os == "android": FAIL
+    if (os == "android"): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/blocks-026.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/blocks-026.xht.ini
index f034dfa17895..e1b42abb2812 100644
--- a/testing/web-platform/meta/css/CSS2/normal-flow/blocks-026.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/normal-flow/blocks-026.xht.ini
@@ -1,3 +1,3 @@
 [blocks-026.xht]
   expected:
-    if os == "android": FAIL
+    if (os == "android"): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/inline-block-replaced-width-008.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/inline-block-replaced-width-008.xht.ini
index 3615c1ea28b0..c07c70978eff 100644
--- a/testing/web-platform/meta/css/CSS2/normal-flow/inline-block-replaced-width-008.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/normal-flow/inline-block-replaced-width-008.xht.ini
@@ -1,4 +1,2 @@
 [inline-block-replaced-width-008.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    FAIL
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/inline-replaced-width-009.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/inline-replaced-width-009.xht.ini
index 59a9cf5905e7..eff10e997697 100644
--- a/testing/web-platform/meta/css/CSS2/normal-flow/inline-replaced-width-009.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/normal-flow/inline-replaced-width-009.xht.ini
@@ -1,5 +1,6 @@
 [inline-replaced-width-009.xht]
   expected:
-    if os == "win": FAIL
-    if os == "linux": FAIL
-    if os == "mac": FAIL
+    if (os == "win"): FAIL
+    if (os == "linux"): FAIL
+    if (os == "android"): FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/inline-replaced-width-014.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/inline-replaced-width-014.xht.ini
new file mode 100644
index 000000000000..2d1e497cc145
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/normal-flow/inline-replaced-width-014.xht.ini
@@ -0,0 +1,2 @@
+[inline-replaced-width-014.xht]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/max-height-applies-to-012.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/max-height-applies-to-012.xht.ini
index e3a6259186b8..2a3e2e7c8803 100644
--- a/testing/web-platform/meta/css/CSS2/normal-flow/max-height-applies-to-012.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/normal-flow/max-height-applies-to-012.xht.ini
@@ -1,4 +1,4 @@
 [max-height-applies-to-012.xht]
   expected:
-    if os == "win": FAIL
-    if os == "mac": FAIL
+    if (os == "win"): FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/max-height-applies-to-013.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/max-height-applies-to-013.xht.ini
index 0b104693c2ff..9da7f01fac61 100644
--- a/testing/web-platform/meta/css/CSS2/normal-flow/max-height-applies-to-013.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/normal-flow/max-height-applies-to-013.xht.ini
@@ -1,3 +1,3 @@
 [max-height-applies-to-013.xht]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/max-height-applies-to-014.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/max-height-applies-to-014.xht.ini
index b2e56f19be2a..ae9479d216cd 100644
--- a/testing/web-platform/meta/css/CSS2/normal-flow/max-height-applies-to-014.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/normal-flow/max-height-applies-to-014.xht.ini
@@ -1,3 +1,3 @@
 [max-height-applies-to-014.xht]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/absolute-replaced-width-003c.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/absolute-replaced-width-003c.xht.ini
new file mode 100644
index 000000000000..d5bc068fe8c6
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/positioning/absolute-replaced-width-003c.xht.ini
@@ -0,0 +1,2 @@
+[absolute-replaced-width-003c.xht]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/absolute-replaced-width-004.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/absolute-replaced-width-004.xht.ini
index 1c4a31caf007..cef176a1c19f 100644
--- a/testing/web-platform/meta/css/CSS2/positioning/absolute-replaced-width-004.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/positioning/absolute-replaced-width-004.xht.ini
@@ -1,3 +1,3 @@
 [absolute-replaced-width-004.xht]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/absolute-replaced-width-009.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/absolute-replaced-width-009.xht.ini
index 25db06303a09..f35a6bb2e484 100644
--- a/testing/web-platform/meta/css/CSS2/positioning/absolute-replaced-width-009.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/positioning/absolute-replaced-width-009.xht.ini
@@ -1,3 +1,3 @@
 [absolute-replaced-width-009.xht]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/absolute-replaced-width-010.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/absolute-replaced-width-010.xht.ini
index 124a4328625f..7e88264136d6 100644
--- a/testing/web-platform/meta/css/CSS2/positioning/absolute-replaced-width-010.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/positioning/absolute-replaced-width-010.xht.ini
@@ -1,3 +1,3 @@
 [absolute-replaced-width-010.xht]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/absolute-replaced-width-011.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/absolute-replaced-width-011.xht.ini
index ef22d704ee2e..7dae0c23f2cc 100644
--- a/testing/web-platform/meta/css/CSS2/positioning/absolute-replaced-width-011.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/positioning/absolute-replaced-width-011.xht.ini
@@ -1,3 +1,3 @@
 [absolute-replaced-width-011.xht]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/absolute-replaced-width-023.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/absolute-replaced-width-023.xht.ini
index 281cce2006c2..fe4805b70c92 100644
--- a/testing/web-platform/meta/css/CSS2/positioning/absolute-replaced-width-023.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/positioning/absolute-replaced-width-023.xht.ini
@@ -1,3 +1,3 @@
 [absolute-replaced-width-023.xht]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/absolute-replaced-width-024.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/absolute-replaced-width-024.xht.ini
index 079220b7773d..e37a9e10c3bc 100644
--- a/testing/web-platform/meta/css/CSS2/positioning/absolute-replaced-width-024.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/positioning/absolute-replaced-width-024.xht.ini
@@ -1,3 +1,3 @@
 [absolute-replaced-width-024.xht]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/absolute-replaced-width-025.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/absolute-replaced-width-025.xht.ini
index d3b3eff09451..e06572dcb536 100644
--- a/testing/web-platform/meta/css/CSS2/positioning/absolute-replaced-width-025.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/positioning/absolute-replaced-width-025.xht.ini
@@ -1,3 +1,3 @@
 [absolute-replaced-width-025.xht]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/left-offset-percentage-002.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/left-offset-percentage-002.xht.ini
new file mode 100644
index 000000000000..1da7d09df267
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/positioning/left-offset-percentage-002.xht.ini
@@ -0,0 +1,2 @@
+[left-offset-percentage-002.xht]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/top-offset-percentage-002.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/top-offset-percentage-002.xht.ini
new file mode 100644
index 000000000000..a3cf8681178f
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/positioning/top-offset-percentage-002.xht.ini
@@ -0,0 +1,2 @@
+[top-offset-percentage-002.xht]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/selectors/universal-selector-005.xht.ini b/testing/web-platform/meta/css/CSS2/selectors/universal-selector-005.xht.ini
index e2f4e9f5ef65..e7607131235c 100644
--- a/testing/web-platform/meta/css/CSS2/selectors/universal-selector-005.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/universal-selector-005.xht.ini
@@ -1,4 +1,4 @@
 [universal-selector-005.xht]
   disabled:
-    if os == "linux": https://bugzilla.mozilla.org/show_bug.cgi?id=1383229
-    if os == "win": https://bugzilla.mozilla.org/show_bug.cgi?id=1383229
+    if (os == "linux"): https://bugzilla.mozilla.org/show_bug.cgi?id=1383229
+    if (os == "win"): https://bugzilla.mozilla.org/show_bug.cgi?id=1383229
diff --git a/testing/web-platform/meta/css/CSS2/stacking-context/opacity-change-twice-stacking-context.html.ini b/testing/web-platform/meta/css/CSS2/stacking-context/opacity-change-twice-stacking-context.html.ini
index 3189d9fe91f1..7a67dab84e8e 100644
--- a/testing/web-platform/meta/css/CSS2/stacking-context/opacity-change-twice-stacking-context.html.ini
+++ b/testing/web-platform/meta/css/CSS2/stacking-context/opacity-change-twice-stacking-context.html.ini
@@ -2,6 +2,6 @@
   disabled:
     if webrender and (os == "linux"): https://bugzilla.mozilla.org/show_bug.cgi?id=1526468
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
     if webrender and (os == "win"): FAIL
-    if os == "android": FAIL
+    if (os == "android"): "FAIL"
diff --git a/testing/web-platform/meta/css/CSS2/tables/separated-border-model-007.xht.ini b/testing/web-platform/meta/css/CSS2/tables/separated-border-model-007.xht.ini
new file mode 100644
index 000000000000..4212826241c2
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/tables/separated-border-model-007.xht.ini
@@ -0,0 +1,2 @@
+[separated-border-model-007.xht]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/separated-border-model-008.xht.ini b/testing/web-platform/meta/css/CSS2/tables/separated-border-model-008.xht.ini
index 09f3f50fe829..7535b3494927 100644
--- a/testing/web-platform/meta/css/CSS2/tables/separated-border-model-008.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/separated-border-model-008.xht.ini
@@ -1,8 +1,2 @@
 [separated-border-model-008.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/separated-border-model-009.xht.ini b/testing/web-platform/meta/css/CSS2/tables/separated-border-model-009.xht.ini
index 1c09c9f2d0fa..2a6b14fa1458 100644
--- a/testing/web-platform/meta/css/CSS2/tables/separated-border-model-009.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/separated-border-model-009.xht.ini
@@ -1,17 +1,2 @@
 [separated-border-model-009.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-059.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-059.xht.ini
new file mode 100644
index 000000000000..bd7f7c29b84c
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-059.xht.ini
@@ -0,0 +1,2 @@
+[table-anonymous-objects-059.xht]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-060.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-060.xht.ini
index 6ed20e947541..7a133b9a708e 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-060.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-060.xht.ini
@@ -1,8 +1,2 @@
 [table-anonymous-objects-060.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-061.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-061.xht.ini
index 62fa2839c9dc..849f9a8f3dad 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-061.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-061.xht.ini
@@ -1,19 +1,2 @@
 [table-anonymous-objects-061.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    FAIL
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-062.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-062.xht.ini
index ea969e461e38..7a3a6cbd4ba2 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-062.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-062.xht.ini
@@ -1,17 +1,2 @@
 [table-anonymous-objects-062.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-063.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-063.xht.ini
index 7d539fb7ee59..80c0866b91b7 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-063.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-063.xht.ini
@@ -1,17 +1,2 @@
 [table-anonymous-objects-063.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-064.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-064.xht.ini
index c45aebf254d4..5883298b5999 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-064.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-064.xht.ini
@@ -1,16 +1,2 @@
 [table-anonymous-objects-064.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-065.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-065.xht.ini
index f249fb155aa7..d8b598e1bba8 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-065.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-065.xht.ini
@@ -1,16 +1,2 @@
 [table-anonymous-objects-065.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-066.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-066.xht.ini
index af22887db296..b7ca756b6b42 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-066.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-066.xht.ini
@@ -1,16 +1,2 @@
 [table-anonymous-objects-066.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-067.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-067.xht.ini
index ba63cf0ce0ba..8da63e0f8989 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-067.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-067.xht.ini
@@ -1,16 +1,2 @@
 [table-anonymous-objects-067.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-068.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-068.xht.ini
index d67e7d3d6db9..a1e485352094 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-068.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-068.xht.ini
@@ -1,16 +1,2 @@
 [table-anonymous-objects-068.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-069.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-069.xht.ini
index a5f5437b1f3c..f7b15e03f5e3 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-069.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-069.xht.ini
@@ -1,16 +1,2 @@
 [table-anonymous-objects-069.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-070.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-070.xht.ini
index aff0b894294f..067295b2e2fb 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-070.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-070.xht.ini
@@ -1,16 +1,2 @@
 [table-anonymous-objects-070.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-071.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-071.xht.ini
index 44613fac53d3..b7f2cb6e4f5c 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-071.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-071.xht.ini
@@ -1,16 +1,2 @@
 [table-anonymous-objects-071.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-072.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-072.xht.ini
index 35415809f2e8..ce492ace3c29 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-072.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-072.xht.ini
@@ -1,16 +1,2 @@
 [table-anonymous-objects-072.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-073.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-073.xht.ini
index 7b4fcbdee56a..49c9f431fb4b 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-073.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-073.xht.ini
@@ -1,16 +1,2 @@
 [table-anonymous-objects-073.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-074.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-074.xht.ini
index 33b42a5c23df..b47564cf97b7 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-074.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-074.xht.ini
@@ -1,16 +1,2 @@
 [table-anonymous-objects-074.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-075.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-075.xht.ini
index 8a78cc205b22..61bec01ed6c8 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-075.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-075.xht.ini
@@ -1,16 +1,2 @@
 [table-anonymous-objects-075.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-076.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-076.xht.ini
index a92b2d438f4a..c802b73d0241 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-076.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-076.xht.ini
@@ -1,16 +1,2 @@
 [table-anonymous-objects-076.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-077.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-077.xht.ini
index 75c5c4605a52..4a97c286f93d 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-077.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-077.xht.ini
@@ -1,16 +1,2 @@
 [table-anonymous-objects-077.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-078.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-078.xht.ini
index 2e400063064f..20473af0d96d 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-078.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-078.xht.ini
@@ -1,16 +1,2 @@
 [table-anonymous-objects-078.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-087.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-087.xht.ini
index 17bc1982c505..074b2092d8e2 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-087.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-087.xht.ini
@@ -1,16 +1,2 @@
 [table-anonymous-objects-087.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-088.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-088.xht.ini
index a8b5aa94768d..4f22a3fc5900 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-088.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-088.xht.ini
@@ -1,16 +1,2 @@
 [table-anonymous-objects-088.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-089.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-089.xht.ini
index 7aec7507554f..2b40aea0ce19 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-089.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-089.xht.ini
@@ -1,16 +1,2 @@
 [table-anonymous-objects-089.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-090.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-090.xht.ini
index bb57311cff2f..45e1202068f7 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-090.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-090.xht.ini
@@ -1,16 +1,2 @@
 [table-anonymous-objects-090.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-091.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-091.xht.ini
index d011273d6a8f..dd27ea15fe81 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-091.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-091.xht.ini
@@ -1,16 +1,2 @@
 [table-anonymous-objects-091.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-092.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-092.xht.ini
index 1f5de1e58b13..9a5a1dbe59a1 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-092.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-092.xht.ini
@@ -1,16 +1,2 @@
 [table-anonymous-objects-092.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-099.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-099.xht.ini
index f7f3be7627d4..db04171058fc 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-099.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-099.xht.ini
@@ -1,16 +1,2 @@
 [table-anonymous-objects-099.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-100.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-100.xht.ini
index c0c2560ce72b..518978e53fe3 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-100.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-100.xht.ini
@@ -1,16 +1,2 @@
 [table-anonymous-objects-100.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-101.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-101.xht.ini
index ac2eec375f6e..435fdf1a5a68 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-101.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-101.xht.ini
@@ -1,16 +1,2 @@
 [table-anonymous-objects-101.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-102.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-102.xht.ini
index 4facc4fea222..170387d411cd 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-102.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-102.xht.ini
@@ -1,16 +1,2 @@
 [table-anonymous-objects-102.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-103.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-103.xht.ini
index 844a5b15f2f3..8e24928f52e2 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-103.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-103.xht.ini
@@ -1,16 +1,2 @@
 [table-anonymous-objects-103.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-104.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-104.xht.ini
index 9fb10e80e538..a53d0914fd3a 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-104.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-104.xht.ini
@@ -1,16 +1,2 @@
 [table-anonymous-objects-104.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-105.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-105.xht.ini
index 4d7a0817424e..94ff0122ef6d 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-105.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-105.xht.ini
@@ -1,16 +1,2 @@
 [table-anonymous-objects-105.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-106.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-106.xht.ini
index 120acfab6d76..712d19545141 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-106.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-106.xht.ini
@@ -1,16 +1,2 @@
 [table-anonymous-objects-106.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-107.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-107.xht.ini
index 773291165569..1dc9e86e34e9 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-107.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-107.xht.ini
@@ -1,16 +1,2 @@
 [table-anonymous-objects-107.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-108.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-108.xht.ini
index d4d01f5616d0..e82ee629b897 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-108.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-108.xht.ini
@@ -1,16 +1,2 @@
 [table-anonymous-objects-108.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-109.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-109.xht.ini
index 16eb28a83700..bde7d3ce6cce 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-109.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-109.xht.ini
@@ -1,16 +1,2 @@
 [table-anonymous-objects-109.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-110.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-110.xht.ini
index 03ad18d24f21..e61c1e3bb145 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-110.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-110.xht.ini
@@ -1,16 +1,2 @@
 [table-anonymous-objects-110.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-111.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-111.xht.ini
index fe58d8c2c92a..9f9aafa5900a 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-111.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-111.xht.ini
@@ -1,16 +1,2 @@
 [table-anonymous-objects-111.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-112.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-112.xht.ini
index 55de9dfb087a..d6678b2eb742 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-112.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-112.xht.ini
@@ -1,16 +1,2 @@
 [table-anonymous-objects-112.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-113.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-113.xht.ini
index 189affaa4425..d6b80387f53d 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-113.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-113.xht.ini
@@ -1,16 +1,2 @@
 [table-anonymous-objects-113.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-114.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-114.xht.ini
index 341c51078945..4e0818ae1cdf 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-114.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-114.xht.ini
@@ -1,16 +1,2 @@
 [table-anonymous-objects-114.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-123.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-123.xht.ini
index 878f5f4bb242..66559a57bc8b 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-123.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-123.xht.ini
@@ -1,16 +1,2 @@
 [table-anonymous-objects-123.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-124.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-124.xht.ini
index f24df2ddbb7d..e91aa62ebc72 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-124.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-124.xht.ini
@@ -1,16 +1,2 @@
 [table-anonymous-objects-124.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-125.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-125.xht.ini
index 3587a16a84a8..96f6e4976d55 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-125.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-125.xht.ini
@@ -1,16 +1,2 @@
 [table-anonymous-objects-125.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-126.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-126.xht.ini
index a59cf208c0a7..c9a5ac196fbb 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-126.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-126.xht.ini
@@ -1,16 +1,2 @@
 [table-anonymous-objects-126.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-127.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-127.xht.ini
index 70ba0ac41dae..976c52bf99c1 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-127.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-127.xht.ini
@@ -1,16 +1,2 @@
 [table-anonymous-objects-127.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-128.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-128.xht.ini
index 54b9550cd76b..3c189d614e5e 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-128.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-128.xht.ini
@@ -1,16 +1,2 @@
 [table-anonymous-objects-128.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-129.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-129.xht.ini
index 8713eaa4163e..663d86f499cd 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-129.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-129.xht.ini
@@ -1,16 +1,2 @@
 [table-anonymous-objects-129.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-130.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-130.xht.ini
index 701354a489e0..6d0b0102b5ab 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-130.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-130.xht.ini
@@ -1,16 +1,2 @@
 [table-anonymous-objects-130.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-131.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-131.xht.ini
index fb9054d382f3..dce0b114d517 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-131.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-131.xht.ini
@@ -1,16 +1,2 @@
 [table-anonymous-objects-131.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-132.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-132.xht.ini
index 114f583c510f..692aca74ad5d 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-132.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-132.xht.ini
@@ -1,16 +1,2 @@
 [table-anonymous-objects-132.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-133.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-133.xht.ini
index 7c4982b3a06d..2831b330d306 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-133.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-133.xht.ini
@@ -1,16 +1,2 @@
 [table-anonymous-objects-133.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-134.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-134.xht.ini
index bfb930a9e22c..459a7a2df74c 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-134.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-134.xht.ini
@@ -1,16 +1,2 @@
 [table-anonymous-objects-134.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-135.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-135.xht.ini
index 7803fc3f9fa2..7df5c5c1e6b8 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-135.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-135.xht.ini
@@ -1,16 +1,2 @@
 [table-anonymous-objects-135.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-136.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-136.xht.ini
index 549c5e980bdd..04d809ebb51c 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-136.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-136.xht.ini
@@ -1,16 +1,2 @@
 [table-anonymous-objects-136.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-137.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-137.xht.ini
index 88d6a44079a2..21398048f639 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-137.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-137.xht.ini
@@ -1,16 +1,2 @@
 [table-anonymous-objects-137.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-138.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-138.xht.ini
index 2c9daad8019a..cce1aaffe150 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-138.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-138.xht.ini
@@ -1,16 +1,2 @@
 [table-anonymous-objects-138.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-139.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-139.xht.ini
index 9d07a5ffe291..29390c79ff3c 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-139.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-139.xht.ini
@@ -1,16 +1,2 @@
 [table-anonymous-objects-139.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-140.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-140.xht.ini
index ed3fdede7e70..ac1073555afc 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-140.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-140.xht.ini
@@ -1,16 +1,2 @@
 [table-anonymous-objects-140.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-141.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-141.xht.ini
index 1862c42d4564..5beb3b673ec8 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-141.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-141.xht.ini
@@ -1,16 +1,2 @@
 [table-anonymous-objects-141.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-142.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-142.xht.ini
index d6b52399962f..eadb241686d5 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-142.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-142.xht.ini
@@ -1,16 +1,2 @@
 [table-anonymous-objects-142.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-143.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-143.xht.ini
index c3431f999534..f6b157553cae 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-143.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-143.xht.ini
@@ -1,16 +1,2 @@
 [table-anonymous-objects-143.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-144.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-144.xht.ini
index e33419a6b9e3..0e7fd6f8db0f 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-144.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-144.xht.ini
@@ -1,16 +1,2 @@
 [table-anonymous-objects-144.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-145.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-145.xht.ini
index e1cde0339694..61fa1f4a5f8c 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-145.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-145.xht.ini
@@ -1,16 +1,2 @@
 [table-anonymous-objects-145.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-146.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-146.xht.ini
index 9eaa8c2bdc61..c0a110a88e0e 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-146.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-146.xht.ini
@@ -1,16 +1,2 @@
 [table-anonymous-objects-146.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-147.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-147.xht.ini
index 572f60c70990..ed0627a8cb7c 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-147.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-147.xht.ini
@@ -1,15 +1,2 @@
 [table-anonymous-objects-147.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-148.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-148.xht.ini
index b1bfc49ab32d..a4a4cd17e60b 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-148.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-148.xht.ini
@@ -1,15 +1,2 @@
 [table-anonymous-objects-148.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-149.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-149.xht.ini
index 5ea5e69ac411..f1e430e9703d 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-149.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-149.xht.ini
@@ -1,15 +1,2 @@
 [table-anonymous-objects-149.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-150.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-150.xht.ini
index 5ff08f433e3d..765fc41f507b 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-150.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-150.xht.ini
@@ -1,15 +1,2 @@
 [table-anonymous-objects-150.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-151.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-151.xht.ini
index 302ca2df18e4..ab57d588a473 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-151.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-151.xht.ini
@@ -1,15 +1,2 @@
 [table-anonymous-objects-151.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-152.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-152.xht.ini
index ac2cc58778aa..10e66cc10138 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-152.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-152.xht.ini
@@ -1,15 +1,2 @@
 [table-anonymous-objects-152.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-153.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-153.xht.ini
index 8cba01cebab5..61071458068f 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-153.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-153.xht.ini
@@ -1,15 +1,2 @@
 [table-anonymous-objects-153.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-154.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-154.xht.ini
index 4deb67d7a4c2..fdcc65fcf0be 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-154.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-154.xht.ini
@@ -1,15 +1,2 @@
 [table-anonymous-objects-154.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-157.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-157.xht.ini
index 717ce8605fcc..cc84e04a7d0c 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-157.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-157.xht.ini
@@ -1,15 +1,2 @@
 [table-anonymous-objects-157.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-158.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-158.xht.ini
index a773406060cb..e36e94f46c17 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-158.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-158.xht.ini
@@ -1,15 +1,2 @@
 [table-anonymous-objects-158.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-159.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-159.xht.ini
index 1fd08edf34c6..c24db5c29142 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-159.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-159.xht.ini
@@ -1,15 +1,2 @@
 [table-anonymous-objects-159.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-160.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-160.xht.ini
index 1259f2ec029c..51e13bcfaaa2 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-160.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-160.xht.ini
@@ -1,15 +1,2 @@
 [table-anonymous-objects-160.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-161.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-161.xht.ini
index fd70b2da6ae9..3353dd5e3bdd 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-161.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-161.xht.ini
@@ -1,15 +1,2 @@
 [table-anonymous-objects-161.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-162.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-162.xht.ini
index 1f8f6cc59f0b..712c5d63801f 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-162.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-162.xht.ini
@@ -1,15 +1,2 @@
 [table-anonymous-objects-162.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-163.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-163.xht.ini
index f90446c1ad1e..adf7ccaafa28 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-163.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-163.xht.ini
@@ -1,15 +1,2 @@
 [table-anonymous-objects-163.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-164.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-164.xht.ini
index 3b55965c9b32..c3d14a5293ff 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-164.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-164.xht.ini
@@ -1,15 +1,2 @@
 [table-anonymous-objects-164.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-165.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-165.xht.ini
index 546df67991f5..66d9db1666e1 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-165.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-165.xht.ini
@@ -1,15 +1,2 @@
 [table-anonymous-objects-165.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-166.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-166.xht.ini
index 7fa5b384bec6..a3d6578e2989 100644
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-166.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-166.xht.ini
@@ -1,15 +1,2 @@
 [table-anonymous-objects-166.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/values/numbers-units-007.xht.ini b/testing/web-platform/meta/css/CSS2/values/numbers-units-007.xht.ini
index 9e9c28061420..5427e6ea0f58 100644
--- a/testing/web-platform/meta/css/CSS2/values/numbers-units-007.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/values/numbers-units-007.xht.ini
@@ -1,4 +1,4 @@
 [numbers-units-007.xht]
   expected:
-    if os == "win": FAIL
-    if os == "android": FAIL
+    if (os == "win"): FAIL
+    if (os == "android"): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/values/numbers-units-009.xht.ini b/testing/web-platform/meta/css/CSS2/values/numbers-units-009.xht.ini
index e0a410b3258d..a7520f077db0 100644
--- a/testing/web-platform/meta/css/CSS2/values/numbers-units-009.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/values/numbers-units-009.xht.ini
@@ -1,4 +1,4 @@
 [numbers-units-009.xht]
   expected:
-    if os == "win": FAIL
-    if os == "android": FAIL
+    if (os == "win"): FAIL
+    if (os == "android"): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/values/numbers-units-010.xht.ini b/testing/web-platform/meta/css/CSS2/values/numbers-units-010.xht.ini
index ed5e05453f5d..54f5594bc7f7 100644
--- a/testing/web-platform/meta/css/CSS2/values/numbers-units-010.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/values/numbers-units-010.xht.ini
@@ -1,4 +1,4 @@
 [numbers-units-010.xht]
   expected:
-    if os == "win": FAIL
-    if os == "android": FAIL
+    if (os == "win"): FAIL
+    if (os == "android"): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/values/numbers-units-021.xht.ini b/testing/web-platform/meta/css/CSS2/values/numbers-units-021.xht.ini
index 2740bb0fdc9b..b575c8256e47 100644
--- a/testing/web-platform/meta/css/CSS2/values/numbers-units-021.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/values/numbers-units-021.xht.ini
@@ -1,4 +1,4 @@
 [numbers-units-021.xht]
   expected:
-    if os == "win": FAIL
-    if os == "android": FAIL
+    if (os == "win"): FAIL
+    if (os == "android"): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/values/units-002.xht.ini b/testing/web-platform/meta/css/CSS2/values/units-002.xht.ini
new file mode 100644
index 000000000000..17c17365095f
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/values/units-002.xht.ini
@@ -0,0 +1,2 @@
+[units-002.xht]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/CSS2/visuren/top-114.xht.ini b/testing/web-platform/meta/css/CSS2/visuren/top-114.xht.ini
new file mode 100644
index 000000000000..e6545a3d365b
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/visuren/top-114.xht.ini
@@ -0,0 +1,6 @@
+[top-114.xht]
+  expected:
+    if (os == "win"): FAIL
+    if (os == "linux"): FAIL
+    if (os == "mac"): FAIL
+    if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
diff --git a/testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-blended-element-interposed.html.ini b/testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-blended-element-interposed.html.ini
index f8598f1c8f11..5d7e67aaca57 100644
--- a/testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-blended-element-interposed.html.ini
+++ b/testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-blended-element-interposed.html.ini
@@ -1,5 +1,5 @@
 [mix-blend-mode-blended-element-interposed.html]
   expected:
-    if os == "win": FAIL
-    if os == "mac": FAIL
-    if os == "android": FAIL
+    if (os == "win"): FAIL
+    if (os == "mac"): FAIL
+    if (os == "android"): FAIL
diff --git a/testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-blended-element-overflow-hidden-and-border-radius.html.ini b/testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-blended-element-overflow-hidden-and-border-radius.html.ini
index 6e209286b4df..9b54090199f7 100644
--- a/testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-blended-element-overflow-hidden-and-border-radius.html.ini
+++ b/testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-blended-element-overflow-hidden-and-border-radius.html.ini
@@ -3,5 +3,5 @@
     if (os == "linux") and not webrender: FAIL
     if (os == "win") and (version == "6.1.7601"): FAIL
     if not webrender and (os == "win") and (version == "10.0.17134"): FAIL
-    if os == "mac": FAIL
-    if os == "android": FAIL
+    if (os == "mac"): FAIL
+    if (os == "android"): FAIL
diff --git a/testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-paragraph-background-image.html.ini b/testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-paragraph-background-image.html.ini
index 3f0fb3dc7f41..d33e9b020aec 100644
--- a/testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-paragraph-background-image.html.ini
+++ b/testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-paragraph-background-image.html.ini
@@ -1,5 +1,5 @@
 [mix-blend-mode-paragraph-background-image.html]
   expected:
-    if os == "win": FAIL
-    if os == "mac": FAIL
-    if os == "android": FAIL
+    if (os == "win"): FAIL
+    if (os == "mac"): FAIL
+    if (os == "android"): FAIL
diff --git a/testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-paragraph.html.ini b/testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-paragraph.html.ini
index 7a0453470e16..0c253b1a5186 100644
--- a/testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-paragraph.html.ini
+++ b/testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-paragraph.html.ini
@@ -1,5 +1,5 @@
 [mix-blend-mode-paragraph.html]
   expected:
-    if os == "win": FAIL
-    if os == "mac": FAIL
-    if os == "android": FAIL
+    if (os == "win"): FAIL
+    if (os == "mac"): FAIL
+    if (os == "android"): FAIL
diff --git a/testing/web-platform/meta/css/compositing/svg/mix-blend-mode-svg-rectangle.html.ini b/testing/web-platform/meta/css/compositing/svg/mix-blend-mode-svg-rectangle.html.ini
index 1043de772799..8cbd8cad9aeb 100644
--- a/testing/web-platform/meta/css/compositing/svg/mix-blend-mode-svg-rectangle.html.ini
+++ b/testing/web-platform/meta/css/compositing/svg/mix-blend-mode-svg-rectangle.html.ini
@@ -1,3 +1,3 @@
 [mix-blend-mode-svg-rectangle.html]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-backgrounds/background-clip-color-repaint.html.ini b/testing/web-platform/meta/css/css-backgrounds/background-clip-color-repaint.html.ini
index 002158078d43..4406ec03e65d 100644
--- a/testing/web-platform/meta/css/css-backgrounds/background-clip-color-repaint.html.ini
+++ b/testing/web-platform/meta/css/css-backgrounds/background-clip-color-repaint.html.ini
@@ -3,5 +3,5 @@
     if (os == "linux") and not webrender: FAIL
     if (os == "win") and (version == "6.1.7601"): FAIL
     if not webrender and (os == "win") and (version == "10.0.17134"): FAIL
-    if os == "mac": FAIL
-    if os == "android": FAIL
+    if (os == "mac"): FAIL
+    if (os == "android"): FAIL
diff --git a/testing/web-platform/meta/css/css-backgrounds/background-clip-color.html.ini b/testing/web-platform/meta/css/css-backgrounds/background-clip-color.html.ini
index 5f4c2bc8f3e3..25bdbf125f7e 100644
--- a/testing/web-platform/meta/css/css-backgrounds/background-clip-color.html.ini
+++ b/testing/web-platform/meta/css/css-backgrounds/background-clip-color.html.ini
@@ -3,5 +3,5 @@
     if (os == "linux") and not webrender: FAIL
     if (os == "win") and (version == "6.1.7601"): FAIL
     if not webrender and (os == "win") and (version == "10.0.17134"): FAIL
-    if os == "mac": FAIL
-    if os == "android": FAIL
+    if (os == "mac"): FAIL
+    if (os == "android"): FAIL
diff --git a/testing/web-platform/meta/css/css-backgrounds/background-repeat/background-repeat-round.xht.ini b/testing/web-platform/meta/css/css-backgrounds/background-repeat/background-repeat-round.xht.ini
index bcdf091ec86b..84d991f37e81 100644
--- a/testing/web-platform/meta/css/css-backgrounds/background-repeat/background-repeat-round.xht.ini
+++ b/testing/web-platform/meta/css/css-backgrounds/background-repeat/background-repeat-round.xht.ini
@@ -1,7 +1,4 @@
 [background-repeat-round.xht]
   expected:
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
+    if webrender: PASS
     FAIL
diff --git a/testing/web-platform/meta/css/css-backgrounds/background-size/background-size-contain.xht.ini b/testing/web-platform/meta/css/css-backgrounds/background-size/background-size-contain.xht.ini
index 567c457ece06..8f3f0a8a69f1 100644
--- a/testing/web-platform/meta/css/css-backgrounds/background-size/background-size-contain.xht.ini
+++ b/testing/web-platform/meta/css/css-backgrounds/background-size/background-size-contain.xht.ini
@@ -1,7 +1,4 @@
 [background-size-contain.xht]
   expected:
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
+    if webrender: PASS
     FAIL
diff --git a/testing/web-platform/meta/css/css-backgrounds/border-image-5.html.ini b/testing/web-platform/meta/css/css-backgrounds/border-image-5.html.ini
new file mode 100644
index 000000000000..06a2295c4fc9
--- /dev/null
+++ b/testing/web-platform/meta/css/css-backgrounds/border-image-5.html.ini
@@ -0,0 +1,2 @@
+[border-image-5.html]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-backgrounds/border-image-6.html.ini b/testing/web-platform/meta/css/css-backgrounds/border-image-6.html.ini
new file mode 100644
index 000000000000..7d6c15059a95
--- /dev/null
+++ b/testing/web-platform/meta/css/css-backgrounds/border-image-6.html.ini
@@ -0,0 +1,2 @@
+[border-image-6.html]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-backgrounds/border-image-outset-003.html.ini b/testing/web-platform/meta/css/css-backgrounds/border-image-outset-003.html.ini
new file mode 100644
index 000000000000..5bdd0654b2fc
--- /dev/null
+++ b/testing/web-platform/meta/css/css-backgrounds/border-image-outset-003.html.ini
@@ -0,0 +1,2 @@
+[border-image-outset-003.html]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-cascade/unset-val-001.html.ini b/testing/web-platform/meta/css/css-cascade/unset-val-001.html.ini
index 7a599a8a4f5d..701b5b8d2075 100644
--- a/testing/web-platform/meta/css/css-cascade/unset-val-001.html.ini
+++ b/testing/web-platform/meta/css/css-cascade/unset-val-001.html.ini
@@ -1,3 +1,3 @@
 [unset-val-001.html]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-color/currentcolor-001.html.ini b/testing/web-platform/meta/css/css-color/currentcolor-001.html.ini
index dce17c54fd90..d3773a1fcd2b 100644
--- a/testing/web-platform/meta/css/css-color/currentcolor-001.html.ini
+++ b/testing/web-platform/meta/css/css-color/currentcolor-001.html.ini
@@ -1,3 +1,3 @@
 [currentcolor-001.html]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-color/currentcolor-002.html.ini b/testing/web-platform/meta/css/css-color/currentcolor-002.html.ini
index a0fb63fa5313..e2e4bc40c560 100644
--- a/testing/web-platform/meta/css/css-color/currentcolor-002.html.ini
+++ b/testing/web-platform/meta/css/css-color/currentcolor-002.html.ini
@@ -1,3 +1,3 @@
 [currentcolor-002.html]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-contain/contain-layout-017.html.ini b/testing/web-platform/meta/css/css-contain/contain-layout-017.html.ini
index a1ed92a28e6d..2f925820273c 100644
--- a/testing/web-platform/meta/css/css-contain/contain-layout-017.html.ini
+++ b/testing/web-platform/meta/css/css-contain/contain-layout-017.html.ini
@@ -1,4 +1,4 @@
 [contain-layout-017.html]
   expected:
-    if os == "win": FAIL
-    if os == "mac": FAIL
+    if (os == "win"): FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-contain/contain-layout-018.html.ini b/testing/web-platform/meta/css/css-contain/contain-layout-018.html.ini
index ef7888bc29cc..5804c7b120be 100644
--- a/testing/web-platform/meta/css/css-contain/contain-layout-018.html.ini
+++ b/testing/web-platform/meta/css/css-contain/contain-layout-018.html.ini
@@ -1,4 +1,4 @@
 [contain-layout-018.html]
   expected:
-    if os == "win": FAIL
-    if os == "mac": FAIL
+    if (os == "win"): FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-contain/contain-paint-020.html.ini b/testing/web-platform/meta/css/css-contain/contain-paint-020.html.ini
index 3d318a0f03f1..9e4440f16b90 100644
--- a/testing/web-platform/meta/css/css-contain/contain-paint-020.html.ini
+++ b/testing/web-platform/meta/css/css-contain/contain-paint-020.html.ini
@@ -1,3 +1,3 @@
 [contain-paint-020.html]
   expected:
-    if os == "win": FAIL
+    if (os == "win"): FAIL
diff --git a/testing/web-platform/meta/css/css-contain/contain-paint-021.html.ini b/testing/web-platform/meta/css/css-contain/contain-paint-021.html.ini
index 9410b19343b8..4de177debd3d 100644
--- a/testing/web-platform/meta/css/css-contain/contain-paint-021.html.ini
+++ b/testing/web-platform/meta/css/css-contain/contain-paint-021.html.ini
@@ -1,4 +1,4 @@
 [contain-paint-021.html]
   expected:
-    if os == "win": FAIL
-    if os == "mac": FAIL
+    if (os == "win"): FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-display/display-contents-fieldset.html.ini b/testing/web-platform/meta/css/css-display/display-contents-fieldset.html.ini
index 1c0e7423700c..a84d508540c6 100644
--- a/testing/web-platform/meta/css/css-display/display-contents-fieldset.html.ini
+++ b/testing/web-platform/meta/css/css-display/display-contents-fieldset.html.ini
@@ -1,3 +1,3 @@
 [display-contents-fieldset.html]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-display/display-contents-line-height.html.ini b/testing/web-platform/meta/css/css-display/display-contents-line-height.html.ini
index 3fbac58245f0..204f4748a6cc 100644
--- a/testing/web-platform/meta/css/css-display/display-contents-line-height.html.ini
+++ b/testing/web-platform/meta/css/css-display/display-contents-line-height.html.ini
@@ -1,10 +1,4 @@
 [display-contents-line-height.html]
   expected:
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if (os == "linux"): PASS
     FAIL
diff --git a/testing/web-platform/meta/css/css-flexbox/align-items-baseline-overflow-non-visible.html.ini b/testing/web-platform/meta/css/css-flexbox/align-items-baseline-overflow-non-visible.html.ini
index 25d53e7d0a96..0ab374db0887 100644
--- a/testing/web-platform/meta/css/css-flexbox/align-items-baseline-overflow-non-visible.html.ini
+++ b/testing/web-platform/meta/css/css-flexbox/align-items-baseline-overflow-non-visible.html.ini
@@ -1,5 +1,5 @@
 [align-items-baseline-overflow-non-visible.html]
   expected:
-    if os == "win": FAIL
-    if os == "mac": FAIL
-    if os == "android": FAIL
+    if (os == "win"): FAIL
+    if (os == "mac"): FAIL
+    if (os == "android"): FAIL
diff --git a/testing/web-platform/meta/css/css-flexbox/flex-lines/multi-line-wrap-reverse-column-reverse.html.ini b/testing/web-platform/meta/css/css-flexbox/flex-lines/multi-line-wrap-reverse-column-reverse.html.ini
deleted file mode 100644
index f058b16b30e6..000000000000
--- a/testing/web-platform/meta/css/css-flexbox/flex-lines/multi-line-wrap-reverse-column-reverse.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[multi-line-wrap-reverse-column-reverse.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/css-flexbox/flex-lines/multi-line-wrap-with-column-reverse.html.ini b/testing/web-platform/meta/css/css-flexbox/flex-lines/multi-line-wrap-with-column-reverse.html.ini
deleted file mode 100644
index f6c5c64437f8..000000000000
--- a/testing/web-platform/meta/css/css-flexbox/flex-lines/multi-line-wrap-with-column-reverse.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[multi-line-wrap-with-column-reverse.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/css-flexbox/flexbox_order-box.html.ini b/testing/web-platform/meta/css/css-flexbox/flexbox_order-box.html.ini
new file mode 100644
index 000000000000..b75bebaa6253
--- /dev/null
+++ b/testing/web-platform/meta/css/css-flexbox/flexbox_order-box.html.ini
@@ -0,0 +1,2 @@
+[flexbox_order-box.html]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-flexbox/flexbox_visibility-collapse-line-wrapping.html.ini b/testing/web-platform/meta/css/css-flexbox/flexbox_visibility-collapse-line-wrapping.html.ini
new file mode 100644
index 000000000000..e7437f635bd4
--- /dev/null
+++ b/testing/web-platform/meta/css/css-flexbox/flexbox_visibility-collapse-line-wrapping.html.ini
@@ -0,0 +1,2 @@
+[flexbox_visibility-collapse-line-wrapping.html]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-flexbox/ttwf-reftest-flex-direction-row-reverse.html.ini b/testing/web-platform/meta/css/css-flexbox/ttwf-reftest-flex-direction-row-reverse.html.ini
new file mode 100644
index 000000000000..97838ec8b9fc
--- /dev/null
+++ b/testing/web-platform/meta/css/css-flexbox/ttwf-reftest-flex-direction-row-reverse.html.ini
@@ -0,0 +1,2 @@
+[ttwf-reftest-flex-direction-row-reverse.html]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-flexbox/ttwf-reftest-flex-order.html.ini b/testing/web-platform/meta/css/css-flexbox/ttwf-reftest-flex-order.html.ini
index e3fee0f8b546..484d178d5d60 100644
--- a/testing/web-platform/meta/css/css-flexbox/ttwf-reftest-flex-order.html.ini
+++ b/testing/web-platform/meta/css/css-flexbox/ttwf-reftest-flex-order.html.ini
@@ -1,17 +1,2 @@
 [ttwf-reftest-flex-order.html]
-  expected:
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-fonts/variations/variable-box-font.html.ini b/testing/web-platform/meta/css/css-fonts/variations/variable-box-font.html.ini
index 36321c33154b..c7b614e05270 100644
--- a/testing/web-platform/meta/css/css-fonts/variations/variable-box-font.html.ini
+++ b/testing/web-platform/meta/css/css-fonts/variations/variable-box-font.html.ini
@@ -1,4 +1,4 @@
 [variable-box-font.html]
   expected:
     if (os == "win") and (version == "6.1.7601"): FAIL
-    if (os == "mac") and (version != "OS X 10.13") and (version != "OS X 10.14"): FAIL
+    if (os == "mac") and (version != "OS X 10.13" and version != "OS X 10.14"): FAIL
diff --git a/testing/web-platform/meta/css/css-fonts/variations/variable-gpos-m2b.html.ini b/testing/web-platform/meta/css/css-fonts/variations/variable-gpos-m2b.html.ini
index 958aace8be5b..8fabcc1f5b74 100644
--- a/testing/web-platform/meta/css/css-fonts/variations/variable-gpos-m2b.html.ini
+++ b/testing/web-platform/meta/css/css-fonts/variations/variable-gpos-m2b.html.ini
@@ -1,4 +1,4 @@
 [variable-gpos-m2b.html]
   expected:
     if (os == "win") and (version == "6.1.7601"): FAIL
-    if (os == "mac") and (version != "OS X 10.13") and (version != "OS X 10.14"): FAIL
+    if (os == "mac") and (version != "OS X 10.13" and version != "OS X 10.14"): FAIL
diff --git a/testing/web-platform/meta/css/css-fonts/variations/variable-gsub.html.ini b/testing/web-platform/meta/css/css-fonts/variations/variable-gsub.html.ini
index f848f6579640..87d4b4b66652 100644
--- a/testing/web-platform/meta/css/css-fonts/variations/variable-gsub.html.ini
+++ b/testing/web-platform/meta/css/css-fonts/variations/variable-gsub.html.ini
@@ -1,4 +1,4 @@
 [variable-gsub.html]
   expected:
     if (os == "win") and (version == "6.1.7601"): FAIL
-    if (os == "mac") and (version != "OS X 10.13") and (version != "OS X 10.14"): FAIL
+    if (os == "mac") and (version != "OS X 10.13" and version != "OS X 10.14"): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-002.html.ini b/testing/web-platform/meta/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-002.html.ini
index ca12e151dcee..4015a2054718 100644
--- a/testing/web-platform/meta/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-002.html.ini
+++ b/testing/web-platform/meta/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-002.html.ini
@@ -1,3 +1,3 @@
 [grid-self-baseline-changes-grid-area-size-002.html]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-model/display-grid.html.ini b/testing/web-platform/meta/css/css-grid/grid-model/display-grid.html.ini
index 08045aeb72ab..ab335043bc57 100644
--- a/testing/web-platform/meta/css/css-grid/grid-model/display-grid.html.ini
+++ b/testing/web-platform/meta/css/css-grid/grid-model/display-grid.html.ini
@@ -1,3 +1,3 @@
 [display-grid.html]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-model/display-inline-grid.html.ini b/testing/web-platform/meta/css/css-grid/grid-model/display-inline-grid.html.ini
index 2390e70f4c4a..6a4ca4af1709 100644
--- a/testing/web-platform/meta/css/css-grid/grid-model/display-inline-grid.html.ini
+++ b/testing/web-platform/meta/css/css-grid/grid-model/display-inline-grid.html.ini
@@ -1,3 +1,3 @@
 [display-inline-grid.html]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-model/grid-container-scrollbar-vertical-lr-001.html.ini b/testing/web-platform/meta/css/css-grid/grid-model/grid-container-scrollbar-vertical-lr-001.html.ini
index fd1c49f711b2..34fdc5e834a5 100644
--- a/testing/web-platform/meta/css/css-grid/grid-model/grid-container-scrollbar-vertical-lr-001.html.ini
+++ b/testing/web-platform/meta/css/css-grid/grid-model/grid-container-scrollbar-vertical-lr-001.html.ini
@@ -1,3 +1,3 @@
 [grid-container-scrollbar-vertical-lr-001.html]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-model/grid-container-scrollbar-vertical-rl-001.html.ini b/testing/web-platform/meta/css/css-grid/grid-model/grid-container-scrollbar-vertical-rl-001.html.ini
index 442a2746643a..046b60641cef 100644
--- a/testing/web-platform/meta/css/css-grid/grid-model/grid-container-scrollbar-vertical-rl-001.html.ini
+++ b/testing/web-platform/meta/css/css-grid/grid-model/grid-container-scrollbar-vertical-rl-001.html.ini
@@ -1,3 +1,3 @@
 [grid-container-scrollbar-vertical-rl-001.html]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-images/tiled-radial-gradients.html.ini b/testing/web-platform/meta/css/css-images/tiled-radial-gradients.html.ini
new file mode 100644
index 000000000000..01e431afe7c9
--- /dev/null
+++ b/testing/web-platform/meta/css/css-images/tiled-radial-gradients.html.ini
@@ -0,0 +1,2 @@
+[tiled-radial-gradients.html]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-lists/content-property/marker-text-matches-armenian.html.ini b/testing/web-platform/meta/css/css-lists/content-property/marker-text-matches-armenian.html.ini
index 77bf14ae404a..5b4a293e09e8 100644
--- a/testing/web-platform/meta/css/css-lists/content-property/marker-text-matches-armenian.html.ini
+++ b/testing/web-platform/meta/css/css-lists/content-property/marker-text-matches-armenian.html.ini
@@ -1,5 +1,5 @@
 [marker-text-matches-armenian.html]
   expected:
     if (os == "win") and (version == "6.1.7601"): FAIL
-    if os == "mac": FAIL
-    if os == "android": FAIL
+    if (os == "mac"): FAIL
+    if (os == "android"): FAIL
diff --git a/testing/web-platform/meta/css/css-lists/list-marker-with-lineheight-and-overflow-hidden-001.html.ini b/testing/web-platform/meta/css/css-lists/list-marker-with-lineheight-and-overflow-hidden-001.html.ini
index 67a17c27e931..3b1d783cdd46 100644
--- a/testing/web-platform/meta/css/css-lists/list-marker-with-lineheight-and-overflow-hidden-001.html.ini
+++ b/testing/web-platform/meta/css/css-lists/list-marker-with-lineheight-and-overflow-hidden-001.html.ini
@@ -1,3 +1,3 @@
 [list-marker-with-lineheight-and-overflow-hidden-001.html]
   expected:
-    if os == "win": FAIL
+    if (os == "win"): FAIL
diff --git a/testing/web-platform/meta/css/css-masking/clip/clip-transform-order-2.html.ini b/testing/web-platform/meta/css/css-masking/clip/clip-transform-order-2.html.ini
index 3d518064b073..5f4bb513b328 100644
--- a/testing/web-platform/meta/css/css-masking/clip/clip-transform-order-2.html.ini
+++ b/testing/web-platform/meta/css/css-masking/clip/clip-transform-order-2.html.ini
@@ -1,4 +1,4 @@
 [clip-transform-order-2.html]
   expected:
-    if os == "android": FAIL
+    if (os == "android"): FAIL
   bug: https://github.com/web-platform-tests/wpt/pull/12187
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-fill-auto-001.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-fill-auto-001.xht.ini
new file mode 100644
index 000000000000..d31f6d0eb395
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-fill-auto-001.xht.ini
@@ -0,0 +1,2 @@
+[multicol-fill-auto-001.xht]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-inherit-001.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-inherit-001.xht.ini
new file mode 100644
index 000000000000..e4adb903deaf
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-inherit-001.xht.ini
@@ -0,0 +1,2 @@
+[multicol-inherit-001.xht]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-overflow-000.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-overflow-000.xht.ini
new file mode 100644
index 000000000000..aa3bf1095671
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-overflow-000.xht.ini
@@ -0,0 +1,2 @@
+[multicol-overflow-000.xht]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-position/position-absolute-percentage-height.html.ini b/testing/web-platform/meta/css/css-position/position-absolute-percentage-height.html.ini
deleted file mode 100644
index 14533f4a2a85..000000000000
--- a/testing/web-platform/meta/css/css-position/position-absolute-percentage-height.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[position-absolute-percentage-height.html]
-  [#target height matches containing block height, and target parent width matches #target width after resize]
-    expected: FAIL
-
-  [#target height matches containing block height, and target parent width matches #target width]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/css/css-position/position-sticky-hyperlink.html.ini b/testing/web-platform/meta/css/css-position/position-sticky-hyperlink.html.ini
index 20b94c951a1a..de258dde2957 100644
--- a/testing/web-platform/meta/css/css-position/position-sticky-hyperlink.html.ini
+++ b/testing/web-platform/meta/css/css-position/position-sticky-hyperlink.html.ini
@@ -1,5 +1,5 @@
 [position-sticky-hyperlink.html]
   expected:
-    if os == "win": FAIL
-    if os == "mac": FAIL
-    if os == "android": FAIL
+    if (os == "win"): FAIL
+    if (os == "mac"): FAIL
+    if (os == "android"): FAIL
diff --git a/testing/web-platform/meta/css/css-pseudo/first-letter-003.html.ini b/testing/web-platform/meta/css/css-pseudo/first-letter-003.html.ini
index 7189b18f3762..dc12f8c13ab1 100644
--- a/testing/web-platform/meta/css/css-pseudo/first-letter-003.html.ini
+++ b/testing/web-platform/meta/css/css-pseudo/first-letter-003.html.ini
@@ -1,4 +1,4 @@
 [first-letter-003.html]
   expected:
-    if os == "win": FAIL
-    if os == "mac": FAIL
+    if (os == "win"): FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-scoping/css-scoping-shadow-host-rule.html.ini b/testing/web-platform/meta/css/css-scoping/css-scoping-shadow-host-rule.html.ini
index 23a94e411d1f..51f3f0ec5f1d 100644
--- a/testing/web-platform/meta/css/css-scoping/css-scoping-shadow-host-rule.html.ini
+++ b/testing/web-platform/meta/css/css-scoping/css-scoping-shadow-host-rule.html.ini
@@ -1,4 +1,4 @@
 [css-scoping-shadow-host-rule.html]
   expected:
-    if os == "win": FAIL
-    if os == "mac": FAIL
+    if (os == "win"): FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-scoping/css-scoping-shadow-root-hides-children.html.ini b/testing/web-platform/meta/css/css-scoping/css-scoping-shadow-root-hides-children.html.ini
index a67d4f088c27..7ab9af8e0bf9 100644
--- a/testing/web-platform/meta/css/css-scoping/css-scoping-shadow-root-hides-children.html.ini
+++ b/testing/web-platform/meta/css/css-scoping/css-scoping-shadow-root-hides-children.html.ini
@@ -1,4 +1,4 @@
 [css-scoping-shadow-root-hides-children.html]
   expected:
-    if os == "win": FAIL
-    if os == "mac": FAIL
+    if (os == "win"): FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-scoping/css-scoping-shadow-slotted-nested.html.ini b/testing/web-platform/meta/css/css-scoping/css-scoping-shadow-slotted-nested.html.ini
index 1406b9a5babf..9b84130ea2a0 100644
--- a/testing/web-platform/meta/css/css-scoping/css-scoping-shadow-slotted-nested.html.ini
+++ b/testing/web-platform/meta/css/css-scoping/css-scoping-shadow-slotted-nested.html.ini
@@ -1,4 +1,4 @@
 [css-scoping-shadow-slotted-nested.html]
   expected:
-    if os == "win": FAIL
-    if os == "mac": FAIL
+    if (os == "win"): FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-scoping/css-scoping-shadow-slotted-rule.html.ini b/testing/web-platform/meta/css/css-scoping/css-scoping-shadow-slotted-rule.html.ini
index f463e9bbd5ad..1e1ea8c0a798 100644
--- a/testing/web-platform/meta/css/css-scoping/css-scoping-shadow-slotted-rule.html.ini
+++ b/testing/web-platform/meta/css/css-scoping/css-scoping-shadow-slotted-rule.html.ini
@@ -1,4 +1,4 @@
 [css-scoping-shadow-slotted-rule.html]
   expected:
-    if os == "win": FAIL
-    if os == "mac": FAIL
+    if (os == "win"): FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-scoping/css-scoping-shadow-with-rules-no-style-leak.html.ini b/testing/web-platform/meta/css/css-scoping/css-scoping-shadow-with-rules-no-style-leak.html.ini
index abfbf7a5a7a6..36d49c841719 100644
--- a/testing/web-platform/meta/css/css-scoping/css-scoping-shadow-with-rules-no-style-leak.html.ini
+++ b/testing/web-platform/meta/css/css-scoping/css-scoping-shadow-with-rules-no-style-leak.html.ini
@@ -1,4 +1,4 @@
 [css-scoping-shadow-with-rules-no-style-leak.html]
   expected:
-    if os == "win": FAIL
-    if os == "mac": FAIL
+    if (os == "win"): FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-scoping/css-scoping-shadow-with-rules.html.ini b/testing/web-platform/meta/css/css-scoping/css-scoping-shadow-with-rules.html.ini
index da790315ffa6..62043a280417 100644
--- a/testing/web-platform/meta/css/css-scoping/css-scoping-shadow-with-rules.html.ini
+++ b/testing/web-platform/meta/css/css-scoping/css-scoping-shadow-with-rules.html.ini
@@ -1,4 +1,4 @@
 [css-scoping-shadow-with-rules.html]
   expected:
-    if os == "win": FAIL
-    if os == "mac": FAIL
+    if (os == "win"): FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-scroll-snap/scroll-snap-stop-always.html.ini b/testing/web-platform/meta/css/css-scroll-snap/scroll-snap-stop-always.html.ini
deleted file mode 100644
index a3ef8de61b2c..000000000000
--- a/testing/web-platform/meta/css/css-scroll-snap/scroll-snap-stop-always.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[scroll-snap-stop-always.html]
-  [A scroll with intended direction and end position should not pass a snap area with scroll-snap-stop: always.]
-    expected: FAIL
-
-  [A scroll with intended end position should always choose the closest snap position regardless of the scroll-snap-stop value.]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/css/css-scrollbars/textarea-scrollbar-width-none.html.ini b/testing/web-platform/meta/css/css-scrollbars/textarea-scrollbar-width-none.html.ini
index 312fa5f4479d..752e3b778c1d 100644
--- a/testing/web-platform/meta/css/css-scrollbars/textarea-scrollbar-width-none.html.ini
+++ b/testing/web-platform/meta/css/css-scrollbars/textarea-scrollbar-width-none.html.ini
@@ -4,5 +4,5 @@
     if (os == "win") and (processor == "aarch64"): PASS
     if (os == "win") and (version == "6.1.7601"): FAIL
     if not webrender and (os == "win") and (version == "10.0.17134"): FAIL
-    if os == "mac": FAIL
-    if os == "android": FAIL
+    if (os == "mac"): FAIL
+    if (os == "android"): FAIL
\ No newline at end of file
diff --git a/testing/web-platform/meta/css/css-sizing/intrinsic-percent-replaced-002.html.ini b/testing/web-platform/meta/css/css-sizing/intrinsic-percent-replaced-002.html.ini
deleted file mode 100644
index b221184e338f..000000000000
--- a/testing/web-platform/meta/css/css-sizing/intrinsic-percent-replaced-002.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[intrinsic-percent-replaced-002.html]
-  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-sizing/intrinsic-percent-replaced-003.html.ini b/testing/web-platform/meta/css/css-sizing/intrinsic-percent-replaced-003.html.ini
deleted file mode 100644
index 8a9dba35f553..000000000000
--- a/testing/web-platform/meta/css/css-sizing/intrinsic-percent-replaced-003.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[intrinsic-percent-replaced-003.html]
-  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-sizing/intrinsic-percent-replaced-004.html.ini b/testing/web-platform/meta/css/css-sizing/intrinsic-percent-replaced-004.html.ini
deleted file mode 100644
index 5a3816e41300..000000000000
--- a/testing/web-platform/meta/css/css-sizing/intrinsic-percent-replaced-004.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[intrinsic-percent-replaced-004.html]
-  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-sizing/intrinsic-percent-replaced-005.html.ini b/testing/web-platform/meta/css/css-sizing/intrinsic-percent-replaced-005.html.ini
deleted file mode 100644
index 70aa6872ad42..000000000000
--- a/testing/web-platform/meta/css/css-sizing/intrinsic-percent-replaced-005.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[intrinsic-percent-replaced-005.html]
-  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-sizing/intrinsic-percent-replaced-006.html.ini b/testing/web-platform/meta/css/css-sizing/intrinsic-percent-replaced-006.html.ini
deleted file mode 100644
index de1b08ea8d1f..000000000000
--- a/testing/web-platform/meta/css/css-sizing/intrinsic-percent-replaced-006.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[intrinsic-percent-replaced-006.html]
-  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-tables/subpixel-collapsed-borders-003.html.ini b/testing/web-platform/meta/css/css-tables/subpixel-collapsed-borders-003.html.ini
deleted file mode 100644
index cd3f1ae3a88d..000000000000
--- a/testing/web-platform/meta/css/css-tables/subpixel-collapsed-borders-003.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[subpixel-collapsed-borders-003.html]
-  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-text/boundary-shaping/boundary-shaping-010.html.ini b/testing/web-platform/meta/css/css-text/boundary-shaping/boundary-shaping-010.html.ini
index 06b14e46445b..6d6a2318a2d1 100644
--- a/testing/web-platform/meta/css/css-text/boundary-shaping/boundary-shaping-010.html.ini
+++ b/testing/web-platform/meta/css/css-text/boundary-shaping/boundary-shaping-010.html.ini
@@ -1,4 +1,4 @@
 [boundary-shaping-010.html]
   expected:
-    if os == "mac": FAIL
-    if os == "android": FAIL
+    if (os == "mac"): FAIL
+    if (os == "android"): FAIL
diff --git a/testing/web-platform/meta/css/css-text/text-indent/text-indent-percentage-001.xht.ini b/testing/web-platform/meta/css/css-text/text-indent/text-indent-percentage-001.xht.ini
index 75efae7aba4b..87ab0ba066d9 100644
--- a/testing/web-platform/meta/css/css-text/text-indent/text-indent-percentage-001.xht.ini
+++ b/testing/web-platform/meta/css/css-text/text-indent/text-indent-percentage-001.xht.ini
@@ -1,3 +1,3 @@
 [text-indent-percentage-001.xht]
   expected:
-    if os == "android": FAIL
+    if (os == "android"): FAIL
diff --git a/testing/web-platform/meta/css/css-text/text-transform/text-transform-capitalize-007.html.ini b/testing/web-platform/meta/css/css-text/text-transform/text-transform-capitalize-007.html.ini
deleted file mode 100644
index 55b3e1dad770..000000000000
--- a/testing/web-platform/meta/css/css-text/text-transform/text-transform-capitalize-007.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[text-transform-capitalize-007.html]
-  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-text/white-space/text-space-collapse-preserve-breaks-001.xht.ini b/testing/web-platform/meta/css/css-text/white-space/text-space-collapse-preserve-breaks-001.xht.ini
index 8d5e22ea76fb..0104ef2bf071 100644
--- a/testing/web-platform/meta/css/css-text/white-space/text-space-collapse-preserve-breaks-001.xht.ini
+++ b/testing/web-platform/meta/css/css-text/white-space/text-space-collapse-preserve-breaks-001.xht.ini
@@ -1,12 +1,5 @@
 [text-space-collapse-preserve-breaks-001.xht]
   expected:
     if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-    if os == "win": FAIL
-    if os == "mac": FAIL
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if (os == "win"): FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-text/white-space/white-space-wrap-after-nowrap-001.html.ini b/testing/web-platform/meta/css/css-text/white-space/white-space-wrap-after-nowrap-001.html.ini
deleted file mode 100644
index b54652e802f6..000000000000
--- a/testing/web-platform/meta/css/css-text/white-space/white-space-wrap-after-nowrap-001.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[white-space-wrap-after-nowrap-001.html]
-  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-text/word-break/word-break-break-all-004.html.ini b/testing/web-platform/meta/css/css-text/word-break/word-break-break-all-004.html.ini
index 7b59379e296a..7e57e4caf720 100644
--- a/testing/web-platform/meta/css/css-text/word-break/word-break-break-all-004.html.ini
+++ b/testing/web-platform/meta/css/css-text/word-break/word-break-break-all-004.html.ini
@@ -1,3 +1,3 @@
 [word-break-break-all-004.html]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-transforms/group/svg-transform-group-008.html.ini b/testing/web-platform/meta/css/css-transforms/group/svg-transform-group-008.html.ini
index c601d7fa06c5..71d17d8841de 100644
--- a/testing/web-platform/meta/css/css-transforms/group/svg-transform-group-008.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/group/svg-transform-group-008.html.ini
@@ -1,3 +1,3 @@
 [svg-transform-group-008.html]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-transforms/group/svg-transform-group-009.html.ini b/testing/web-platform/meta/css/css-transforms/group/svg-transform-group-009.html.ini
index 26e1f2973a08..37ba879cf42b 100644
--- a/testing/web-platform/meta/css/css-transforms/group/svg-transform-group-009.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/group/svg-transform-group-009.html.ini
@@ -1,3 +1,3 @@
 [svg-transform-group-009.html]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-transforms/group/svg-transform-nested-008.html.ini b/testing/web-platform/meta/css/css-transforms/group/svg-transform-nested-008.html.ini
index 444416f0bdf9..398b20facd45 100644
--- a/testing/web-platform/meta/css/css-transforms/group/svg-transform-nested-008.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/group/svg-transform-nested-008.html.ini
@@ -1,3 +1,3 @@
 [svg-transform-nested-008.html]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-transforms/group/svg-transform-nested-009.html.ini b/testing/web-platform/meta/css/css-transforms/group/svg-transform-nested-009.html.ini
index b337450a659d..3a66502c970b 100644
--- a/testing/web-platform/meta/css/css-transforms/group/svg-transform-nested-009.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/group/svg-transform-nested-009.html.ini
@@ -1,7 +1,4 @@
 [svg-transform-nested-009.html]
   expected:
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
+    if webrender: PASS
     FAIL
diff --git a/testing/web-platform/meta/css/css-transforms/matrix/svg-matrix-001.html.ini b/testing/web-platform/meta/css/css-transforms/matrix/svg-matrix-001.html.ini
index 7492f8be2b47..902a5ce1e7c0 100644
--- a/testing/web-platform/meta/css/css-transforms/matrix/svg-matrix-001.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/matrix/svg-matrix-001.html.ini
@@ -1,3 +1,3 @@
 [svg-matrix-001.html]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-transforms/matrix/svg-matrix-002.html.ini b/testing/web-platform/meta/css/css-transforms/matrix/svg-matrix-002.html.ini
index d14f7c814328..1525daa2d350 100644
--- a/testing/web-platform/meta/css/css-transforms/matrix/svg-matrix-002.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/matrix/svg-matrix-002.html.ini
@@ -1,3 +1,3 @@
 [svg-matrix-002.html]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-transforms/matrix/svg-matrix-003.html.ini b/testing/web-platform/meta/css/css-transforms/matrix/svg-matrix-003.html.ini
index 563c859f63da..52b875ddee04 100644
--- a/testing/web-platform/meta/css/css-transforms/matrix/svg-matrix-003.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/matrix/svg-matrix-003.html.ini
@@ -1,3 +1,3 @@
 [svg-matrix-003.html]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-transforms/matrix/svg-matrix-004.html.ini b/testing/web-platform/meta/css/css-transforms/matrix/svg-matrix-004.html.ini
index 6f2345908a94..081c0471d4f9 100644
--- a/testing/web-platform/meta/css/css-transforms/matrix/svg-matrix-004.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/matrix/svg-matrix-004.html.ini
@@ -1,3 +1,3 @@
 [svg-matrix-004.html]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-transforms/matrix/svg-matrix-005.html.ini b/testing/web-platform/meta/css/css-transforms/matrix/svg-matrix-005.html.ini
index 1d67bdaaf65c..1fc6b98e372a 100644
--- a/testing/web-platform/meta/css/css-transforms/matrix/svg-matrix-005.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/matrix/svg-matrix-005.html.ini
@@ -1,4 +1,2 @@
 [svg-matrix-005.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-transforms/matrix/svg-matrix-006.html.ini b/testing/web-platform/meta/css/css-transforms/matrix/svg-matrix-006.html.ini
index 3a7f903d203d..30fb7333f5d2 100644
--- a/testing/web-platform/meta/css/css-transforms/matrix/svg-matrix-006.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/matrix/svg-matrix-006.html.ini
@@ -1,3 +1,3 @@
 [svg-matrix-006.html]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-transforms/matrix/svg-matrix-007.html.ini b/testing/web-platform/meta/css/css-transforms/matrix/svg-matrix-007.html.ini
index 9678d861cdaf..d4ed41ac28f6 100644
--- a/testing/web-platform/meta/css/css-transforms/matrix/svg-matrix-007.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/matrix/svg-matrix-007.html.ini
@@ -1,3 +1,3 @@
 [svg-matrix-007.html]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-transforms/matrix/svg-matrix-008.html.ini b/testing/web-platform/meta/css/css-transforms/matrix/svg-matrix-008.html.ini
index d58065c8cf12..c3f26091912d 100644
--- a/testing/web-platform/meta/css/css-transforms/matrix/svg-matrix-008.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/matrix/svg-matrix-008.html.ini
@@ -1,3 +1,3 @@
 [svg-matrix-008.html]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-transforms/matrix/svg-matrix-009.html.ini b/testing/web-platform/meta/css/css-transforms/matrix/svg-matrix-009.html.ini
index 3f423af78b88..f33f0eac98e9 100644
--- a/testing/web-platform/meta/css/css-transforms/matrix/svg-matrix-009.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/matrix/svg-matrix-009.html.ini
@@ -1,3 +1,3 @@
 [svg-matrix-009.html]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-transforms/matrix/svg-matrix-010.html.ini b/testing/web-platform/meta/css/css-transforms/matrix/svg-matrix-010.html.ini
index 5994c64b71c0..d03023c8b2f4 100644
--- a/testing/web-platform/meta/css/css-transforms/matrix/svg-matrix-010.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/matrix/svg-matrix-010.html.ini
@@ -1,3 +1,3 @@
 [svg-matrix-010.html]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-transforms/matrix/svg-matrix-011.html.ini b/testing/web-platform/meta/css/css-transforms/matrix/svg-matrix-011.html.ini
index aa7e14bbfa3f..26b35feee577 100644
--- a/testing/web-platform/meta/css/css-transforms/matrix/svg-matrix-011.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/matrix/svg-matrix-011.html.ini
@@ -1,3 +1,3 @@
 [svg-matrix-011.html]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-transforms/matrix/svg-matrix-012.html.ini b/testing/web-platform/meta/css/css-transforms/matrix/svg-matrix-012.html.ini
index c5ba2d815d73..90aa4314c66b 100644
--- a/testing/web-platform/meta/css/css-transforms/matrix/svg-matrix-012.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/matrix/svg-matrix-012.html.ini
@@ -1,3 +1,3 @@
 [svg-matrix-012.html]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-transforms/matrix/svg-matrix-013.html.ini b/testing/web-platform/meta/css/css-transforms/matrix/svg-matrix-013.html.ini
index d7a090c9684b..f224f2c66e90 100644
--- a/testing/web-platform/meta/css/css-transforms/matrix/svg-matrix-013.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/matrix/svg-matrix-013.html.ini
@@ -1,3 +1,3 @@
 [svg-matrix-013.html]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-transforms/matrix/svg-matrix-014.html.ini b/testing/web-platform/meta/css/css-transforms/matrix/svg-matrix-014.html.ini
index 7f1ebcaf2c08..470ba556b8db 100644
--- a/testing/web-platform/meta/css/css-transforms/matrix/svg-matrix-014.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/matrix/svg-matrix-014.html.ini
@@ -1,3 +1,3 @@
 [svg-matrix-014.html]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-transforms/matrix/svg-matrix-015.html.ini b/testing/web-platform/meta/css/css-transforms/matrix/svg-matrix-015.html.ini
index 35ad14011b95..b89b0cd8dc2f 100644
--- a/testing/web-platform/meta/css/css-transforms/matrix/svg-matrix-015.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/matrix/svg-matrix-015.html.ini
@@ -1,3 +1,3 @@
 [svg-matrix-015.html]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-transforms/patternTransform/svg-patternTransform-049.html.ini b/testing/web-platform/meta/css/css-transforms/patternTransform/svg-patternTransform-049.html.ini
index 6742bbca728e..eee317a7bb31 100644
--- a/testing/web-platform/meta/css/css-transforms/patternTransform/svg-patternTransform-049.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/patternTransform/svg-patternTransform-049.html.ini
@@ -1,3 +1,3 @@
 [svg-patternTransform-049.html]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-transforms/scale/svg-scale-001.html.ini b/testing/web-platform/meta/css/css-transforms/scale/svg-scale-001.html.ini
index 593cec1a64ef..188b482e1122 100644
--- a/testing/web-platform/meta/css/css-transforms/scale/svg-scale-001.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/scale/svg-scale-001.html.ini
@@ -1,3 +1,3 @@
 [svg-scale-001.html]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-transforms/scale/svg-scale-002.html.ini b/testing/web-platform/meta/css/css-transforms/scale/svg-scale-002.html.ini
index d076dc5f31ce..422e8850668f 100644
--- a/testing/web-platform/meta/css/css-transforms/scale/svg-scale-002.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/scale/svg-scale-002.html.ini
@@ -1,3 +1,3 @@
 [svg-scale-002.html]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-transforms/scale/svg-scale-003.html.ini b/testing/web-platform/meta/css/css-transforms/scale/svg-scale-003.html.ini
index 67eb64da24c4..89256bf9d3fd 100644
--- a/testing/web-platform/meta/css/css-transforms/scale/svg-scale-003.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/scale/svg-scale-003.html.ini
@@ -1,3 +1,3 @@
 [svg-scale-003.html]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-transforms/scale/svg-scale-004.html.ini b/testing/web-platform/meta/css/css-transforms/scale/svg-scale-004.html.ini
index a033eab4f012..3a90aef157d5 100644
--- a/testing/web-platform/meta/css/css-transforms/scale/svg-scale-004.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/scale/svg-scale-004.html.ini
@@ -1,3 +1,3 @@
 [svg-scale-004.html]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-transforms/scale/svg-scale-005.html.ini b/testing/web-platform/meta/css/css-transforms/scale/svg-scale-005.html.ini
index e11b736aec48..384ea4730c40 100644
--- a/testing/web-platform/meta/css/css-transforms/scale/svg-scale-005.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/scale/svg-scale-005.html.ini
@@ -1,3 +1,3 @@
 [svg-scale-005.html]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-transforms/scale/svg-scale-006.html.ini b/testing/web-platform/meta/css/css-transforms/scale/svg-scale-006.html.ini
index 8ec52df32656..6d407c6e9ca2 100644
--- a/testing/web-platform/meta/css/css-transforms/scale/svg-scale-006.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/scale/svg-scale-006.html.ini
@@ -1,3 +1,3 @@
 [svg-scale-006.html]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-transforms/scale/svg-scale-007.html.ini b/testing/web-platform/meta/css/css-transforms/scale/svg-scale-007.html.ini
index 5e1800b4337f..2996c9835928 100644
--- a/testing/web-platform/meta/css/css-transforms/scale/svg-scale-007.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/scale/svg-scale-007.html.ini
@@ -1,3 +1,3 @@
 [svg-scale-007.html]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-transforms/scale/svg-scale-008.html.ini b/testing/web-platform/meta/css/css-transforms/scale/svg-scale-008.html.ini
index 610b281fc125..d6ec9d348bfe 100644
--- a/testing/web-platform/meta/css/css-transforms/scale/svg-scale-008.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/scale/svg-scale-008.html.ini
@@ -1,3 +1,3 @@
 [svg-scale-008.html]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-transforms/scale/svg-scale-009.html.ini b/testing/web-platform/meta/css/css-transforms/scale/svg-scale-009.html.ini
index 5e7ea269472a..41b49cc60aa2 100644
--- a/testing/web-platform/meta/css/css-transforms/scale/svg-scale-009.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/scale/svg-scale-009.html.ini
@@ -1,3 +1,3 @@
 [svg-scale-009.html]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-transforms/scale/svg-scale-010.html.ini b/testing/web-platform/meta/css/css-transforms/scale/svg-scale-010.html.ini
index f729b35c70e4..5a64720a129a 100644
--- a/testing/web-platform/meta/css/css-transforms/scale/svg-scale-010.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/scale/svg-scale-010.html.ini
@@ -1,3 +1,3 @@
 [svg-scale-010.html]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-transforms/scale/svg-scale-011.html.ini b/testing/web-platform/meta/css/css-transforms/scale/svg-scale-011.html.ini
index a1a2623b02e8..088d5e45400e 100644
--- a/testing/web-platform/meta/css/css-transforms/scale/svg-scale-011.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/scale/svg-scale-011.html.ini
@@ -1,3 +1,3 @@
 [svg-scale-011.html]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-transforms/scale/svg-scale-012.html.ini b/testing/web-platform/meta/css/css-transforms/scale/svg-scale-012.html.ini
index 4840fa2adf69..11ca44f0ac17 100644
--- a/testing/web-platform/meta/css/css-transforms/scale/svg-scale-012.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/scale/svg-scale-012.html.ini
@@ -1,3 +1,3 @@
 [svg-scale-012.html]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-transforms/scale/svg-scale-013.html.ini b/testing/web-platform/meta/css/css-transforms/scale/svg-scale-013.html.ini
index 1a9109905754..79fc76ae00d6 100644
--- a/testing/web-platform/meta/css/css-transforms/scale/svg-scale-013.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/scale/svg-scale-013.html.ini
@@ -1,3 +1,3 @@
 [svg-scale-013.html]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-transforms/scale/svg-scale-014.html.ini b/testing/web-platform/meta/css/css-transforms/scale/svg-scale-014.html.ini
index c37dd5b6cb24..654626f5c952 100644
--- a/testing/web-platform/meta/css/css-transforms/scale/svg-scale-014.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/scale/svg-scale-014.html.ini
@@ -1,3 +1,3 @@
 [svg-scale-014.html]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-transforms/scale/svg-scale-015.html.ini b/testing/web-platform/meta/css/css-transforms/scale/svg-scale-015.html.ini
index 21468f4565ad..5a642a60a442 100644
--- a/testing/web-platform/meta/css/css-transforms/scale/svg-scale-015.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/scale/svg-scale-015.html.ini
@@ -1,3 +1,3 @@
 [svg-scale-015.html]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-transforms/scale/svg-scale-016.html.ini b/testing/web-platform/meta/css/css-transforms/scale/svg-scale-016.html.ini
index 391e85e35d65..9c990b970291 100644
--- a/testing/web-platform/meta/css/css-transforms/scale/svg-scale-016.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/scale/svg-scale-016.html.ini
@@ -1,3 +1,3 @@
 [svg-scale-016.html]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-transforms/scale/svg-scale-017.html.ini b/testing/web-platform/meta/css/css-transforms/scale/svg-scale-017.html.ini
index 1e9b280b69f1..29e903896538 100644
--- a/testing/web-platform/meta/css/css-transforms/scale/svg-scale-017.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/scale/svg-scale-017.html.ini
@@ -1,3 +1,3 @@
 [svg-scale-017.html]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-transforms/scale/svg-scalex-003.html.ini b/testing/web-platform/meta/css/css-transforms/scale/svg-scalex-003.html.ini
index fef3df9a86e9..785ef47e3298 100644
--- a/testing/web-platform/meta/css/css-transforms/scale/svg-scalex-003.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/scale/svg-scalex-003.html.ini
@@ -1,3 +1,3 @@
 [svg-scalex-003.html]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-transforms/scale/svg-scaley-003.html.ini b/testing/web-platform/meta/css/css-transforms/scale/svg-scaley-003.html.ini
index d0301fefd956..834b1d361315 100644
--- a/testing/web-platform/meta/css/css-transforms/scale/svg-scaley-003.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/scale/svg-scaley-003.html.ini
@@ -1,3 +1,3 @@
 [svg-scaley-003.html]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-transforms/skewX/svg-skewx-001.html.ini b/testing/web-platform/meta/css/css-transforms/skewX/svg-skewx-001.html.ini
index f37be1337812..250b0d47b238 100644
--- a/testing/web-platform/meta/css/css-transforms/skewX/svg-skewx-001.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/skewX/svg-skewx-001.html.ini
@@ -1,3 +1,3 @@
 [svg-skewx-001.html]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-transforms/skewX/svg-skewx-006.html.ini b/testing/web-platform/meta/css/css-transforms/skewX/svg-skewx-006.html.ini
index 357037fb713e..dec35421b114 100644
--- a/testing/web-platform/meta/css/css-transforms/skewX/svg-skewx-006.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/skewX/svg-skewx-006.html.ini
@@ -1,3 +1,3 @@
 [svg-skewx-006.html]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-transforms/skewX/svg-skewx-011.html.ini b/testing/web-platform/meta/css/css-transforms/skewX/svg-skewx-011.html.ini
index 5ff8097bd92d..5b0d6a690aa1 100644
--- a/testing/web-platform/meta/css/css-transforms/skewX/svg-skewx-011.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/skewX/svg-skewx-011.html.ini
@@ -1,3 +1,3 @@
 [svg-skewx-011.html]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-transforms/skewX/svg-skewx-016.html.ini b/testing/web-platform/meta/css/css-transforms/skewX/svg-skewx-016.html.ini
index dc9e6c5a80b1..01d63b943115 100644
--- a/testing/web-platform/meta/css/css-transforms/skewX/svg-skewx-016.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/skewX/svg-skewx-016.html.ini
@@ -1,3 +1,3 @@
 [svg-skewx-016.html]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-transforms/skewX/svg-skewx-021.html.ini b/testing/web-platform/meta/css/css-transforms/skewX/svg-skewx-021.html.ini
index 1ed5155f14a1..136c2c5ad145 100644
--- a/testing/web-platform/meta/css/css-transforms/skewX/svg-skewx-021.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/skewX/svg-skewx-021.html.ini
@@ -1,3 +1,3 @@
 [svg-skewx-021.html]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-transforms/skewY/svg-skewy-001.html.ini b/testing/web-platform/meta/css/css-transforms/skewY/svg-skewy-001.html.ini
index 408c2e71d672..8bc6a070282a 100644
--- a/testing/web-platform/meta/css/css-transforms/skewY/svg-skewy-001.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/skewY/svg-skewy-001.html.ini
@@ -1,3 +1,3 @@
 [svg-skewy-001.html]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-transforms/skewY/svg-skewy-006.html.ini b/testing/web-platform/meta/css/css-transforms/skewY/svg-skewy-006.html.ini
index 1788a1a23a47..c719792530f6 100644
--- a/testing/web-platform/meta/css/css-transforms/skewY/svg-skewy-006.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/skewY/svg-skewy-006.html.ini
@@ -1,3 +1,3 @@
 [svg-skewy-006.html]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-transforms/skewY/svg-skewy-011.html.ini b/testing/web-platform/meta/css/css-transforms/skewY/svg-skewy-011.html.ini
index 3f78b251c6b1..bcf9ea46ce47 100644
--- a/testing/web-platform/meta/css/css-transforms/skewY/svg-skewy-011.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/skewY/svg-skewy-011.html.ini
@@ -1,3 +1,3 @@
 [svg-skewy-011.html]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-transforms/skewY/svg-skewy-016.html.ini b/testing/web-platform/meta/css/css-transforms/skewY/svg-skewy-016.html.ini
index c33dbfb92b56..fa88e4f0d326 100644
--- a/testing/web-platform/meta/css/css-transforms/skewY/svg-skewy-016.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/skewY/svg-skewy-016.html.ini
@@ -1,3 +1,3 @@
 [svg-skewy-016.html]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-transforms/skewY/svg-skewy-021.html.ini b/testing/web-platform/meta/css/css-transforms/skewY/svg-skewy-021.html.ini
index fb4165f01c52..0524b7597a6b 100644
--- a/testing/web-platform/meta/css/css-transforms/skewY/svg-skewy-021.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/skewY/svg-skewy-021.html.ini
@@ -1,3 +1,3 @@
 [svg-skewy-021.html]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-transforms/transform-box/fill-box-mutation.html.ini b/testing/web-platform/meta/css/css-transforms/transform-box/fill-box-mutation.html.ini
index cb11173f93e3..19a9ad0a63ad 100644
--- a/testing/web-platform/meta/css/css-transforms/transform-box/fill-box-mutation.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/transform-box/fill-box-mutation.html.ini
@@ -1,3 +1,3 @@
 [fill-box-mutation.html]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-transforms/transform-box/fill-box.html.ini b/testing/web-platform/meta/css/css-transforms/transform-box/fill-box.html.ini
index 2cfe797fa473..1a6df14bef6b 100644
--- a/testing/web-platform/meta/css/css-transforms/transform-box/fill-box.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/transform-box/fill-box.html.ini
@@ -1,3 +1,3 @@
 [fill-box.html]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-transforms/transform-box/value-changed.html.ini b/testing/web-platform/meta/css/css-transforms/transform-box/value-changed.html.ini
index aa5fede5c888..3b8018c4e36b 100644
--- a/testing/web-platform/meta/css/css-transforms/transform-box/value-changed.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/transform-box/value-changed.html.ini
@@ -1,3 +1,3 @@
 [value-changed.html]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-transforms/transform-box/view-box-mutation.html.ini b/testing/web-platform/meta/css/css-transforms/transform-box/view-box-mutation.html.ini
index 79174624852e..04ef4d466b99 100644
--- a/testing/web-platform/meta/css/css-transforms/transform-box/view-box-mutation.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/transform-box/view-box-mutation.html.ini
@@ -1,3 +1,3 @@
 [view-box-mutation.html]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-transforms/transform-box/view-box-nested.html.ini b/testing/web-platform/meta/css/css-transforms/transform-box/view-box-nested.html.ini
index e1132fd87945..cb076cf27ff7 100644
--- a/testing/web-platform/meta/css/css-transforms/transform-box/view-box-nested.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/transform-box/view-box-nested.html.ini
@@ -1,3 +1,3 @@
 [view-box-nested.html]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-transforms/transform-box/view-box-viewbox-nested.html.ini b/testing/web-platform/meta/css/css-transforms/transform-box/view-box-viewbox-nested.html.ini
index 45941746a486..ff81fd567e9c 100644
--- a/testing/web-platform/meta/css/css-transforms/transform-box/view-box-viewbox-nested.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/transform-box/view-box-viewbox-nested.html.ini
@@ -1,3 +1,3 @@
 [view-box-viewbox-nested.html]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-transforms/transform-box/view-box-viewbox.html.ini b/testing/web-platform/meta/css/css-transforms/transform-box/view-box-viewbox.html.ini
index 13d16c81e8e4..9617ea4a70c2 100644
--- a/testing/web-platform/meta/css/css-transforms/transform-box/view-box-viewbox.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/transform-box/view-box-viewbox.html.ini
@@ -1,3 +1,3 @@
 [view-box-viewbox.html]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-transforms/transform-box/view-box.html.ini b/testing/web-platform/meta/css/css-transforms/transform-box/view-box.html.ini
index 3bb163de8692..308511239c60 100644
--- a/testing/web-platform/meta/css/css-transforms/transform-box/view-box.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/transform-box/view-box.html.ini
@@ -1,3 +1,3 @@
 [view-box.html]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-transforms/transform-inherit-001.html.ini b/testing/web-platform/meta/css/css-transforms/transform-inherit-001.html.ini
new file mode 100644
index 000000000000..b56235815669
--- /dev/null
+++ b/testing/web-platform/meta/css/css-transforms/transform-inherit-001.html.ini
@@ -0,0 +1,3 @@
+[transform-inherit-001.html]
+  expected:
+    if (os == "android"): FAIL
diff --git a/testing/web-platform/meta/css/css-ui/parsing/user-select-valid.html.ini b/testing/web-platform/meta/css/css-ui/parsing/user-select-valid.html.ini
deleted file mode 100644
index cd251188365f..000000000000
--- a/testing/web-platform/meta/css/css-ui/parsing/user-select-valid.html.ini
+++ /dev/null
@@ -1,16 +0,0 @@
-[user-select-valid.html]
-  [e.style['user-select'\] = "contain" should set the property value]
-    expected: FAIL
-
-  [e.style['user-select'\] = "all" should set the property value]
-    expected: FAIL
-
-  [e.style['user-select'\] = "none" should set the property value]
-    expected: FAIL
-
-  [e.style['user-select'\] = "text" should set the property value]
-    expected: FAIL
-
-  [e.style['user-select'\] = "auto" should set the property value]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/css/css-values/calc-serialization-002.html.ini b/testing/web-platform/meta/css/css-values/calc-serialization-002.html.ini
deleted file mode 100644
index 30e9a093c565..000000000000
--- a/testing/web-platform/meta/css/css-values/calc-serialization-002.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[calc-serialization-002.html]
-  [testing calc(1em + 1.27cm + 13% + 3em)]
-    expected: FAIL
-
-  [testing calc(25.4q + 1vh + 12%)]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/css/css-values/calc-z-index-fractions-001.html.ini b/testing/web-platform/meta/css/css-values/calc-z-index-fractions-001.html.ini
deleted file mode 100644
index 2c78ebfac3db..000000000000
--- a/testing/web-platform/meta/css/css-values/calc-z-index-fractions-001.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[calc-z-index-fractions-001.html]
-  [testing z-index: calc(-3 / 2)]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/css/css-values/ch-unit-001.html.ini b/testing/web-platform/meta/css/css-values/ch-unit-001.html.ini
index bbbfc53150f4..041887c7f5a3 100644
--- a/testing/web-platform/meta/css/css-values/ch-unit-001.html.ini
+++ b/testing/web-platform/meta/css/css-values/ch-unit-001.html.ini
@@ -1,3 +1,3 @@
 [ch-unit-001.html]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-values/ch-unit-002.html.ini b/testing/web-platform/meta/css/css-values/ch-unit-002.html.ini
index f1c817de6a29..dd7c831e6254 100644
--- a/testing/web-platform/meta/css/css-values/ch-unit-002.html.ini
+++ b/testing/web-platform/meta/css/css-values/ch-unit-002.html.ini
@@ -1,3 +1,3 @@
 [ch-unit-002.html]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-values/ch-unit-004.html.ini b/testing/web-platform/meta/css/css-values/ch-unit-004.html.ini
index 0b73d4661d4c..eafd6d9214e5 100644
--- a/testing/web-platform/meta/css/css-values/ch-unit-004.html.ini
+++ b/testing/web-platform/meta/css/css-values/ch-unit-004.html.ini
@@ -1,3 +1,3 @@
 [ch-unit-004.html]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-021.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-021.xht.ini
index 30ca68d3109e..63230525aca3 100644
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-021.xht.ini
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-021.xht.ini
@@ -1,3 +1,3 @@
 [abs-pos-non-replaced-icb-vlr-021.xht]
   disabled:
-    if os == "win": https://bugzilla.mozilla.org/show_bug.cgi?id=1500276
+    if (os == "win"): https://bugzilla.mozilla.org/show_bug.cgi?id=1500276
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-007.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-007.xht.ini
new file mode 100644
index 000000000000..41d0fcbf4613
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-007.xht.ini
@@ -0,0 +1,2 @@
+[abs-pos-non-replaced-vlr-007.xht]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-013.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-013.xht.ini
index e79cadf78b0e..4ce606461568 100644
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-013.xht.ini
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-013.xht.ini
@@ -1,19 +1,2 @@
 [abs-pos-non-replaced-vlr-013.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    FAIL
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-019.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-019.xht.ini
index 5693b9e6c1c1..874e5682fbc8 100644
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-019.xht.ini
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-019.xht.ini
@@ -1,19 +1,2 @@
 [abs-pos-non-replaced-vlr-019.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    FAIL
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-025.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-025.xht.ini
index 2a6c6b2f9db3..c79e0a743459 100644
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-025.xht.ini
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-025.xht.ini
@@ -1,17 +1,2 @@
 [abs-pos-non-replaced-vlr-025.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-031.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-031.xht.ini
new file mode 100644
index 000000000000..7f16bfbb5f7d
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-031.xht.ini
@@ -0,0 +1,2 @@
+[abs-pos-non-replaced-vlr-031.xht]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-037.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-037.xht.ini
index 477efbc8cb5b..36f6a3e56411 100644
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-037.xht.ini
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-037.xht.ini
@@ -1,19 +1,2 @@
 [abs-pos-non-replaced-vlr-037.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    FAIL
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-043.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-043.xht.ini
index 68ac12fc3771..6a6568ae6fc1 100644
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-043.xht.ini
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-043.xht.ini
@@ -1,16 +1,2 @@
 [abs-pos-non-replaced-vlr-043.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-049.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-049.xht.ini
index c706121a71c0..8ce7a7764636 100644
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-049.xht.ini
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-049.xht.ini
@@ -1,16 +1,2 @@
 [abs-pos-non-replaced-vlr-049.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-055.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-055.xht.ini
new file mode 100644
index 000000000000..d024c1d4ec18
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-055.xht.ini
@@ -0,0 +1,2 @@
+[abs-pos-non-replaced-vlr-055.xht]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-061.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-061.xht.ini
index 8cd1f11f5a85..3f298822c21c 100644
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-061.xht.ini
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-061.xht.ini
@@ -1,19 +1,2 @@
 [abs-pos-non-replaced-vlr-061.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    FAIL
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-067.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-067.xht.ini
index eb212cb7fe2b..8b5ff706313c 100644
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-067.xht.ini
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-067.xht.ini
@@ -1,19 +1,2 @@
 [abs-pos-non-replaced-vlr-067.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    FAIL
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-073.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-073.xht.ini
index a60a4172ca3d..9747a6a1f1d7 100644
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-073.xht.ini
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-073.xht.ini
@@ -1,17 +1,2 @@
 [abs-pos-non-replaced-vlr-073.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-079.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-079.xht.ini
new file mode 100644
index 000000000000..601b1f1477d4
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-079.xht.ini
@@ -0,0 +1,2 @@
+[abs-pos-non-replaced-vlr-079.xht]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-085.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-085.xht.ini
new file mode 100644
index 000000000000..66d0bd18265c
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-085.xht.ini
@@ -0,0 +1,2 @@
+[abs-pos-non-replaced-vlr-085.xht]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-091.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-091.xht.ini
index 919336497e6e..e368c1defdf4 100644
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-091.xht.ini
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-091.xht.ini
@@ -1,16 +1,2 @@
 [abs-pos-non-replaced-vlr-091.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-097.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-097.xht.ini
new file mode 100644
index 000000000000..ca301d4b2044
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-097.xht.ini
@@ -0,0 +1,2 @@
+[abs-pos-non-replaced-vlr-097.xht]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-107.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-107.xht.ini
new file mode 100644
index 000000000000..a66662b03199
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-107.xht.ini
@@ -0,0 +1,2 @@
+[abs-pos-non-replaced-vlr-107.xht]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-115.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-115.xht.ini
index 0a452785b177..b0a094ffbd5d 100644
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-115.xht.ini
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-115.xht.ini
@@ -1,19 +1,2 @@
 [abs-pos-non-replaced-vlr-115.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    FAIL
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-123.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-123.xht.ini
new file mode 100644
index 000000000000..3e3d139272f5
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-123.xht.ini
@@ -0,0 +1,2 @@
+[abs-pos-non-replaced-vlr-123.xht]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-131.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-131.xht.ini
new file mode 100644
index 000000000000..3c7ddec6209c
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-131.xht.ini
@@ -0,0 +1,2 @@
+[abs-pos-non-replaced-vlr-131.xht]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-139.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-139.xht.ini
new file mode 100644
index 000000000000..d2444b92e948
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-139.xht.ini
@@ -0,0 +1,2 @@
+[abs-pos-non-replaced-vlr-139.xht]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-147.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-147.xht.ini
new file mode 100644
index 000000000000..d6b52af44768
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-147.xht.ini
@@ -0,0 +1,2 @@
+[abs-pos-non-replaced-vlr-147.xht]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-155.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-155.xht.ini
index af358114b68b..4bffe444f9ec 100644
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-155.xht.ini
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-155.xht.ini
@@ -1,19 +1,2 @@
 [abs-pos-non-replaced-vlr-155.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    FAIL
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-163.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-163.xht.ini
new file mode 100644
index 000000000000..32a29d5b6447
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-163.xht.ini
@@ -0,0 +1,2 @@
+[abs-pos-non-replaced-vlr-163.xht]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-171.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-171.xht.ini
index 80a2660315c8..13bd649b54ef 100644
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-171.xht.ini
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-171.xht.ini
@@ -1,19 +1,2 @@
 [abs-pos-non-replaced-vlr-171.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    FAIL
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-179.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-179.xht.ini
new file mode 100644
index 000000000000..35d46c74d567
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-179.xht.ini
@@ -0,0 +1,2 @@
+[abs-pos-non-replaced-vlr-179.xht]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-187.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-187.xht.ini
new file mode 100644
index 000000000000..0cd9cfdb6d49
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-187.xht.ini
@@ -0,0 +1,2 @@
+[abs-pos-non-replaced-vlr-187.xht]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-195.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-195.xht.ini
index 1843bf901859..0763b2681865 100644
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-195.xht.ini
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-195.xht.ini
@@ -1,19 +1,2 @@
 [abs-pos-non-replaced-vlr-195.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    FAIL
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-203.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-203.xht.ini
new file mode 100644
index 000000000000..5e3b6b6071d0
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-203.xht.ini
@@ -0,0 +1,2 @@
+[abs-pos-non-replaced-vlr-203.xht]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-211.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-211.xht.ini
index 5560a4025a06..c9979ce93cea 100644
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-211.xht.ini
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-211.xht.ini
@@ -1,19 +1,2 @@
 [abs-pos-non-replaced-vlr-211.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    FAIL
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-219.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-219.xht.ini
new file mode 100644
index 000000000000..1b8744df073b
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-219.xht.ini
@@ -0,0 +1,2 @@
+[abs-pos-non-replaced-vlr-219.xht]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-227.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-227.xht.ini
index db2a6c470738..815ecfec97bf 100644
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-227.xht.ini
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-227.xht.ini
@@ -1,19 +1,2 @@
 [abs-pos-non-replaced-vlr-227.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    FAIL
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-006.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-006.xht.ini
new file mode 100644
index 000000000000..8af2e38a9577
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-006.xht.ini
@@ -0,0 +1,2 @@
+[abs-pos-non-replaced-vrl-006.xht]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-012.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-012.xht.ini
new file mode 100644
index 000000000000..62678be00cf2
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-012.xht.ini
@@ -0,0 +1,2 @@
+[abs-pos-non-replaced-vrl-012.xht]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-018.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-018.xht.ini
index 70fb369df4fb..04ce5902c4bd 100644
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-018.xht.ini
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-018.xht.ini
@@ -1,19 +1,2 @@
 [abs-pos-non-replaced-vrl-018.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    FAIL
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-024.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-024.xht.ini
index 1ae9fefe6e0d..10f9b909e639 100644
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-024.xht.ini
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-024.xht.ini
@@ -1,19 +1,2 @@
 [abs-pos-non-replaced-vrl-024.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    FAIL
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-030.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-030.xht.ini
new file mode 100644
index 000000000000..1d042345fdef
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-030.xht.ini
@@ -0,0 +1,2 @@
+[abs-pos-non-replaced-vrl-030.xht]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-036.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-036.xht.ini
new file mode 100644
index 000000000000..02a84e2d0e12
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-036.xht.ini
@@ -0,0 +1,2 @@
+[abs-pos-non-replaced-vrl-036.xht]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-042.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-042.xht.ini
index 6c40a6e5ca66..046586bcfbc4 100644
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-042.xht.ini
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-042.xht.ini
@@ -1,19 +1,2 @@
 [abs-pos-non-replaced-vrl-042.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    FAIL
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-048.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-048.xht.ini
index 450cd0d19a5e..2db487b3a38c 100644
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-048.xht.ini
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-048.xht.ini
@@ -1,17 +1,2 @@
 [abs-pos-non-replaced-vrl-048.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-054.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-054.xht.ini
new file mode 100644
index 000000000000..46f5b52e7cfe
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-054.xht.ini
@@ -0,0 +1,2 @@
+[abs-pos-non-replaced-vrl-054.xht]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-060.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-060.xht.ini
new file mode 100644
index 000000000000..8cbf00e22d14
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-060.xht.ini
@@ -0,0 +1,2 @@
+[abs-pos-non-replaced-vrl-060.xht]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-066.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-066.xht.ini
new file mode 100644
index 000000000000..768a8c8de49c
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-066.xht.ini
@@ -0,0 +1,2 @@
+[abs-pos-non-replaced-vrl-066.xht]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-072.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-072.xht.ini
index 83e7d3511970..226fedceef5e 100644
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-072.xht.ini
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-072.xht.ini
@@ -1,17 +1,2 @@
 [abs-pos-non-replaced-vrl-072.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-078.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-078.xht.ini
new file mode 100644
index 000000000000..bc45bcefce0e
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-078.xht.ini
@@ -0,0 +1,2 @@
+[abs-pos-non-replaced-vrl-078.xht]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-084.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-084.xht.ini
index 0ded046d39b5..2799c97c689b 100644
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-084.xht.ini
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-084.xht.ini
@@ -1,8 +1,2 @@
 [abs-pos-non-replaced-vrl-084.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-090.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-090.xht.ini
new file mode 100644
index 000000000000..9fdd89820240
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-090.xht.ini
@@ -0,0 +1,2 @@
+[abs-pos-non-replaced-vrl-090.xht]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-096.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-096.xht.ini
new file mode 100644
index 000000000000..41f7f3637a43
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-096.xht.ini
@@ -0,0 +1,2 @@
+[abs-pos-non-replaced-vrl-096.xht]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-106.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-106.xht.ini
index 59b27462ee1d..80dbf4a27636 100644
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-106.xht.ini
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-106.xht.ini
@@ -1,19 +1,2 @@
 [abs-pos-non-replaced-vrl-106.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    FAIL
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-114.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-114.xht.ini
new file mode 100644
index 000000000000..e082d0e76419
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-114.xht.ini
@@ -0,0 +1,2 @@
+[abs-pos-non-replaced-vrl-114.xht]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-122.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-122.xht.ini
new file mode 100644
index 000000000000..f0a66aa54655
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-122.xht.ini
@@ -0,0 +1,2 @@
+[abs-pos-non-replaced-vrl-122.xht]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-130.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-130.xht.ini
new file mode 100644
index 000000000000..2ecf305f72c7
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-130.xht.ini
@@ -0,0 +1,2 @@
+[abs-pos-non-replaced-vrl-130.xht]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-138.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-138.xht.ini
index deab82172cc6..d8ac5e87ccff 100644
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-138.xht.ini
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-138.xht.ini
@@ -1,19 +1,2 @@
 [abs-pos-non-replaced-vrl-138.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    FAIL
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-146.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-146.xht.ini
new file mode 100644
index 000000000000..5119a9ee2ea1
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-146.xht.ini
@@ -0,0 +1,2 @@
+[abs-pos-non-replaced-vrl-146.xht]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-154.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-154.xht.ini
index baf9b5b9913d..0f80c8bf32c0 100644
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-154.xht.ini
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-154.xht.ini
@@ -1,19 +1,2 @@
 [abs-pos-non-replaced-vrl-154.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    FAIL
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-162.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-162.xht.ini
new file mode 100644
index 000000000000..570249f85cef
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-162.xht.ini
@@ -0,0 +1,2 @@
+[abs-pos-non-replaced-vrl-162.xht]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-170.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-170.xht.ini
index 3e5e43d19726..dc542522d677 100644
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-170.xht.ini
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-170.xht.ini
@@ -1,19 +1,2 @@
 [abs-pos-non-replaced-vrl-170.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    FAIL
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-178.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-178.xht.ini
new file mode 100644
index 000000000000..7eedc3777762
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-178.xht.ini
@@ -0,0 +1,2 @@
+[abs-pos-non-replaced-vrl-178.xht]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-186.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-186.xht.ini
new file mode 100644
index 000000000000..1961346abb21
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-186.xht.ini
@@ -0,0 +1,2 @@
+[abs-pos-non-replaced-vrl-186.xht]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-194.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-194.xht.ini
new file mode 100644
index 000000000000..3b7fdf3aa4b5
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-194.xht.ini
@@ -0,0 +1,2 @@
+[abs-pos-non-replaced-vrl-194.xht]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-202.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-202.xht.ini
index c59f05a81a47..a095882af7eb 100644
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-202.xht.ini
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-202.xht.ini
@@ -1,19 +1,2 @@
 [abs-pos-non-replaced-vrl-202.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    FAIL
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-210.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-210.xht.ini
new file mode 100644
index 000000000000..64061e3adcd4
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-210.xht.ini
@@ -0,0 +1,2 @@
+[abs-pos-non-replaced-vrl-210.xht]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-218.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-218.xht.ini
new file mode 100644
index 000000000000..aaeb22fc80b3
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-218.xht.ini
@@ -0,0 +1,2 @@
+[abs-pos-non-replaced-vrl-218.xht]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-226.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-226.xht.ini
new file mode 100644
index 000000000000..25d4646c228c
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-226.xht.ini
@@ -0,0 +1,2 @@
+[abs-pos-non-replaced-vrl-226.xht]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/box-offsets-rel-pos-vlr-005.xht.ini b/testing/web-platform/meta/css/css-writing-modes/box-offsets-rel-pos-vlr-005.xht.ini
index 7ee2fd655d3b..41377c9c2584 100644
--- a/testing/web-platform/meta/css/css-writing-modes/box-offsets-rel-pos-vlr-005.xht.ini
+++ b/testing/web-platform/meta/css/css-writing-modes/box-offsets-rel-pos-vlr-005.xht.ini
@@ -1,4 +1,2 @@
 [box-offsets-rel-pos-vlr-005.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/box-offsets-rel-pos-vrl-004.xht.ini b/testing/web-platform/meta/css/css-writing-modes/box-offsets-rel-pos-vrl-004.xht.ini
index 4d4ef740076b..4f81a4ee7b9c 100644
--- a/testing/web-platform/meta/css/css-writing-modes/box-offsets-rel-pos-vrl-004.xht.ini
+++ b/testing/web-platform/meta/css/css-writing-modes/box-offsets-rel-pos-vrl-004.xht.ini
@@ -1,17 +1,2 @@
 [box-offsets-rel-pos-vrl-004.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    FAIL
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/caption-side-vlr-003.xht.ini b/testing/web-platform/meta/css/css-writing-modes/caption-side-vlr-003.xht.ini
index ec82135076f0..d204d5f7de9b 100644
--- a/testing/web-platform/meta/css/css-writing-modes/caption-side-vlr-003.xht.ini
+++ b/testing/web-platform/meta/css/css-writing-modes/caption-side-vlr-003.xht.ini
@@ -1,3 +1,3 @@
 [caption-side-vlr-003.xht]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/caption-side-vlr-005.xht.ini b/testing/web-platform/meta/css/css-writing-modes/caption-side-vlr-005.xht.ini
index 194c7eed1147..45cd3fe7c62d 100644
--- a/testing/web-platform/meta/css/css-writing-modes/caption-side-vlr-005.xht.ini
+++ b/testing/web-platform/meta/css/css-writing-modes/caption-side-vlr-005.xht.ini
@@ -1,3 +1,3 @@
 [caption-side-vlr-005.xht]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/caption-side-vrl-002.xht.ini b/testing/web-platform/meta/css/css-writing-modes/caption-side-vrl-002.xht.ini
index d265707208ec..6012afc316a3 100644
--- a/testing/web-platform/meta/css/css-writing-modes/caption-side-vrl-002.xht.ini
+++ b/testing/web-platform/meta/css/css-writing-modes/caption-side-vrl-002.xht.ini
@@ -1,3 +1,3 @@
 [caption-side-vrl-002.xht]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/caption-side-vrl-004.xht.ini b/testing/web-platform/meta/css/css-writing-modes/caption-side-vrl-004.xht.ini
index e702158a784e..215f8280cc77 100644
--- a/testing/web-platform/meta/css/css-writing-modes/caption-side-vrl-004.xht.ini
+++ b/testing/web-platform/meta/css/css-writing-modes/caption-side-vrl-004.xht.ini
@@ -1,3 +1,3 @@
 [caption-side-vrl-004.xht]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/clearance-calculations-vrl-008.xht.ini b/testing/web-platform/meta/css/css-writing-modes/clearance-calculations-vrl-008.xht.ini
new file mode 100644
index 000000000000..500837cdc6e3
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/clearance-calculations-vrl-008.xht.ini
@@ -0,0 +1,2 @@
+[clearance-calculations-vrl-008.xht]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/ortho-htb-alongside-vrl-floats-006.xht.ini b/testing/web-platform/meta/css/css-writing-modes/ortho-htb-alongside-vrl-floats-006.xht.ini
new file mode 100644
index 000000000000..2d046a8222ac
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/ortho-htb-alongside-vrl-floats-006.xht.ini
@@ -0,0 +1,2 @@
+[ortho-htb-alongside-vrl-floats-006.xht]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/ortho-htb-alongside-vrl-floats-010.xht.ini b/testing/web-platform/meta/css/css-writing-modes/ortho-htb-alongside-vrl-floats-010.xht.ini
index 80b0e9a5d38a..480f3127c7c0 100644
--- a/testing/web-platform/meta/css/css-writing-modes/ortho-htb-alongside-vrl-floats-010.xht.ini
+++ b/testing/web-platform/meta/css/css-writing-modes/ortho-htb-alongside-vrl-floats-010.xht.ini
@@ -1,8 +1,2 @@
 [ortho-htb-alongside-vrl-floats-010.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/outline-inline-block-vrl-006.html.ini b/testing/web-platform/meta/css/css-writing-modes/outline-inline-block-vrl-006.html.ini
index 4a42923c95e8..820121351d1e 100644
--- a/testing/web-platform/meta/css/css-writing-modes/outline-inline-block-vrl-006.html.ini
+++ b/testing/web-platform/meta/css/css-writing-modes/outline-inline-block-vrl-006.html.ini
@@ -1,3 +1,3 @@
 [outline-inline-block-vrl-006.html]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/outline-inline-vlr-006.html.ini b/testing/web-platform/meta/css/css-writing-modes/outline-inline-vlr-006.html.ini
index 4916f03bdb67..765c5bad58b5 100644
--- a/testing/web-platform/meta/css/css-writing-modes/outline-inline-vlr-006.html.ini
+++ b/testing/web-platform/meta/css/css-writing-modes/outline-inline-vlr-006.html.ini
@@ -1,3 +1,3 @@
 [outline-inline-vlr-006.html]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/outline-inline-vrl-006.html.ini b/testing/web-platform/meta/css/css-writing-modes/outline-inline-vrl-006.html.ini
index 3e9f2022ad85..cecb91a3ad84 100644
--- a/testing/web-platform/meta/css/css-writing-modes/outline-inline-vrl-006.html.ini
+++ b/testing/web-platform/meta/css/css-writing-modes/outline-inline-vrl-006.html.ini
@@ -1,3 +1,3 @@
 [outline-inline-vrl-006.html]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/sizing-orthog-htb-in-vlr-007.xht.ini b/testing/web-platform/meta/css/css-writing-modes/sizing-orthog-htb-in-vlr-007.xht.ini
new file mode 100644
index 000000000000..fa1fa911f9e3
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/sizing-orthog-htb-in-vlr-007.xht.ini
@@ -0,0 +1,2 @@
+[sizing-orthog-htb-in-vlr-007.xht]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/sizing-orthog-htb-in-vlr-008.xht.ini b/testing/web-platform/meta/css/css-writing-modes/sizing-orthog-htb-in-vlr-008.xht.ini
index 2fbb256aa0e9..a339db49570b 100644
--- a/testing/web-platform/meta/css/css-writing-modes/sizing-orthog-htb-in-vlr-008.xht.ini
+++ b/testing/web-platform/meta/css/css-writing-modes/sizing-orthog-htb-in-vlr-008.xht.ini
@@ -1,8 +1,2 @@
 [sizing-orthog-htb-in-vlr-008.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/sizing-orthog-htb-in-vrl-008.xht.ini b/testing/web-platform/meta/css/css-writing-modes/sizing-orthog-htb-in-vrl-008.xht.ini
new file mode 100644
index 000000000000..486c85daac67
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/sizing-orthog-htb-in-vrl-008.xht.ini
@@ -0,0 +1,2 @@
+[sizing-orthog-htb-in-vrl-008.xht]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/sizing-orthog-htb-in-vrl-011.xht.ini b/testing/web-platform/meta/css/css-writing-modes/sizing-orthog-htb-in-vrl-011.xht.ini
new file mode 100644
index 000000000000..97aba695abf3
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/sizing-orthog-htb-in-vrl-011.xht.ini
@@ -0,0 +1,6 @@
+[sizing-orthog-htb-in-vrl-011.xht]
+  expected:
+    if (os == "win"): PASS
+    if (os == "mac"): PASS
+    if (os == "android"): PASS
+    FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/sizing-orthog-htb-in-vrl-020.xht.ini b/testing/web-platform/meta/css/css-writing-modes/sizing-orthog-htb-in-vrl-020.xht.ini
index dadc3e5f6046..b337dac053d2 100644
--- a/testing/web-platform/meta/css/css-writing-modes/sizing-orthog-htb-in-vrl-020.xht.ini
+++ b/testing/web-platform/meta/css/css-writing-modes/sizing-orthog-htb-in-vrl-020.xht.ini
@@ -1,5 +1,6 @@
 [sizing-orthog-htb-in-vrl-020.xht]
   expected:
-    if os == "mac": PASS
-    if os == "win": PASS
-    if os == "android": PASS
+    if (os == "mac"): PASS
+    if (os == "win"): PASS
+    if (os == "android"): PASS
+    FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/sizing-orthog-prct-htb-in-vrl-001.xht.ini b/testing/web-platform/meta/css/css-writing-modes/sizing-orthog-prct-htb-in-vrl-001.xht.ini
new file mode 100644
index 000000000000..cfc86a52a663
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/sizing-orthog-prct-htb-in-vrl-001.xht.ini
@@ -0,0 +1,2 @@
+[sizing-orthog-prct-htb-in-vrl-001.xht]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/text-indent-vlr-011.xht.ini b/testing/web-platform/meta/css/css-writing-modes/text-indent-vlr-011.xht.ini
new file mode 100644
index 000000000000..13cbb15e1445
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/text-indent-vlr-011.xht.ini
@@ -0,0 +1,2 @@
+[text-indent-vlr-011.xht]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/text-indent-vlr-013.xht.ini b/testing/web-platform/meta/css/css-writing-modes/text-indent-vlr-013.xht.ini
index bca4353a6568..0785e44962d8 100644
--- a/testing/web-platform/meta/css/css-writing-modes/text-indent-vlr-013.xht.ini
+++ b/testing/web-platform/meta/css/css-writing-modes/text-indent-vlr-013.xht.ini
@@ -1,8 +1,2 @@
 [text-indent-vlr-013.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/text-indent-vrl-010.xht.ini b/testing/web-platform/meta/css/css-writing-modes/text-indent-vrl-010.xht.ini
new file mode 100644
index 000000000000..907c6e3d61df
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/text-indent-vrl-010.xht.ini
@@ -0,0 +1,2 @@
+[text-indent-vrl-010.xht]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/text-indent-vrl-012.xht.ini b/testing/web-platform/meta/css/css-writing-modes/text-indent-vrl-012.xht.ini
new file mode 100644
index 000000000000..892705bbffdd
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/text-indent-vrl-012.xht.ini
@@ -0,0 +1,2 @@
+[text-indent-vrl-012.xht]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/text-orientation-016.xht.ini b/testing/web-platform/meta/css/css-writing-modes/text-orientation-016.xht.ini
index d1a5c7382120..16b647713287 100644
--- a/testing/web-platform/meta/css/css-writing-modes/text-orientation-016.xht.ini
+++ b/testing/web-platform/meta/css/css-writing-modes/text-orientation-016.xht.ini
@@ -1,3 +1,3 @@
 [text-orientation-016.xht]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/css/cssom/CSSStyleSheet-constructable.html.ini b/testing/web-platform/meta/css/cssom/CSSStyleSheet-constructable.html.ini
index e4aa05465a54..2aabcbe418eb 100644
--- a/testing/web-platform/meta/css/cssom/CSSStyleSheet-constructable.html.ini
+++ b/testing/web-platform/meta/css/cssom/CSSStyleSheet-constructable.html.ini
@@ -59,12 +59,3 @@
   [Adopting a shadow host will empty adoptedStyleSheets if adopting to a different document]
     expected: FAIL
 
-  [Re-attaching shadow host with adopted stylesheets work]
-    expected: FAIL
-
-  [Attaching a shadow root that already has adopted stylesheets work]
-    expected: FAIL
-
-  [Re-attaching shadow host and updating attributes work]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/css/mediaqueries/device-aspect-ratio-003.html.ini b/testing/web-platform/meta/css/mediaqueries/device-aspect-ratio-003.html.ini
index e3442e17d450..b359dec052c1 100644
--- a/testing/web-platform/meta/css/mediaqueries/device-aspect-ratio-003.html.ini
+++ b/testing/web-platform/meta/css/mediaqueries/device-aspect-ratio-003.html.ini
@@ -1,3 +1,3 @@
 [device-aspect-ratio-003.html]
   expected:
-    if os == "android": FAIL
+    if (os == "android"): FAIL
diff --git a/testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-vert-004.xhtml.ini b/testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-vert-004.xhtml.ini
new file mode 100644
index 000000000000..a53ba9778e73
--- /dev/null
+++ b/testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-justify-content-vert-004.xhtml.ini
@@ -0,0 +1,2 @@
+[flexbox-justify-content-vert-004.xhtml]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/images3/object-fit-cover-png-001c.html.ini b/testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/images3/object-fit-cover-png-001c.html.ini
index 21f86d883bef..62d0922d3480 100644
--- a/testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/images3/object-fit-cover-png-001c.html.ini
+++ b/testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/images3/object-fit-cover-png-001c.html.ini
@@ -1,7 +1,4 @@
 [object-fit-cover-png-001c.html]
   expected:
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
+    if webrender: PASS
     FAIL
diff --git a/testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/images3/object-fit-cover-png-001e.html.ini b/testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/images3/object-fit-cover-png-001e.html.ini
index 7cee8e28812a..7dde307b2061 100644
--- a/testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/images3/object-fit-cover-png-001e.html.ini
+++ b/testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/images3/object-fit-cover-png-001e.html.ini
@@ -1,8 +1,5 @@
 [object-fit-cover-png-001e.html]
   expected:
-    if os == "android": PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
+    if webrender: PASS
+    if (os == "android"): PASS
     FAIL
diff --git a/testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/images3/object-fit-cover-png-001i.html.ini b/testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/images3/object-fit-cover-png-001i.html.ini
index 2a0d8abaab70..dac9cc9c1cde 100644
--- a/testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/images3/object-fit-cover-png-001i.html.ini
+++ b/testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/images3/object-fit-cover-png-001i.html.ini
@@ -1,8 +1,5 @@
 [object-fit-cover-png-001i.html]
   expected:
-    if os == "android": PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
+    if webrender: PASS
+    if (os == "android"): PASS
     FAIL
diff --git a/testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/images3/object-fit-cover-png-001o.html.ini b/testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/images3/object-fit-cover-png-001o.html.ini
index 12c7eed6dd76..ec6eb5f74d99 100644
--- a/testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/images3/object-fit-cover-png-001o.html.ini
+++ b/testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/images3/object-fit-cover-png-001o.html.ini
@@ -1,8 +1,5 @@
 [object-fit-cover-png-001o.html]
   expected:
-    if os == "android": PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
+    if webrender: PASS
+    if (os == "android"): PASS
     FAIL
diff --git a/testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/images3/object-fit-cover-png-001p.html.ini b/testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/images3/object-fit-cover-png-001p.html.ini
index 96327c6e2fe8..c1bea42ae683 100644
--- a/testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/images3/object-fit-cover-png-001p.html.ini
+++ b/testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/images3/object-fit-cover-png-001p.html.ini
@@ -1,8 +1,5 @@
 [object-fit-cover-png-001p.html]
   expected:
-    if os == "android": PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
+    if webrender: PASS
+    if (os == "android"): PASS
     FAIL
diff --git a/testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/images3/object-fit-cover-png-002c.html.ini b/testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/images3/object-fit-cover-png-002c.html.ini
index 071132bdf689..bc9cb8fb7858 100644
--- a/testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/images3/object-fit-cover-png-002c.html.ini
+++ b/testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/images3/object-fit-cover-png-002c.html.ini
@@ -1,7 +1,4 @@
 [object-fit-cover-png-002c.html]
   expected:
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
+    if webrender: PASS
     FAIL
diff --git a/testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/images3/object-fit-cover-png-002e.html.ini b/testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/images3/object-fit-cover-png-002e.html.ini
index 5e2926a3f0c4..84bcc85c62a5 100644
--- a/testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/images3/object-fit-cover-png-002e.html.ini
+++ b/testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/images3/object-fit-cover-png-002e.html.ini
@@ -1,8 +1,5 @@
 [object-fit-cover-png-002e.html]
   expected:
-    if os == "android": PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
+    if webrender: PASS
+    if (os == "android"): PASS
     FAIL
diff --git a/testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/images3/object-fit-cover-png-002i.html.ini b/testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/images3/object-fit-cover-png-002i.html.ini
index 70df5b9441dc..fb5f5dbb7578 100644
--- a/testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/images3/object-fit-cover-png-002i.html.ini
+++ b/testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/images3/object-fit-cover-png-002i.html.ini
@@ -1,8 +1,5 @@
 [object-fit-cover-png-002i.html]
   expected:
-    if os == "android": PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
+    if webrender: PASS
+    if (os == "android"): PASS
     FAIL
diff --git a/testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/images3/object-fit-cover-png-002o.html.ini b/testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/images3/object-fit-cover-png-002o.html.ini
index 1f927f676dde..b377ac9c0a02 100644
--- a/testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/images3/object-fit-cover-png-002o.html.ini
+++ b/testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/images3/object-fit-cover-png-002o.html.ini
@@ -1,8 +1,5 @@
 [object-fit-cover-png-002o.html]
   expected:
-    if os == "android": PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
+    if webrender: PASS
+    if (os == "android"): PASS
     FAIL
diff --git a/testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/images3/object-fit-cover-png-002p.html.ini b/testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/images3/object-fit-cover-png-002p.html.ini
index 825a86e2607c..da688f390b55 100644
--- a/testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/images3/object-fit-cover-png-002p.html.ini
+++ b/testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/images3/object-fit-cover-png-002p.html.ini
@@ -1,8 +1,5 @@
 [object-fit-cover-png-002p.html]
   expected:
-    if os == "android": PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
+    if webrender: PASS
+    if (os == "android"): PASS
     FAIL
diff --git a/testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/box-sizing-replaced-003.xht.ini b/testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/box-sizing-replaced-003.xht.ini
index ad7602912206..081bfbc09851 100644
--- a/testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/box-sizing-replaced-003.xht.ini
+++ b/testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/ui3/box-sizing-replaced-003.xht.ini
@@ -1,3 +1,3 @@
 [box-sizing-replaced-003.xht]
   disabled:
-    if os == "mac": https://bugzilla.mozilla.org/show_bug.cgi?id=1383454
+    if (os == "mac"): https://bugzilla.mozilla.org/show_bug.cgi?id=1383454
diff --git a/testing/web-platform/meta/custom-elements/CustomElementRegistry.html.ini b/testing/web-platform/meta/custom-elements/CustomElementRegistry.html.ini
index dad2c84e96ed..4dd67b110a53 100644
--- a/testing/web-platform/meta/custom-elements/CustomElementRegistry.html.ini
+++ b/testing/web-platform/meta/custom-elements/CustomElementRegistry.html.ini
@@ -11,15 +11,3 @@
   [customElements.define must get "observedAttributes" property on the constructor prototype when "attributeChangedCallback" is present]
     expected: FAIL
 
-  [customElements.define must rethrow an exception thrown while retrieving Symbol.iterator on disabledFeatures]
-    expected: FAIL
-
-  [customElements.define must rethrow an exception thrown while getting disabledFeatures on the constructor prototype]
-    expected: FAIL
-
-  [customElements.define must rethrow an exception thrown while iterating over disabledFeatures to sequence<DOMString>]
-    expected: FAIL
-
-  [customElements.define must rethrow an exception thrown while converting the value of disabledFeatures to sequence<DOMString>]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/custom-elements/HTMLElement-attachInternals.html.ini b/testing/web-platform/meta/custom-elements/HTMLElement-attachInternals.html.ini
deleted file mode 100644
index 247b2807fd61..000000000000
--- a/testing/web-platform/meta/custom-elements/HTMLElement-attachInternals.html.ini
+++ /dev/null
@@ -1,13 +0,0 @@
-[HTMLElement-attachInternals.html]
-  [Successful attachInternals() and the second call.]
-    expected: FAIL
-
-  [attachInternals() throws a NotSupportedError if it is called for a customized built-in element]
-    expected: FAIL
-
-  [If a custom element definition for the local name of the element has disable internals flag, throw a NotSupportedError]
-    expected: FAIL
-
-  [If a custom element definition for the local name of the element doesn't exist, throw an InvalidStateError]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/custom-elements/reactions/HTMLButtonElement.html.ini b/testing/web-platform/meta/custom-elements/reactions/HTMLButtonElement.html.ini
new file mode 100644
index 000000000000..a09dcca3095f
--- /dev/null
+++ b/testing/web-platform/meta/custom-elements/reactions/HTMLButtonElement.html.ini
@@ -0,0 +1,19 @@
+[HTMLButtonElement.html]
+  [autofocus on HTMLButtonElement must enqueue an attributeChanged reaction when adding autofocus content attribute]
+    expected: FAIL
+
+  [autofocus on HTMLButtonElement must enqueue an attributeChanged reaction when replacing an existing attribute]
+    expected: FAIL
+
+  [disabled on HTMLButtonElement must enqueue an attributeChanged reaction when adding disabled content attribute]
+    expected: FAIL
+
+  [disabled on HTMLButtonElement must enqueue an attributeChanged reaction when replacing an existing attribute]
+    expected: FAIL
+
+  [formNoValidate on HTMLButtonElement must enqueue an attributeChanged reaction when adding a new attribute]
+    expected: FAIL
+
+  [formNoValidate on HTMLButtonElement must enqueue an attributeChanged reaction when replacing an existing attribute]
+    expected: FAIL
+
diff --git a/testing/web-platform/tests/import-maps/resources/empty.js b/testing/web-platform/meta/dom/nodes/__dir__.ini
similarity index 100%
rename from testing/web-platform/tests/import-maps/resources/empty.js
rename to testing/web-platform/meta/dom/nodes/__dir__.ini
diff --git a/testing/web-platform/meta/domparsing/XMLSerializer-serializeToString.html.ini b/testing/web-platform/meta/domparsing/XMLSerializer-serializeToString.html.ini
index 7f23d7f26f40..102d2d596c76 100644
--- a/testing/web-platform/meta/domparsing/XMLSerializer-serializeToString.html.ini
+++ b/testing/web-platform/meta/domparsing/XMLSerializer-serializeToString.html.ini
@@ -11,27 +11,3 @@
   [Check if attribute serialization takes into account of the same prefix declared in an ancestor element]
     expected: FAIL
 
-  [Check if inconsistent xmlns="..." is dropped.]
-    expected: FAIL
-
-  [Check if start tag serialization drops element prefix if the namespace is same as inherited default namespace.]
-    expected: FAIL
-
-  [Check if no special handling for XLink namespace unlike HTML serializer.]
-    expected: FAIL
-
-  [Check if the prefix of an attribute is NOT preserved in a case where neither its prefix nor its namespace URI is not already used.]
-    expected: FAIL
-
-  [Check if the prefix of an attribute is replaced with a generated one in a case where the prefix is already mapped to a different namespace URI.]
-    expected: FAIL
-
-  [Check if start tag serialization applied the original prefix even if it is declared in an ancestor element.]
-    expected: FAIL
-
-  [Check if start tag serialization takes into account of its xmlns:* attributes]
-    expected: FAIL
-
-  [Check if an attribute with namespace and no prefix is serialized with the nearest-declared prefix even if the prefix is assigned to another namespace.]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/element-timing/observe-svg-image.html.ini b/testing/web-platform/meta/element-timing/observe-svg-image.html.ini
deleted file mode 100644
index cfb65499f94d..000000000000
--- a/testing/web-platform/meta/element-timing/observe-svg-image.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[observe-svg-image.html]
-  expected: TIMEOUT
-  [Able to observe svg image.]
-    expected: TIMEOUT
-
diff --git a/testing/web-platform/meta/encoding/legacy-mb-tchinese/big5/big5-encode-form-x-x-big5.html.ini b/testing/web-platform/meta/encoding/legacy-mb-tchinese/big5/big5-encode-form-x-x-big5.html.ini
deleted file mode 100644
index 64dbd4fc8fe8..000000000000
--- a/testing/web-platform/meta/encoding/legacy-mb-tchinese/big5/big5-encode-form-x-x-big5.html.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-[big5-encode-form-x-x-big5.html?13001-14000]
-
-[big5-encode-form-x-x-big5.html?5001-6000]
-
-[big5-encode-form-x-x-big5.html?14001-last]
-
-[big5-encode-form-x-x-big5.html?2001-3000]
-
-[big5-encode-form-x-x-big5.html?10001-11000]
-
-[big5-encode-form-x-x-big5.html?1001-2000]
-
-[big5-encode-form-x-x-big5.html?7001-8000]
-
-[big5-encode-form-x-x-big5.html?9001-10000]
-
-[big5-encode-form-x-x-big5.html?4001-5000]
-  [x-x-big5 encoding (form)]
-    expected: FAIL
-
-
-[big5-encode-form-x-x-big5.html?1-1000]
-
-[big5-encode-form-x-x-big5.html?6001-7000]
-
-[big5-encode-form-x-x-big5.html?8001-9000]
-
-[big5-encode-form-x-x-big5.html?12001-13000]
-
-[big5-encode-form-x-x-big5.html?11001-12000]
-
-[big5-encode-form-x-x-big5.html?3001-4000]
diff --git a/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-temporary-multikey.https.html.ini b/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-temporary-multikey.https.html.ini
index 9735ecf3eee1..732bf3ed5b48 100644
--- a/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-temporary-multikey.https.html.ini
+++ b/testing/web-platform/meta/encrypted-media/clearkey-mp4-playback-temporary-multikey.https.html.ini
@@ -1,6 +1,5 @@
 [clearkey-mp4-playback-temporary-multikey.https.html]
   [org.w3.clearkey, temporary, mp4, playback, multikey audio/video]
     expected:
-      if os == "android": FAIL
-      if (os == "win") and (processor == "aarch64"): FAIL
-
+      if (os == "android"): FAIL
+      if (os == "win" and processor == "aarch64"): FAIL
diff --git a/testing/web-platform/meta/fetch/sec-metadata/fetch.tentative.https.sub.html.ini b/testing/web-platform/meta/fetch/sec-metadata/fetch.tentative.https.sub.html.ini
index 70f3a453c27c..3a72c7d6b848 100644
--- a/testing/web-platform/meta/fetch/sec-metadata/fetch.tentative.https.sub.html.ini
+++ b/testing/web-platform/meta/fetch/sec-metadata/fetch.tentative.https.sub.html.ini
@@ -8,12 +8,3 @@
   [Cross-site fetch]
     expected: FAIL
 
-  [Same-origin mode]
-    expected: FAIL
-
-  [no-CORS mode]
-    expected: FAIL
-
-  [CORS mode]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/fetch/sec-metadata/script.tentative.https.sub.html.ini b/testing/web-platform/meta/fetch/sec-metadata/script.tentative.https.sub.html.ini
index eb77e8c6c3dd..ecf13666b3d6 100644
--- a/testing/web-platform/meta/fetch/sec-metadata/script.tentative.https.sub.html.ini
+++ b/testing/web-platform/meta/fetch/sec-metadata/script.tentative.https.sub.html.ini
@@ -8,6 +8,3 @@
   [Cross-site script]
     expected: FAIL
 
-  [Same-origin CORS script]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/fetch/sec-metadata/style.tentative.https.sub.html.ini b/testing/web-platform/meta/fetch/sec-metadata/style.tentative.https.sub.html.ini
index 0eefdddf9f19..ad5f0ca7f3ab 100644
--- a/testing/web-platform/meta/fetch/sec-metadata/style.tentative.https.sub.html.ini
+++ b/testing/web-platform/meta/fetch/sec-metadata/style.tentative.https.sub.html.ini
@@ -9,6 +9,3 @@
   [Same-Origin style]
     expected: TIMEOUT
 
-  [Same-Origin, cors style]
-    expected: NOTRUN
-
diff --git a/testing/web-platform/meta/fetch/sec-metadata/track.tentative.https.sub.html.ini b/testing/web-platform/meta/fetch/sec-metadata/track.tentative.https.sub.html.ini
index 19e213d59be8..fdab1f6cdac6 100644
--- a/testing/web-platform/meta/fetch/sec-metadata/track.tentative.https.sub.html.ini
+++ b/testing/web-platform/meta/fetch/sec-metadata/track.tentative.https.sub.html.ini
@@ -9,6 +9,3 @@
   [Cross-Site track]
     expected: NOTRUN
 
-  [Same-Origin, CORS track]
-    expected: NOTRUN
-
diff --git a/testing/web-platform/meta/fetch/stale-while-revalidate/stale-css.tentative.html.ini b/testing/web-platform/meta/fetch/stale-while-revalidate/stale-css.tentative.html.ini
index e48d5638e12e..1c8951b7a672 100644
--- a/testing/web-platform/meta/fetch/stale-while-revalidate/stale-css.tentative.html.ini
+++ b/testing/web-platform/meta/fetch/stale-while-revalidate/stale-css.tentative.html.ini
@@ -1,5 +1,5 @@
 [stale-css.tentative.html]
-  expected: TIMEOUT
+  expected: ERROR
   [Cache returns stale resource]
     expected: TIMEOUT
 
diff --git a/testing/web-platform/meta/fetch/stale-while-revalidate/stale-image.tentative.html.ini b/testing/web-platform/meta/fetch/stale-while-revalidate/stale-image.tentative.html.ini
index cb2dea79a885..3cafa2962f47 100644
--- a/testing/web-platform/meta/fetch/stale-while-revalidate/stale-image.tentative.html.ini
+++ b/testing/web-platform/meta/fetch/stale-while-revalidate/stale-image.tentative.html.ini
@@ -1,4 +1,5 @@
 [stale-image.tentative.html]
+  expected: ERROR
   [Cache returns stale resource]
-    expected: FAIL
+    expected: TIMEOUT
 
diff --git a/testing/web-platform/meta/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-tokenization-noreferrer.html.ini b/testing/web-platform/meta/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-tokenization-noreferrer.html.ini
deleted file mode 100644
index 0e8b21457803..000000000000
--- a/testing/web-platform/meta/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-tokenization-noreferrer.html.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-[open-features-tokenization-noreferrer.html]
-  [Tokenizing "noreferrer" should ignore window feature separators except "," after initial "=" and before value]
-    expected: FAIL
-
-  [Tokenizing "noreferrer" should read characters until first window feature separator as `value`]
-    expected: FAIL
-
-  [After "noreferrer", tokenization should skip window features separators that are not "=" or ","]
-    expected: FAIL
-
-  [Integer values other than 0 should activate the feature]
-    expected: FAIL
-
-  [Tokenization of "noreferrer" should skip window features separators before feature]
-    expected: FAIL
-
-  [Feature "noreferrer" should be converted to ASCII lowercase]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/html/browsers/the-window-object/window-open-noreferrer.html.ini b/testing/web-platform/meta/html/browsers/the-window-object/window-open-noreferrer.html.ini
deleted file mode 100644
index ba7f8d69f1de..000000000000
--- a/testing/web-platform/meta/html/browsers/the-window-object/window-open-noreferrer.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[window-open-noreferrer.html]
-  [window.open() with "noreferrer" tests]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/html/browsers/windows/nested-browsing-contexts/name-attribute.window.js.ini b/testing/web-platform/meta/html/browsers/windows/nested-browsing-contexts/name-attribute.window.js.ini
deleted file mode 100644
index a49eed8faa77..000000000000
--- a/testing/web-platform/meta/html/browsers/windows/nested-browsing-contexts/name-attribute.window.js.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[name-attribute.window.html]
-  [cross-origin <frame name=>]
-    expected: FAIL
-
-  [same-origin <frame name=>]
-    expected: FAIL
-
-  [cross-origin <iframe name=initialvalue>]
-    expected: FAIL
-
-  [same-origin <iframe name=>]
-    expected: FAIL
-
-  [cross-origin <iframe>]
-    expected: FAIL
-
-  [cross-origin <frame name=initialvalue>]
-    expected: FAIL
-
-  [cross-origin <iframe name=>]
-    expected: FAIL
-
-  [same-origin <iframe>]
-    expected: FAIL
-
-  [same-origin <iframe name=initialvalue>]
-    expected: FAIL
-
-  [cross-origin <frame>]
-    expected: FAIL
-
-  [same-origin <frame>]
-    expected: FAIL
-
-  [same-origin <frame name=initialvalue>]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/html/dom/elements/global-attributes/dir_auto-textarea-script-N-between-Rs.html.ini b/testing/web-platform/meta/html/dom/elements/global-attributes/dir_auto-textarea-script-N-between-Rs.html.ini
index 654e787858b5..038942e77a5d 100644
--- a/testing/web-platform/meta/html/dom/elements/global-attributes/dir_auto-textarea-script-N-between-Rs.html.ini
+++ b/testing/web-platform/meta/html/dom/elements/global-attributes/dir_auto-textarea-script-N-between-Rs.html.ini
@@ -1,4 +1,4 @@
 [dir_auto-textarea-script-N-between-Rs.html]
   restart-after: true
   expected:
-    if os == "android": FAIL
+    if (os == "android"): FAIL
diff --git a/testing/web-platform/meta/html/dom/interfaces.https.html.ini b/testing/web-platform/meta/html/dom/interfaces.https.html.ini
index 392a5fb6eca3..342c13456d56 100644
--- a/testing/web-platform/meta/html/dom/interfaces.https.html.ini
+++ b/testing/web-platform/meta/html/dom/interfaces.https.html.ini
@@ -356,11 +356,11 @@ prefs: [dom.security.featurePolicy.enabled:true]
 
   [Window interface: window must inherit property "print()" with the proper type]
     expected:
-      if os == "android": FAIL
+      if (os == "android"): FAIL
 
   [Window interface: operation print()]
     expected:
-      if os == "android": FAIL
+      if (os == "android"): FAIL
 
   [Window interface: window must have own property "window"]
     expected:
@@ -702,24 +702,6 @@ prefs: [dom.security.featurePolicy.enabled:true]
   [HTMLElement interface: attribute autocapitalize]
     expected: FAIL
 
-  [HTMLFormElement interface: attribute rel]
-    expected: FAIL
-
-  [HTMLFormElement interface: attribute relList]
-    expected: FAIL
-
-  [HTMLFormElement interface: document.createElement("form") must inherit property "rel" with the proper type]
-    expected: FAIL
-
-  [HTMLFormElement interface: document.createElement("form") must inherit property "relList" with the proper type]
-    expected: FAIL
-
-  [HTMLElement interface: operation attachInternals()]
-    expected: FAIL
-
-  [HTMLElement interface: document.createElement("noscript") must inherit property "attachInternals()" with the proper type]
-    expected: FAIL
-
 
 [interfaces.https.html?exclude=(Document|Window|HTML.*)]
   [AudioTrackList interface: existence and properties of interface object]
@@ -1442,21 +1424,3 @@ prefs: [dom.security.featurePolicy.enabled:true]
   [External interface: existence and properties of interface prototype object's @@unscopables property]
     expected: FAIL
 
-  [ElementInternals interface: existence and properties of interface object]
-    expected: FAIL
-
-  [ElementInternals interface object length]
-    expected: FAIL
-
-  [ElementInternals interface object name]
-    expected: FAIL
-
-  [ElementInternals interface: existence and properties of interface prototype object]
-    expected: FAIL
-
-  [ElementInternals interface: existence and properties of interface prototype object's @@unscopables property]
-    expected: FAIL
-
-  [ElementInternals interface: existence and properties of interface prototype object's "constructor" property]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/html/editing/editing-0/spelling-and-grammar-checking/spelling-markers-007.html.ini b/testing/web-platform/meta/html/editing/editing-0/spelling-and-grammar-checking/spelling-markers-007.html.ini
index aeea996f749b..75e1a41387a2 100644
--- a/testing/web-platform/meta/html/editing/editing-0/spelling-and-grammar-checking/spelling-markers-007.html.ini
+++ b/testing/web-platform/meta/html/editing/editing-0/spelling-and-grammar-checking/spelling-markers-007.html.ini
@@ -1,3 +1,3 @@
 [spelling-markers-007.html]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/html/editing/editing-0/spelling-and-grammar-checking/spelling-markers-008.html.ini b/testing/web-platform/meta/html/editing/editing-0/spelling-and-grammar-checking/spelling-markers-008.html.ini
index f3c10144dbe2..8f2967922dda 100644
--- a/testing/web-platform/meta/html/editing/editing-0/spelling-and-grammar-checking/spelling-markers-008.html.ini
+++ b/testing/web-platform/meta/html/editing/editing-0/spelling-and-grammar-checking/spelling-markers-008.html.ini
@@ -1,3 +1,3 @@
 [spelling-markers-008.html]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
diff --git a/testing/web-platform/meta/html/editing/editing-0/spelling-and-grammar-checking/spelling-markers-009.html.ini b/testing/web-platform/meta/html/editing/editing-0/spelling-and-grammar-checking/spelling-markers-009.html.ini
index b3c59ef8fe57..28b76cfdb3b7 100644
--- a/testing/web-platform/meta/html/editing/editing-0/spelling-and-grammar-checking/spelling-markers-009.html.ini
+++ b/testing/web-platform/meta/html/editing/editing-0/spelling-and-grammar-checking/spelling-markers-009.html.ini
@@ -1,9 +1,2 @@
 [spelling-markers-009.html]
-  expected:
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    FAIL
+  expected: FAIL
diff --git a/testing/web-platform/meta/html/editing/editing-0/spelling-and-grammar-checking/spelling-markers-010.html.ini b/testing/web-platform/meta/html/editing/editing-0/spelling-and-grammar-checking/spelling-markers-010.html.ini
index 292902b12d07..5670828676cf 100644
--- a/testing/web-platform/meta/html/editing/editing-0/spelling-and-grammar-checking/spelling-markers-010.html.ini
+++ b/testing/web-platform/meta/html/editing/editing-0/spelling-and-grammar-checking/spelling-markers-010.html.ini
@@ -1,9 +1,2 @@
 [spelling-markers-010.html]
-  expected:
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    FAIL
+  expected: FAIL
diff --git a/testing/web-platform/meta/html/rendering/replaced-elements/the-select-element/select-1-line-height.html.ini b/testing/web-platform/meta/html/rendering/replaced-elements/the-select-element/select-1-line-height.html.ini
index 10513f7605be..8acc8d03b8dd 100644
--- a/testing/web-platform/meta/html/rendering/replaced-elements/the-select-element/select-1-line-height.html.ini
+++ b/testing/web-platform/meta/html/rendering/replaced-elements/the-select-element/select-1-line-height.html.ini
@@ -1,3 +1,3 @@
 [select-1-line-height.html]
   disabled:
-    if os == "android": https://bugzilla.mozilla.org/show_bug.cgi?id=1511369
+    if (os == "android"): https://bugzilla.mozilla.org/show_bug.cgi?id=1511369
diff --git a/testing/web-platform/meta/html/semantics/embedded-content/media-elements/track/track-element/track-cue-rendering-line-doesnt-fit.html.ini b/testing/web-platform/meta/html/semantics/embedded-content/media-elements/track/track-element/track-cue-rendering-line-doesnt-fit.html.ini
index 0a69dcf1b580..286b87a100a9 100644
--- a/testing/web-platform/meta/html/semantics/embedded-content/media-elements/track/track-element/track-cue-rendering-line-doesnt-fit.html.ini
+++ b/testing/web-platform/meta/html/semantics/embedded-content/media-elements/track/track-element/track-cue-rendering-line-doesnt-fit.html.ini
@@ -1,4 +1,2 @@
 [track-cue-rendering-line-doesnt-fit.html]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    FAIL
+  expected: FAIL
diff --git a/testing/web-platform/meta/html/semantics/embedded-content/media-elements/track/track-element/track-cue-rendering-transformed-video.html.ini b/testing/web-platform/meta/html/semantics/embedded-content/media-elements/track/track-element/track-cue-rendering-transformed-video.html.ini
new file mode 100644
index 000000000000..3e4839dece18
--- /dev/null
+++ b/testing/web-platform/meta/html/semantics/embedded-content/media-elements/track/track-element/track-cue-rendering-transformed-video.html.ini
@@ -0,0 +1,2 @@
+[track-cue-rendering-transformed-video.html]
+  expected: FAIL
diff --git a/testing/web-platform/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_anchor_download_block_downloads_without_user_activation.sub.tentative.html.ini b/testing/web-platform/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_anchor_download_block_downloads_without_user_activation.sub.tentative.html.ini
deleted file mode 100644
index f4a5ffbe5626..000000000000
--- a/testing/web-platform/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_anchor_download_block_downloads_without_user_activation.sub.tentative.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[iframe_sandbox_anchor_download_block_downloads_without_user_activation.sub.tentative.html]
-  [<a download> triggered download in sandbox is blocked.]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigation_download_block_downloads_without_user_activation.sub.tentative.html.ini b/testing/web-platform/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigation_download_block_downloads_without_user_activation.sub.tentative.html.ini
deleted file mode 100644
index cd4b1b1dd2bb..000000000000
--- a/testing/web-platform/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigation_download_block_downloads_without_user_activation.sub.tentative.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[iframe_sandbox_navigation_download_block_downloads_without_user_activation.sub.tentative.html]
-  [Navigation resulted download in sandbox is blocked.]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/html/semantics/forms/form-submission-target/rel-base-target.html.ini b/testing/web-platform/meta/html/semantics/forms/form-submission-target/rel-base-target.html.ini
deleted file mode 100644
index 8fd353265fcf..000000000000
--- a/testing/web-platform/meta/html/semantics/forms/form-submission-target/rel-base-target.html.ini
+++ /dev/null
@@ -1,16 +0,0 @@
-[rel-base-target.html]
-  [<form rel="noreferrer opener"> with <base target>]
-    expected: FAIL
-
-  [<form rel="opener noopener"> with <base target>]
-    expected: FAIL
-
-  [<form rel="noopener noreferrer"> with <base target>]
-    expected: FAIL
-
-  [<form rel="noopener"> with <base target>]
-    expected: FAIL
-
-  [<form rel="noreferrer"> with <base target>]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/html/semantics/forms/form-submission-target/rel-button-target.html.ini b/testing/web-platform/meta/html/semantics/forms/form-submission-target/rel-button-target.html.ini
deleted file mode 100644
index 15beb7d316ee..000000000000
--- a/testing/web-platform/meta/html/semantics/forms/form-submission-target/rel-button-target.html.ini
+++ /dev/null
@@ -1,16 +0,0 @@
-[rel-button-target.html]
-  [<form rel="opener noopener"> with <button formtarget>]
-    expected: FAIL
-
-  [<form rel="noopener noreferrer"> with <button formtarget>]
-    expected: FAIL
-
-  [<form rel="noreferrer opener"> with <button formtarget>]
-    expected: FAIL
-
-  [<form rel="noopener"> with <button formtarget>]
-    expected: FAIL
-
-  [<form rel="noreferrer"> with <button formtarget>]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/html/semantics/forms/form-submission-target/rel-form-target.html.ini b/testing/web-platform/meta/html/semantics/forms/form-submission-target/rel-form-target.html.ini
deleted file mode 100644
index 3c5cee304b5d..000000000000
--- a/testing/web-platform/meta/html/semantics/forms/form-submission-target/rel-form-target.html.ini
+++ /dev/null
@@ -1,16 +0,0 @@
-[rel-form-target.html]
-  [<form rel="noopener noreferrer"> with <form target>]
-    expected: FAIL
-
-  [<form rel="noreferrer opener"> with <form target>]
-    expected: FAIL
-
-  [<form rel="noreferrer"> with <form target>]
-    expected: FAIL
-
-  [<form rel="opener noopener"> with <form target>]
-    expected: FAIL
-
-  [<form rel="noopener"> with <form target>]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/html/semantics/forms/form-submission-target/rel-input-target.html.ini b/testing/web-platform/meta/html/semantics/forms/form-submission-target/rel-input-target.html.ini
deleted file mode 100644
index 620f38d6eb32..000000000000
--- a/testing/web-platform/meta/html/semantics/forms/form-submission-target/rel-input-target.html.ini
+++ /dev/null
@@ -1,16 +0,0 @@
-[rel-input-target.html]
-  [<form rel="opener noopener"> with <input formtarget>]
-    expected: FAIL
-
-  [<form rel="noreferrer opener"> with <input formtarget>]
-    expected: FAIL
-
-  [<form rel="noopener noreferrer"> with <input formtarget>]
-    expected: FAIL
-
-  [<form rel="noreferrer"> with <input formtarget>]
-    expected: FAIL
-
-  [<form rel="noopener"> with <input formtarget>]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-wrapped.html.ini b/testing/web-platform/meta/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-wrapped.html.ini
index 07cd3e84ce25..84cf698672c5 100644
--- a/testing/web-platform/meta/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-wrapped.html.ini
+++ b/testing/web-platform/meta/html/semantics/text-level-semantics/the-bdi-element/bdi-neutral-wrapped.html.ini
@@ -1,3 +1,4 @@
 [bdi-neutral-wrapped.html]
   expected:
     if headless: PASS
+    if (os == "linux"): FAIL
diff --git a/testing/web-platform/meta/html/webappapis/animation-frames/cancel-pending.html.ini b/testing/web-platform/meta/html/webappapis/animation-frames/cancel-pending.html.ini
deleted file mode 100644
index 7ce817ba55f6..000000000000
--- a/testing/web-platform/meta/html/webappapis/animation-frames/cancel-pending.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[cancel-pending.html]
-  [cancelAnimationFrame cancels a pending animation frame callback]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/html/webappapis/system-state-and-capabilities/the-navigator-object/navigator_user_agent.tentative.https.html.ini b/testing/web-platform/meta/html/webappapis/system-state-and-capabilities/the-navigator-object/navigator_user_agent.tentative.https.html.ini
deleted file mode 100644
index fd60cbebb966..000000000000
--- a/testing/web-platform/meta/html/webappapis/system-state-and-capabilities/the-navigator-object/navigator_user_agent.tentative.https.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[navigator_user_agent.tentative.https.html]
-  [navigator.getUserAgent() is exposed.]
-    expected: FAIL
-
-  [navigator.getUserAgent() returns a UserAgentMetadata object.]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/import-maps/acquire-import-maps-flag/dynamic-import/success.tentative.html.ini b/testing/web-platform/meta/import-maps/acquire-import-maps-flag/dynamic-import/success.tentative.html.ini
deleted file mode 100644
index 3337acb1988e..000000000000
--- a/testing/web-platform/meta/import-maps/acquire-import-maps-flag/dynamic-import/success.tentative.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[success.tentative.html]
-  expected: TIMEOUT
-  [After dynamic imports, import maps should fire error events]
-    expected: NOTRUN
-
diff --git a/testing/web-platform/meta/import-maps/acquire-import-maps-flag/script-tag/success.tentative.html.ini b/testing/web-platform/meta/import-maps/acquire-import-maps-flag/script-tag/success.tentative.html.ini
deleted file mode 100644
index 7aed6ad3da9c..000000000000
--- a/testing/web-platform/meta/import-maps/acquire-import-maps-flag/script-tag/success.tentative.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[success.tentative.html]
-  expected: TIMEOUT
-  [After <script type="module"> import maps should fire error events]
-    expected: NOTRUN
-
diff --git a/testing/web-platform/meta/import-maps/acquire-import-maps-flag/worker-request/success.tentative.html.ini b/testing/web-platform/meta/import-maps/acquire-import-maps-flag/worker-request/success.tentative.html.ini
deleted file mode 100644
index b442041d83ed..000000000000
--- a/testing/web-platform/meta/import-maps/acquire-import-maps-flag/worker-request/success.tentative.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[success.tentative.html]
-  expected: TIMEOUT
-  [After module worker creation import maps are not effective]
-    expected: FAIL
-
-  [After module worker creation, import maps should fire error events]
-    expected: NOTRUN
-
diff --git a/testing/web-platform/meta/import-maps/bare.sub.tentative.html.ini b/testing/web-platform/meta/import-maps/bare.sub.tentative.html.ini
deleted file mode 100644
index b01506de57a8..000000000000
--- a/testing/web-platform/meta/import-maps/bare.sub.tentative.html.ini
+++ /dev/null
@@ -1,46 +0,0 @@
-[bare.sub.tentative.html]
-  [bare/std-blank: dynamic import (from text/javascript)]
-    expected: FAIL
-
-  [bare/blank: static import]
-    expected: FAIL
-
-  [bare/cross-origin-bare: dynamic import (from text/javascript)]
-    expected: FAIL
-
-  [bare/std-blank: static import]
-    expected: FAIL
-
-  [bare/to-data: dynamic import (from module)]
-    expected: FAIL
-
-  [bare/to-data: static import]
-    expected: FAIL
-
-  [bare/to-data: dynamic import (from text/javascript)]
-    expected: FAIL
-
-  [bare/bare: dynamic import (from text/javascript)]
-    expected: FAIL
-
-  [bare/cross-origin-bare: static import]
-    expected: FAIL
-
-  [bare/bare: static import]
-    expected: FAIL
-
-  [bare/std-blank: dynamic import (from module)]
-    expected: FAIL
-
-  [bare/cross-origin-bare: dynamic import (from module)]
-    expected: FAIL
-
-  [bare/bare: dynamic import (from module)]
-    expected: FAIL
-
-  [bare/blank: dynamic import (from module)]
-    expected: FAIL
-
-  [bare/blank: dynamic import (from text/javascript)]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/import-maps/builtin-empty.tentative.html.ini b/testing/web-platform/meta/import-maps/builtin-empty.tentative.html.ini
deleted file mode 100644
index b3ec51d14d33..000000000000
--- a/testing/web-platform/meta/import-maps/builtin-empty.tentative.html.ini
+++ /dev/null
@@ -1,16 +0,0 @@
-[builtin-empty.tentative.html]
-  [builtin-empty]
-    expected: FAIL
-
-  [@std/: static import]
-    expected: FAIL
-
-  [./resources/log.js?pipe=sub&name=empty: dynamic import (from module)]
-    expected: FAIL
-
-  [./resources/log.js?pipe=sub&name=empty: dynamic import (from text/javascript)]
-    expected: FAIL
-
-  [./resources/log.js?pipe=sub&name=empty: static import]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/import-maps/builtin.tentative.html.ini b/testing/web-platform/meta/import-maps/builtin.tentative.html.ini
deleted file mode 100644
index 2aa49cd546d1..000000000000
--- a/testing/web-platform/meta/import-maps/builtin.tentative.html.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-[builtin.tentative.html]
-  [std:blank: static import]
-    expected: FAIL
-
-  [std:blank: <script src type=module>]
-    expected: FAIL
-
-  [@std/none: static import]
-    expected: FAIL
-
-  [@std/blank: dynamic import (from text/javascript)]
-    expected: FAIL
-
-  [@std/blank: static import]
-    expected: FAIL
-
-  [std:blank: dynamic import (from text/javascript)]
-    expected: FAIL
-
-  [std:blank: dynamic import (from module)]
-    expected: FAIL
-
-  [@std/blank: dynamic import (from module)]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/import-maps/data.sub.tentative.html.ini b/testing/web-platform/meta/import-maps/data.sub.tentative.html.ini
deleted file mode 100644
index 7f7fb53f8004..000000000000
--- a/testing/web-platform/meta/import-maps/data.sub.tentative.html.ini
+++ /dev/null
@@ -1,73 +0,0 @@
-[data.sub.tentative.html]
-  [data:text/javascript,log.push('data:to-data'): dynamic import (from text/javascript)]
-    expected: FAIL
-
-  [data:text/javascript,log.push('data:std-none'): static import]
-    expected: FAIL
-
-  [data:text/javascript,log.push('data:blank'): dynamic import (from text/javascript)]
-    expected: FAIL
-
-  [data:text/javascript,log.push('data:to-bare'): dynamic import (from module)]
-    expected: FAIL
-
-  [data:text/javascript,log.push('data:std-blank'): dynamic import (from module)]
-    expected: FAIL
-
-  [data:text/javascript,log.push('data:to-data'): static import]
-    expected: FAIL
-
-  [data:text/javascript,log.push('data:std-blank'): static import]
-    expected: FAIL
-
-  [data:text/javascript,log.push('data:cross-origin-foo'): dynamic import (from text/javascript)]
-    expected: FAIL
-
-  [data:text/javascript,log.push('data:to-data'): dynamic import (from module)]
-    expected: FAIL
-
-  [data:text/javascript,log.push('data:foo'): dynamic import (from text/javascript)]
-    expected: FAIL
-
-  [data:text/javascript,log.push('data:to-bare'): static import]
-    expected: FAIL
-
-  [data:text/javascript,log.push('data:none'): static import]
-    expected: FAIL
-
-  [data:text/javascript,log.push('data:std-blank'): dynamic import (from text/javascript)]
-    expected: FAIL
-
-  [data:text/javascript,log.push('data:blank'): static import]
-    expected: FAIL
-
-  [data:text/javascript,log.push('data:cross-origin-foo'): dynamic import (from module)]
-    expected: FAIL
-
-  [data:text/javascript,log.push('data:to-bare'): dynamic import (from text/javascript)]
-    expected: FAIL
-
-  [data:text/javascript,log.push('data:foo'): static import]
-    expected: FAIL
-
-  [data:text/javascript,log.push('data:none'): dynamic import (from text/javascript)]
-    expected: FAIL
-
-  [data:text/javascript,log.push('data:blank'): dynamic import (from module)]
-    expected: FAIL
-
-  [data:text/javascript,log.push('data:std-none'): dynamic import (from module)]
-    expected: FAIL
-
-  [data:text/javascript,log.push('data:std-none'): dynamic import (from text/javascript)]
-    expected: FAIL
-
-  [data:text/javascript,log.push('data:none'): dynamic import (from module)]
-    expected: FAIL
-
-  [data:text/javascript,log.push('data:cross-origin-foo'): static import]
-    expected: FAIL
-
-  [data:text/javascript,log.push('data:foo'): dynamic import (from module)]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/import-maps/fallback-disallowed.sub.tentative.html.ini b/testing/web-platform/meta/import-maps/fallback-disallowed.sub.tentative.html.ini
deleted file mode 100644
index e13ab777e223..000000000000
--- a/testing/web-platform/meta/import-maps/fallback-disallowed.sub.tentative.html.ini
+++ /dev/null
@@ -1,91 +0,0 @@
-[fallback-disallowed.sub.tentative.html]
-  [./resources/log.js?pipe=sub&name=fallback-from-data-2: static import]
-    expected: FAIL
-
-  [./resources/log.js?pipe=sub&name=fallback-to-different-url-1: dynamic import (from module)]
-    expected: FAIL
-
-  [./resources/log.js?pipe=sub&name=fallback-from-data-1: dynamic import (from text/javascript)]
-    expected: FAIL
-
-  [./resources/log.js?pipe=sub&name=fallback-from-data-1: static import]
-    expected: FAIL
-
-  [./resources/log.js?pipe=sub&name=fallback-from-data-1: dynamic import (from module)]
-    expected: FAIL
-
-  [./resources/log.js?pipe=sub&name=fallback-to-different-url-2: dynamic import (from module)]
-    expected: FAIL
-
-  [./resources/log.js?pipe=sub&name=fallback-to-different-origin-2: dynamic import (from module)]
-    expected: FAIL
-
-  [./resources/log.js?pipe=sub&name=more-than-two-values-2: dynamic import (from text/javascript)]
-    expected: FAIL
-
-  [./resources/log.js?pipe=sub&name=http-to-builtin: static import]
-    expected: FAIL
-
-  [./resources/log.js?pipe=sub&name=fallback-from-http: dynamic import (from module)]
-    expected: FAIL
-
-  [./resources/log.js?pipe=sub&name=fallback-to-different-url-2: static import]
-    expected: FAIL
-
-  [./resources/log.js?pipe=sub&name=fallback-to-different-origin-1: dynamic import (from module)]
-    expected: FAIL
-
-  [./resources/log.js?pipe=sub&name=more-than-two-values-1: static import]
-    expected: FAIL
-
-  [./resources/log.js?pipe=sub&name=fallback-to-different-url-2: dynamic import (from text/javascript)]
-    expected: FAIL
-
-  [./resources/log.js?pipe=sub&name=http-to-builtin: dynamic import (from module)]
-    expected: FAIL
-
-  [./resources/log.js?pipe=sub&name=more-than-two-values-1: dynamic import (from text/javascript)]
-    expected: FAIL
-
-  [./resources/log.js?pipe=sub&name=fallback-to-different-origin-2: dynamic import (from text/javascript)]
-    expected: FAIL
-
-  [./resources/log.js?pipe=sub&name=fallback-from-http: dynamic import (from text/javascript)]
-    expected: FAIL
-
-  [./resources/log.js?pipe=sub&name=fallback-from-data-2: dynamic import (from text/javascript)]
-    expected: FAIL
-
-  [./resources/log.js?pipe=sub&name=fallback-to-different-origin-1: dynamic import (from text/javascript)]
-    expected: FAIL
-
-  [./resources/log.js?pipe=sub&name=more-than-two-values-2: dynamic import (from module)]
-    expected: FAIL
-
-  [./resources/log.js?pipe=sub&name=fallback-to-different-url-1: dynamic import (from text/javascript)]
-    expected: FAIL
-
-  [./resources/log.js?pipe=sub&name=more-than-two-values-1: dynamic import (from module)]
-    expected: FAIL
-
-  [./resources/log.js?pipe=sub&name=fallback-to-different-origin-2: static import]
-    expected: FAIL
-
-  [./resources/log.js?pipe=sub&name=fallback-to-different-url-1: static import]
-    expected: FAIL
-
-  [./resources/log.js?pipe=sub&name=fallback-from-data-2: dynamic import (from module)]
-    expected: FAIL
-
-  [./resources/log.js?pipe=sub&name=fallback-from-http: static import]
-    expected: FAIL
-
-  [./resources/log.js?pipe=sub&name=fallback-to-different-origin-1: static import]
-    expected: FAIL
-
-  [./resources/log.js?pipe=sub&name=more-than-two-values-2: static import]
-    expected: FAIL
-
-  [./resources/log.js?pipe=sub&name=http-to-builtin: dynamic import (from text/javascript)]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/import-maps/fallback.sub.tentative.html.ini b/testing/web-platform/meta/import-maps/fallback.sub.tentative.html.ini
deleted file mode 100644
index d91d2263b9db..000000000000
--- a/testing/web-platform/meta/import-maps/fallback.sub.tentative.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[fallback.sub.tentative.html]
-  [https://www1.web-platform.test:8443/import-maps/resources/log.js?pipe=sub&name=cross-origin-blank: dynamic import (from module)]
-    expected: FAIL
-
-  [./resources/log.js?pipe=sub&name=blank: dynamic import (from module)]
-    expected: FAIL
-
-  [https://www1.web-platform.test:8443/import-maps/resources/log.js?pipe=sub&name=std-cross-origin-blank: dynamic import (from text/javascript)]
-    expected: FAIL
-
-  [https://www1.web-platform.test:8443/import-maps/resources/log.js?pipe=sub&name=cross-origin-blank: dynamic import (from text/javascript)]
-    expected: FAIL
-
-  [./resources/log.js?pipe=sub&name=std-blank: dynamic import (from text/javascript)]
-    expected: FAIL
-
-  [./resources/log.js?pipe=sub&name=blank: dynamic import (from text/javascript)]
-    expected: FAIL
-
-  [./resources/log.js?pipe=sub&name=blank: static import]
-    expected: FAIL
-
-  [https://www1.web-platform.test:8443/import-maps/resources/log.js?pipe=sub&name=std-cross-origin-blank: dynamic import (from module)]
-    expected: FAIL
-
-  [https://www1.web-platform.test:8443/import-maps/resources/log.js?pipe=sub&name=cross-origin-blank: static import]
-    expected: FAIL
-
-  [./resources/log.js?pipe=sub&name=std-blank: static import]
-    expected: FAIL
-
-  [https://www1.web-platform.test:8443/import-maps/resources/log.js?pipe=sub&name=std-cross-origin-blank: static import]
-    expected: FAIL
-
-  [./resources/log.js?pipe=sub&name=std-blank: dynamic import (from module)]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/import-maps/http.sub.tentative.html.ini b/testing/web-platform/meta/import-maps/http.sub.tentative.html.ini
deleted file mode 100644
index f46a719a42ba..000000000000
--- a/testing/web-platform/meta/import-maps/http.sub.tentative.html.ini
+++ /dev/null
@@ -1,73 +0,0 @@
-[http.sub.tentative.html]
-  [http://web-platform.test:8000/import-maps/resources/log.js?pipe=sub&name=none: dynamic import (from text/javascript)]
-    expected: FAIL
-
-  [http://web-platform.test:8000/import-maps/resources/log.js?pipe=sub&name=to-bare: static import]
-    expected: FAIL
-
-  [http://web-platform.test:8000/import-maps/resources/log.js?pipe=sub&name=foo: dynamic import (from module)]
-    expected: FAIL
-
-  [http://web-platform.test:8000/import-maps/resources/log.js?pipe=sub&name=none: static import]
-    expected: FAIL
-
-  [http://web-platform.test:8000/import-maps/resources/log.js?pipe=sub&name=blank: static import]
-    expected: FAIL
-
-  [http://web-platform.test:8000/import-maps/resources/log.js?pipe=sub&name=to-bare: dynamic import (from text/javascript)]
-    expected: FAIL
-
-  [http://web-platform.test:8000/import-maps/resources/log.js?pipe=sub&name=to-bare: dynamic import (from module)]
-    expected: FAIL
-
-  [http://web-platform.test:8000/import-maps/resources/log.js?pipe=sub&name=cross-origin-foo: dynamic import (from text/javascript)]
-    expected: FAIL
-
-  [http://web-platform.test:8000/import-maps/resources/log.js?pipe=sub&name=blank: dynamic import (from text/javascript)]
-    expected: FAIL
-
-  [http://web-platform.test:8000/import-maps/resources/log.js?pipe=sub&name=foo: static import]
-    expected: FAIL
-
-  [http://web-platform.test:8000/import-maps/resources/log.js?pipe=sub&name=std-none: static import]
-    expected: FAIL
-
-  [http://web-platform.test:8000/import-maps/resources/log.js?pipe=sub&name=cross-origin-foo: static import]
-    expected: FAIL
-
-  [http://web-platform.test:8000/import-maps/resources/log.js?pipe=sub&name=to-data: dynamic import (from text/javascript)]
-    expected: FAIL
-
-  [http://web-platform.test:8000/import-maps/resources/log.js?pipe=sub&name=none: dynamic import (from module)]
-    expected: FAIL
-
-  [http://web-platform.test:8000/import-maps/resources/log.js?pipe=sub&name=std-none: dynamic import (from module)]
-    expected: FAIL
-
-  [http://web-platform.test:8000/import-maps/resources/log.js?pipe=sub&name=std-blank: dynamic import (from module)]
-    expected: FAIL
-
-  [http://web-platform.test:8000/import-maps/resources/log.js?pipe=sub&name=cross-origin-foo: dynamic import (from module)]
-    expected: FAIL
-
-  [http://web-platform.test:8000/import-maps/resources/log.js?pipe=sub&name=to-data: dynamic import (from module)]
-    expected: FAIL
-
-  [http://web-platform.test:8000/import-maps/resources/log.js?pipe=sub&name=to-data: static import]
-    expected: FAIL
-
-  [http://web-platform.test:8000/import-maps/resources/log.js?pipe=sub&name=foo: dynamic import (from text/javascript)]
-    expected: FAIL
-
-  [http://web-platform.test:8000/import-maps/resources/log.js?pipe=sub&name=std-none: dynamic import (from text/javascript)]
-    expected: FAIL
-
-  [http://web-platform.test:8000/import-maps/resources/log.js?pipe=sub&name=std-blank: dynamic import (from text/javascript)]
-    expected: FAIL
-
-  [http://web-platform.test:8000/import-maps/resources/log.js?pipe=sub&name=std-blank: static import]
-    expected: FAIL
-
-  [http://web-platform.test:8000/import-maps/resources/log.js?pipe=sub&name=blank: dynamic import (from module)]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/import-maps/module-map-key.tentative.html.ini b/testing/web-platform/meta/import-maps/module-map-key.tentative.html.ini
deleted file mode 100644
index 42477c5780ac..000000000000
--- a/testing/web-platform/meta/import-maps/module-map-key.tentative.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[module-map-key.tentative.html]
-  [Module map's key is the URL after import map resolution]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/import-maps/resolving.tentative.html.ini b/testing/web-platform/meta/import-maps/resolving.tentative.html.ini
deleted file mode 100644
index 5f7d03477b05..000000000000
--- a/testing/web-platform/meta/import-maps/resolving.tentative.html.ini
+++ /dev/null
@@ -1,58 +0,0 @@
-[resolving.tentative.html]
-  [Mapped using the "imports" key only (no scopes) / Tricky specifiers / should work when the specifier has punctuation]
-    expected: FAIL
-
-  [Mapped using the "imports" key only (no scopes) / URL-like specifiers / should remap to other URLs]
-    expected: FAIL
-
-  [Mapped using the "imports" key only (no scopes) / URL-like specifiers / should remap URLs that are just composed from / and .]
-    expected: FAIL
-
-  [Unmapped / should fail for strings not parseable as absolute URLs and not starting with ./ ../ or /]
-    expected: FAIL
-
-  [Mapped using the "imports" key only (no scopes) / URL-like specifiers / should remap to built-in modules]
-    expected: FAIL
-
-  [Mapped using the "imports" key only (no scopes) / Package-like scenarios / should still fail for package modules that are not declared]
-    expected: FAIL
-
-  [Unmapped / should resolve / specifiers as URLs]
-    expected: FAIL
-
-  [Mapped using the "imports" key only (no scopes) / Package-like scenarios / should work for package main modules]
-    expected: FAIL
-
-  [Unmapped / should parse absolute fetch-scheme URLs]
-    expected: FAIL
-
-  [Unmapped / should fail for absolute non-fetch-scheme URLs]
-    expected: FAIL
-
-  [Mapped using the "imports" key only (no scopes) / should fail when the mapping is to an empty array]
-    expected: FAIL
-
-  [Mapped using the "imports" key only (no scopes) / URL-like specifiers / should use the last entry's address when URL-like specifiers parse to the same absolute URL]
-    expected: FAIL
-
-  [Mapped using the "imports" key only (no scopes) / Package-like scenarios / should work for package submodules]
-    expected: FAIL
-
-  [Unmapped / should resolve ../ specifiers as URLs]
-    expected: FAIL
-
-  [Unmapped / should resolve ./ specifiers as URLs]
-    expected: FAIL
-
-  [Mapped using the "imports" key only (no scopes) / Package-like scenarios / should work for package names that end in a slash by just passing through]
-    expected: FAIL
-
-  [Mapped using the "imports" key only (no scopes) / URL-like specifiers / should fail for URLs that remap to empty arrays]
-    expected: FAIL
-
-  [Mapped using the "imports" key only (no scopes) / Tricky specifiers / should work for explicitly-mapped specifiers that happen to have a slash]
-    expected: FAIL
-
-  [Mapped using the "imports" key only (no scopes) / Tricky specifiers / should fail for attempting to get a submodule of something not declared with a trailing slash]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/infrastructure/reftest/size.html.ini b/testing/web-platform/meta/infrastructure/reftest/size.html.ini
deleted file mode 100644
index becd0c7f8769..000000000000
--- a/testing/web-platform/meta/infrastructure/reftest/size.html.ini
+++ /dev/null
@@ -1,16 +0,0 @@
-[size.html]
-  expected:
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
diff --git a/testing/web-platform/meta/intersection-observer/v2/animated-occlusion.html.ini b/testing/web-platform/meta/intersection-observer/v2/animated-occlusion.html.ini
deleted file mode 100644
index 4048b1fc3dfd..000000000000
--- a/testing/web-platform/meta/intersection-observer/v2/animated-occlusion.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[animated-occlusion.html]
-  [First rAF.]
-    expected:
-      if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-
diff --git a/testing/web-platform/meta/intersection-observer/v2/blur-filter.html.ini b/testing/web-platform/meta/intersection-observer/v2/blur-filter.html.ini
deleted file mode 100644
index d81619b014d9..000000000000
--- a/testing/web-platform/meta/intersection-observer/v2/blur-filter.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[blur-filter.html]
-  [First rAF.]
-    expected: FAIL
-
-  [occluder.style.opacity = 0]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/intersection-observer/v2/box-shadow.html.ini b/testing/web-platform/meta/intersection-observer/v2/box-shadow.html.ini
deleted file mode 100644
index f34028ed2af3..000000000000
--- a/testing/web-platform/meta/intersection-observer/v2/box-shadow.html.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[box-shadow.html]
-  [occluder.style.boxShadow = ""]
-    expected: FAIL
-
-  [First rAF.]
-    expected: FAIL
-
-  [occluder.style.boxShadow = "none"]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/intersection-observer/v2/delay-test.html.ini b/testing/web-platform/meta/intersection-observer/v2/delay-test.html.ini
deleted file mode 100644
index 6912b552f219..000000000000
--- a/testing/web-platform/meta/intersection-observer/v2/delay-test.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[delay-test.html]
-  ['delay' parameter throttles frequency of notifications.]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/intersection-observer/v2/iframe-target.html.ini b/testing/web-platform/meta/intersection-observer/v2/iframe-target.html.ini
deleted file mode 100644
index 69d7cd2dc0f4..000000000000
--- a/testing/web-platform/meta/intersection-observer/v2/iframe-target.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[iframe-target.html]
-  [First rAF.]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/intersection-observer/v2/simple-effects.html.ini b/testing/web-platform/meta/intersection-observer/v2/simple-effects.html.ini
deleted file mode 100644
index 901f5c4096bf..000000000000
--- a/testing/web-platform/meta/intersection-observer/v2/simple-effects.html.ini
+++ /dev/null
@@ -1,13 +0,0 @@
-[simple-effects.html]
-  [effects.style.filter = grayscale(50%)]
-    expected: FAIL
-
-  [effects.style.opacity = 1]
-    expected: FAIL
-
-  [effects.style.opacity = 0.99]
-    expected: FAIL
-
-  [First rAF.]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/intersection-observer/v2/simple-occlusion-svg-foreign-object.html.ini b/testing/web-platform/meta/intersection-observer/v2/simple-occlusion-svg-foreign-object.html.ini
deleted file mode 100644
index dcb13203e5d8..000000000000
--- a/testing/web-platform/meta/intersection-observer/v2/simple-occlusion-svg-foreign-object.html.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[simple-occlusion-svg-foreign-object.html]
-  [First rAF.]
-    expected: FAIL
-
-  [svg.style.marginTop = '-10px']
-    expected: FAIL
-
-  [occluder.style.opacity = 0]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/intersection-observer/v2/simple-occlusion.html.ini b/testing/web-platform/meta/intersection-observer/v2/simple-occlusion.html.ini
deleted file mode 100644
index 72f82291871e..000000000000
--- a/testing/web-platform/meta/intersection-observer/v2/simple-occlusion.html.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[simple-occlusion.html]
-  [First rAF.]
-    expected: FAIL
-
-  [occluder.style.marginTop = '-10px']
-    expected: FAIL
-
-  [occluder.style.opacity = 0]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/intersection-observer/v2/text-shadow.html.ini b/testing/web-platform/meta/intersection-observer/v2/text-shadow.html.ini
deleted file mode 100644
index ee0b757c6cde..000000000000
--- a/testing/web-platform/meta/intersection-observer/v2/text-shadow.html.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[text-shadow.html]
-  [occluder.style.textShadow = ""]
-    expected: FAIL
-
-  [occluder.style.textShadow = "none"]
-    expected: FAIL
-
-  [First rAF.]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/kv-storage/backingstore.https.html.ini b/testing/web-platform/meta/kv-storage/backingstore.https.html.ini
deleted file mode 100644
index 908b2b68b39f..000000000000
--- a/testing/web-platform/meta/kv-storage/backingstore.https.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[backingstore.https.html]
-  expected: TIMEOUT
diff --git a/testing/web-platform/meta/layout-stability/buffer-layout-jank.html.ini b/testing/web-platform/meta/layout-stability/buffer-layout-jank.html.ini
deleted file mode 100644
index 17b546e379ff..000000000000
--- a/testing/web-platform/meta/layout-stability/buffer-layout-jank.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[buffer-layout-jank.html]
-  expected: TIMEOUT
-  [LayoutJank before onload is buffered into the performance timeline.]
-    expected: TIMEOUT
-
diff --git a/testing/web-platform/meta/layout-stability/observe-layoutjank.html.ini b/testing/web-platform/meta/layout-stability/observe-layoutjank.html.ini
deleted file mode 100644
index 15dd951c6e9f..000000000000
--- a/testing/web-platform/meta/layout-stability/observe-layoutjank.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[observe-layoutjank.html]
-  expected: TIMEOUT
-  [LayoutJank is observable via PerformanceObserver.]
-    expected: TIMEOUT
-
diff --git a/testing/web-platform/meta/layout-stability/supported-layout-type.html.ini b/testing/web-platform/meta/layout-stability/supported-layout-type.html.ini
deleted file mode 100644
index 4e776eb98e69..000000000000
--- a/testing/web-platform/meta/layout-stability/supported-layout-type.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[supported-layout-type.html]
-  [supportedEntryTypes contains 'layoutJank'.]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/mathml/presentation-markup/fractions/frac-bar-001.html.ini b/testing/web-platform/meta/mathml/presentation-markup/fractions/frac-bar-001.html.ini
deleted file mode 100644
index 96cca9bcfd42..000000000000
--- a/testing/web-platform/meta/mathml/presentation-markup/fractions/frac-bar-001.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[frac-bar-001.html]
-  expected:
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
diff --git a/testing/web-platform/meta/mathml/presentation-markup/fractions/frac-linethickness-002.html.ini b/testing/web-platform/meta/mathml/presentation-markup/fractions/frac-linethickness-002.html.ini
deleted file mode 100644
index 3fcd20709770..000000000000
--- a/testing/web-platform/meta/mathml/presentation-markup/fractions/frac-linethickness-002.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[frac-linethickness-002.html]
-  expected: FAIL
diff --git a/testing/web-platform/meta/mathml/relations/css-styling/color-1.html.ini b/testing/web-platform/meta/mathml/relations/css-styling/color-1.html.ini
index 15660d84b2ae..620d6217985c 100644
--- a/testing/web-platform/meta/mathml/relations/css-styling/color-1.html.ini
+++ b/testing/web-platform/meta/mathml/relations/css-styling/color-1.html.ini
@@ -1,5 +1,6 @@
 [color-1.html]
   expected:
-    if (os == "linux") and not debug and webrender: "FAIL"
-    if (os == "linux") and debug and webrender: "FAIL"
-    if os == "win": "FAIL"
+    if (os == "mac"): PASS
+    if not webrender  and (os == "linux"): PASS
+    if (os == "android"): PASS
+    FAIL
diff --git a/testing/web-platform/meta/mathml/relations/html5-tree/href-click-3.html.ini b/testing/web-platform/meta/mathml/relations/html5-tree/href-click-3.html.ini
deleted file mode 100644
index 40223719e576..000000000000
--- a/testing/web-platform/meta/mathml/relations/html5-tree/href-click-3.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[href-click-3.html]
-  expected: ERROR
diff --git a/testing/web-platform/meta/mathml/relations/html5-tree/required-extensions-2.html.ini b/testing/web-platform/meta/mathml/relations/html5-tree/required-extensions-2.html.ini
index 6535eee3321e..8bb6be1971d5 100644
--- a/testing/web-platform/meta/mathml/relations/html5-tree/required-extensions-2.html.ini
+++ b/testing/web-platform/meta/mathml/relations/html5-tree/required-extensions-2.html.ini
@@ -1,4 +1,4 @@
 [required-extensions-2.html]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
     if not debug and (os == "mac") and (processor == "x86") and (bits == 32): FAIL
diff --git a/testing/web-platform/meta/mathml/relations/html5-tree/unique-identifier-1.html.ini b/testing/web-platform/meta/mathml/relations/html5-tree/unique-identifier-1.html.ini
index 687258386e16..ac1bd46c4871 100644
--- a/testing/web-platform/meta/mathml/relations/html5-tree/unique-identifier-1.html.ini
+++ b/testing/web-platform/meta/mathml/relations/html5-tree/unique-identifier-1.html.ini
@@ -1,3 +1,3 @@
 [unique-identifier-1.html]
   disabled:
-    if os == "win": https://bugzilla.mozilla.org/show_bug.cgi?id=1377406
+    if (os == "win"): https://bugzilla.mozilla.org/show_bug.cgi?id=1377406
diff --git a/testing/web-platform/meta/mozilla-sync b/testing/web-platform/meta/mozilla-sync
index 8ec3a3bf3692..2165b6d89c4d 100644
--- a/testing/web-platform/meta/mozilla-sync
+++ b/testing/web-platform/meta/mozilla-sync
@@ -1,2 +1,2 @@
-local: 7095af3012b348ec6ec5ccbc28a96459154bf4d4
-upstream: 0f1c6e9b1f63e523eb241e8c0eba1cdc764fd180
+local: e4bdf1e9a4d7125e27efdffec2ebdb7307a42137
+upstream: f8a1bfbe5454352d3f5b58845829968ff212519b
diff --git a/testing/web-platform/meta/offscreen-canvas/fill-and-stroke-styles/__dir__.ini b/testing/web-platform/meta/offscreen-canvas/fill-and-stroke-styles/__dir__.ini
index bceeb9dac3c8..e69de29bb2d1 100644
--- a/testing/web-platform/meta/offscreen-canvas/fill-and-stroke-styles/__dir__.ini
+++ b/testing/web-platform/meta/offscreen-canvas/fill-and-stroke-styles/__dir__.ini
@@ -1 +0,0 @@
-lsan-allowed: [Alloc, mozilla::net::nsServerSocket::CreateClientTransport]
diff --git a/testing/web-platform/meta/orientation-event/devicemotionevent-init.https.html.ini b/testing/web-platform/meta/orientation-event/devicemotionevent-init.html.ini
similarity index 70%
rename from testing/web-platform/meta/orientation-event/devicemotionevent-init.https.html.ini
rename to testing/web-platform/meta/orientation-event/devicemotionevent-init.html.ini
index e478a4cb5061..d89f85dda25b 100644
--- a/testing/web-platform/meta/orientation-event/devicemotionevent-init.https.html.ini
+++ b/testing/web-platform/meta/orientation-event/devicemotionevent-init.html.ini
@@ -1,4 +1,4 @@
-[devicemotionevent-init.https.html]
+[devicemotionevent-init.html]
   [User created event is initialized properly with default values]
     expected: FAIL
 
diff --git a/testing/web-platform/meta/orientation-event/deviceorientationabsoluteevent.https.html.ini b/testing/web-platform/meta/orientation-event/deviceorientationabsoluteevent.html.ini
similarity index 65%
rename from testing/web-platform/meta/orientation-event/deviceorientationabsoluteevent.https.html.ini
rename to testing/web-platform/meta/orientation-event/deviceorientationabsoluteevent.html.ini
index 51cc85f91fc4..82378fc6344d 100644
--- a/testing/web-platform/meta/orientation-event/deviceorientationabsoluteevent.https.html.ini
+++ b/testing/web-platform/meta/orientation-event/deviceorientationabsoluteevent.html.ini
@@ -1,4 +1,4 @@
-[deviceorientationabsoluteevent.https.html]
+[deviceorientationabsoluteevent.html]
   expected: TIMEOUT
   [deviceorientationabsolute event fires]
     expected: NOTRUN
diff --git a/testing/web-platform/meta/orientation-event/ondeviceorientationabsolute.https.html.ini b/testing/web-platform/meta/orientation-event/ondeviceorientationabsolute.html.ini
similarity index 86%
rename from testing/web-platform/meta/orientation-event/ondeviceorientationabsolute.https.html.ini
rename to testing/web-platform/meta/orientation-event/ondeviceorientationabsolute.html.ini
index 580eff9bea13..f5cdd602ec37 100644
--- a/testing/web-platform/meta/orientation-event/ondeviceorientationabsolute.https.html.ini
+++ b/testing/web-platform/meta/orientation-event/ondeviceorientationabsolute.html.ini
@@ -1,4 +1,4 @@
-[ondeviceorientationabsolute.https.html]
+[ondeviceorientationabsolute.html]
   [Provide an event handler IDL attribute named ondeviceorientationabsolute]
     expected: FAIL
 
diff --git a/testing/web-platform/meta/payment-method-basic-card/payment-request-canmakepayment-method.https.html.ini b/testing/web-platform/meta/payment-method-basic-card/payment-request-canmakepayment-method.https.html.ini
index 6d06dfd4a275..a7b4d65cc185 100644
--- a/testing/web-platform/meta/payment-method-basic-card/payment-request-canmakepayment-method.https.html.ini
+++ b/testing/web-platform/meta/payment-method-basic-card/payment-request-canmakepayment-method.https.html.ini
@@ -4,24 +4,8 @@
       if not e10s: FAIL
 
   [Must return true when basic-card is amongst unsupported PMIs.]
-    expected:
-      if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-      if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-      if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-      if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-      if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-      if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-      if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-      if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-      if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-      if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-      if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-      if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-      if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-      if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-      FAIL
+    expected: FAIL
 
   [If basic-card is supported, then return a promise that resolves to true.]
     expected:
       if not e10s: FAIL
-
diff --git a/testing/web-platform/meta/payment-request/payment-request-hasenrolledinstrument-method.https.html.ini b/testing/web-platform/meta/payment-request/payment-request-hasenrolledinstrument-method.https.html.ini
index 1dee1750884c..b12ab212f2ed 100644
--- a/testing/web-platform/meta/payment-request/payment-request-hasenrolledinstrument-method.https.html.ini
+++ b/testing/web-platform/meta/payment-request/payment-request-hasenrolledinstrument-method.https.html.ini
@@ -2,9 +2,3 @@
   [hasEnrolledInstrument() resolves to false for unsupported payment methods.]
     expected: FAIL
 
-  [If request.[[state\]\] is "interactive", then return a promise rejected with an "InvalidStateError" DOMException.]
-    expected: FAIL
-
-  [If request.[[state\]\] is "closed", then return a promise rejected with an "InvalidStateError" DOMException.]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/payment-request/payment-request-show-method.https.html.ini b/testing/web-platform/meta/payment-request/payment-request-show-method.https.html.ini
index a7e2ed83a742..b73490907fbd 100644
--- a/testing/web-platform/meta/payment-request/payment-request-show-method.https.html.ini
+++ b/testing/web-platform/meta/payment-request/payment-request-show-method.https.html.ini
@@ -15,6 +15,3 @@
   [Calling show() multiple times is always a new object.]
     expected: FAIL
 
-  [Calling show() multiple times always returns a new promise.]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/payment-request/rejects_if_not_active_manual.https.html.ini b/testing/web-platform/meta/payment-request/rejects_if_not_active_manual.https.html.ini
deleted file mode 100644
index 5069ae543de4..000000000000
--- a/testing/web-platform/meta/payment-request/rejects_if_not_active_manual.https.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[rejects_if_not_active_manual.https.html]
-  expected: TIMEOUT
diff --git a/testing/web-platform/meta/preload/__dir__.ini b/testing/web-platform/meta/preload/__dir__.ini
index 4adeddd8e705..6498aad1cc12 100644
--- a/testing/web-platform/meta/preload/__dir__.ini
+++ b/testing/web-platform/meta/preload/__dir__.ini
@@ -1,2 +1 @@
 prefs: [network.http.rcwn.enabled:false]
-lsan-allowed: [_GetAddrInfo_Portable, mozilla::net::AddrInfo::AddrInfo]
diff --git a/testing/web-platform/meta/referrer-policy/generic/iframe-inheritance.html.ini b/testing/web-platform/meta/referrer-policy/generic/iframe-inheritance.html.ini
index 72f948e79462..dae4704bef01 100644
--- a/testing/web-platform/meta/referrer-policy/generic/iframe-inheritance.html.ini
+++ b/testing/web-platform/meta/referrer-policy/generic/iframe-inheritance.html.ini
@@ -1,4 +1,5 @@
 [iframe-inheritance.html]
+  expected: TIMEOUT
   [iframes correctly inherit the ancestor's referrer]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/testing/web-platform/meta/referrer-policy/generic/sandboxed-iframe-with-opaque-origin.html.ini b/testing/web-platform/meta/referrer-policy/generic/sandboxed-iframe-with-opaque-origin.html.ini
new file mode 100644
index 000000000000..f4089ce54d78
--- /dev/null
+++ b/testing/web-platform/meta/referrer-policy/generic/sandboxed-iframe-with-opaque-origin.html.ini
@@ -0,0 +1,8 @@
+[sandboxed-iframe-with-opaque-origin.html]
+  expected: TIMEOUT
+  [Sandboxed iframe with tuple origin sends referrers.]
+    expected: TIMEOUT
+
+  [Sandboxed iframe with opaque origin doesn't send referrers.]
+    expected: TIMEOUT
+
diff --git a/testing/web-platform/meta/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html.ini b/testing/web-platform/meta/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html.ini
deleted file mode 100644
index c55f0c49eb48..000000000000
--- a/testing/web-platform/meta/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[same-insecure.http.html]
-  [Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin']
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/reporting/bufferSize.html.ini b/testing/web-platform/meta/reporting/bufferSize.html.ini
deleted file mode 100644
index c6ec8a0fee72..000000000000
--- a/testing/web-platform/meta/reporting/bufferSize.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[bufferSize.html]
-  expected: ERROR
diff --git a/testing/web-platform/meta/reporting/disconnect.html.ini b/testing/web-platform/meta/reporting/disconnect.html.ini
deleted file mode 100644
index 430ce516e1e1..000000000000
--- a/testing/web-platform/meta/reporting/disconnect.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[disconnect.html]
-  expected: ERROR
diff --git a/testing/web-platform/meta/reporting/generateTestReport.html.ini b/testing/web-platform/meta/reporting/generateTestReport.html.ini
deleted file mode 100644
index 0bd4b2108291..000000000000
--- a/testing/web-platform/meta/reporting/generateTestReport.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[generateTestReport.html]
-  expected: ERROR
diff --git a/testing/web-platform/meta/reporting/nestedReport.html.ini b/testing/web-platform/meta/reporting/nestedReport.html.ini
deleted file mode 100644
index b78387a9de42..000000000000
--- a/testing/web-platform/meta/reporting/nestedReport.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[nestedReport.html]
-  expected: ERROR
diff --git a/testing/web-platform/meta/reporting/order.html.ini b/testing/web-platform/meta/reporting/order.html.ini
deleted file mode 100644
index 9344070597b3..000000000000
--- a/testing/web-platform/meta/reporting/order.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[order.html]
-  expected: ERROR
diff --git a/testing/web-platform/meta/service-workers/service-worker/__dir__.ini b/testing/web-platform/meta/service-workers/service-worker/__dir__.ini
index 1a8085d0dffe..4f06ab9c992c 100644
--- a/testing/web-platform/meta/service-workers/service-worker/__dir__.ini
+++ b/testing/web-platform/meta/service-workers/service-worker/__dir__.ini
@@ -1,3 +1,3 @@
 prefs: [dom.serviceWorkers.enabled:true]
-lsan-allowed: [Alloc, CompareNetwork, Create, EntrySlotOrCreate, MakeUnique, Malloc, NS_NewLoadGroup, NewChannelFromURIWithProxyFlagsInternal, NewPage, PLDHashTable::Add, Realloc, SharedMutex, Then, mozilla::BasePrincipal::CreateCodebasePrincipal, mozilla::SchedulerGroup::CreateEventTargetFor, mozilla::ThrottledEventQueue::Create, mozilla::dom::PerformanceStorageWorker::Create, mozilla::dom::ServiceWorkerJobQueue::RunJob, mozilla::dom::ServiceWorkerManager::Unregister, mozilla::dom::ServiceWorkerRegistrationMainThread::Unregister, mozilla::dom::UnregisterCallback::UnregisterCallback, mozilla::dom::WorkerCSPEventListener::Create, mozilla::dom::WorkerPrivate::EnsurePerformanceCounter, mozilla::dom::WorkerPrivate::WorkerPrivate, mozilla::dom::cache::CacheOpChild::Recv__delete__, mozilla::dom::serviceWorkerScriptCache::, mozilla::net::HttpBaseChannel::HttpBaseChannel, mozilla::net::HttpChannelChild::HttpChannelChild, mozilla::net::nsHttpHandler::NewProxiedChannel, mozilla::net::nsStandardURL::TemplatedMutator, nsPermission::Create, nsTimer, nsTimer::WithEventTarget, operator]
+lsan-allowed: [Alloc, Malloc, Realloc, Then, mozilla::BasePrincipal::CreateCodebasePrincipal, mozilla::SchedulerGroup::CreateEventTargetFor, mozilla::dom::ServiceWorkerJobQueue::RunJob, mozilla::dom::ServiceWorkerManager::Unregister, mozilla::dom::ServiceWorkerRegistrationMainThread::Unregister, mozilla::dom::UnregisterCallback::UnregisterCallback, mozilla::net::nsStandardURL::TemplatedMutator, operator]
 leak-threshold: [default:51200, tab:51200]
diff --git a/testing/web-platform/meta/service-workers/service-worker/client-navigate.https.html.ini b/testing/web-platform/meta/service-workers/service-worker/client-navigate.https.html.ini
index b24c795f1cb9..3d051877ee80 100644
--- a/testing/web-platform/meta/service-workers/service-worker/client-navigate.https.html.ini
+++ b/testing/web-platform/meta/service-workers/service-worker/client-navigate.https.html.ini
@@ -1,3 +1,3 @@
 [client-navigate.https.html]
   disabled:
-    if os == "android": https://bugzilla.mozilla.org/show_bug.cgi?id=1499972
+    if (os == "android"): https://bugzilla.mozilla.org/show_bug.cgi?id=1499972
diff --git a/testing/web-platform/meta/service-workers/service-worker/fetch-csp.https.html.ini b/testing/web-platform/meta/service-workers/service-worker/fetch-csp.https.html.ini
index 62fd8f0e3410..ef17ebbab58e 100644
--- a/testing/web-platform/meta/service-workers/service-worker/fetch-csp.https.html.ini
+++ b/testing/web-platform/meta/service-workers/service-worker/fetch-csp.https.html.ini
@@ -1,11 +1,8 @@
 [fetch-csp.https.html]
   [Verify CSP control of fetch() in a Service Worker]
     expected:
-      if os == "win": FAIL
-      if os == "mac": FAIL
-      if os == "android": FAIL
-      if (os == "linux") and debug and not webrender and e10s and not sw-e10s: "FAIL"
-      if (os == "linux") and debug and not webrender and not e10s: "FAIL"
-      if (os == "linux") and debug and webrender: "FAIL"
-      if (os == "linux") and not debug: "FAIL"
+      if (os == "linux"): FAIL
+      if (os == "win"): FAIL
+      if (os == "mac"): FAIL
+      if (os == "android"): FAIL
 
diff --git a/testing/web-platform/meta/service-workers/service-worker/navigation-redirect.https.html.ini b/testing/web-platform/meta/service-workers/service-worker/navigation-redirect.https.html.ini
index 9a1092815cbe..4edce167ba53 100644
--- a/testing/web-platform/meta/service-workers/service-worker/navigation-redirect.https.html.ini
+++ b/testing/web-platform/meta/service-workers/service-worker/navigation-redirect.https.html.ini
@@ -7,7 +7,7 @@
   disabled:
     if os == "mac": true
     if os == "linux": https://bugzilla.mozilla.org/show_bug.cgi?id=1522439
-    if debug and (os == "win"): https://bugzilla.mozilla.org/show_bug.cgi?id=1522439
+    if debug and os == "win": https://bugzilla.mozilla.org/show_bug.cgi?id=1522439
   [Redirect to same-origin out-scope with opaque redirect response.]
     expected: FAIL
 
diff --git a/testing/web-platform/meta/service-workers/service-worker/navigation-timing.https.html.ini b/testing/web-platform/meta/service-workers/service-worker/navigation-timing.https.html.ini
index 9dfaab6687b5..eff21cdfcb61 100644
--- a/testing/web-platform/meta/service-workers/service-worker/navigation-timing.https.html.ini
+++ b/testing/web-platform/meta/service-workers/service-worker/navigation-timing.https.html.ini
@@ -1,3 +1,3 @@
 [navigation-timing.https.html]
   disabled:
-    if os == "android": https://bugzilla.mozilla.org/show_bug.cgi?id=1499972
+    if (os == "android"): https://bugzilla.mozilla.org/show_bug.cgi?id=1499972
diff --git a/testing/web-platform/meta/service-workers/service-worker/unregister-then-register.https.html.ini b/testing/web-platform/meta/service-workers/service-worker/unregister-then-register.https.html.ini
index 70ae1ee22886..c4b8caa375b9 100644
--- a/testing/web-platform/meta/service-workers/service-worker/unregister-then-register.https.html.ini
+++ b/testing/web-platform/meta/service-workers/service-worker/unregister-then-register.https.html.ini
@@ -1,3 +1,3 @@
 [unregister-then-register.https.html]
   disabled:
-    if os == "android": https://bugzilla.mozilla.org/show_bug.cgi?id=1499972
+    if (os == "android"): https://bugzilla.mozilla.org/show_bug.cgi?id=1499972
diff --git a/testing/web-platform/meta/service-workers/service-worker/unregister.https.html.ini b/testing/web-platform/meta/service-workers/service-worker/unregister.https.html.ini
index 29ad01b02916..7b2f1577c790 100644
--- a/testing/web-platform/meta/service-workers/service-worker/unregister.https.html.ini
+++ b/testing/web-platform/meta/service-workers/service-worker/unregister.https.html.ini
@@ -1,3 +1,3 @@
 [unregister.https.html]
   disabled:
-    if os == "android": https://bugzilla.mozilla.org/show_bug.cgi?id=1499972
+    if (os == "android"): https://bugzilla.mozilla.org/show_bug.cgi?id=1499972
diff --git a/testing/web-platform/meta/service-workers/service-worker/update-not-allowed.https.html.ini b/testing/web-platform/meta/service-workers/service-worker/update-not-allowed.https.html.ini
index b0c6f8b5c88b..5ca2b8386889 100644
--- a/testing/web-platform/meta/service-workers/service-worker/update-not-allowed.https.html.ini
+++ b/testing/web-platform/meta/service-workers/service-worker/update-not-allowed.https.html.ini
@@ -1,3 +1,3 @@
 [update-not-allowed.https.html]
   disabled:
-    if os == "android": https://bugzilla.mozilla.org/show_bug.cgi?id=1499972
+    if (os == "android"): https://bugzilla.mozilla.org/show_bug.cgi?id=1499972
diff --git a/testing/web-platform/meta/service-workers/service-worker/update-registration-with-type.https.html.ini b/testing/web-platform/meta/service-workers/service-worker/update-registration-with-type.https.html.ini
index f9c2ba483db5..1983a75432d6 100644
--- a/testing/web-platform/meta/service-workers/service-worker/update-registration-with-type.https.html.ini
+++ b/testing/web-platform/meta/service-workers/service-worker/update-registration-with-type.https.html.ini
@@ -1,6 +1,6 @@
 [update-registration-with-type.https.html]
   disabled:
-    if os == "android": https://bugzilla.mozilla.org/show_bug.cgi?id=1499972
+    if (os == "android"): https://bugzilla.mozilla.org/show_bug.cgi?id=1499972
   [Update the registration with a different script type (module => classic).]
     expected: FAIL
 
@@ -15,5 +15,5 @@
 
   [Does not update the registration with the same script type and the same main script.]
     expected:
-      if os == "android": FAIL
+      if (os == "android"): FAIL
 
diff --git a/testing/web-platform/meta/service-workers/service-worker/windowclient-navigate.https.html.ini b/testing/web-platform/meta/service-workers/service-worker/windowclient-navigate.https.html.ini
index 88dccc4b3eee..93dff14efa0e 100644
--- a/testing/web-platform/meta/service-workers/service-worker/windowclient-navigate.https.html.ini
+++ b/testing/web-platform/meta/service-workers/service-worker/windowclient-navigate.https.html.ini
@@ -10,26 +10,26 @@
 
   [invalid url (view-source://example.com)]
     expected:
-      if (os == "linux") and debug and not webrender and not e10s: "FAIL"
-      if os == "android": "FAIL"
+      if debug and not e10s and (os == "linux"): FAIL
+      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
 
   [invalid url (http://[example.com\])]
     expected:
-      if (os == "linux") and debug and not webrender and not e10s: "FAIL"
-      if os == "android": "FAIL"
+      if debug and not e10s and (os == "linux"): FAIL
+      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
 
   [invalid url (about:blank)]
     expected:
-      if (os == "linux") and debug and not webrender and not e10s: "FAIL"
-      if os == "android": "FAIL"
+      if debug and not e10s and (os == "linux"): FAIL
+      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
 
   [invalid url (file:///)]
     expected:
-      if (os == "linux") and debug and not webrender and not e10s: "FAIL"
-      if os == "android": "FAIL"
+      if debug and not e10s and (os == "linux"): FAIL
+      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
 
   [cross orgin url]
     expected:
-      if (os == "linux") and debug and not webrender and not e10s: "FAIL"
-      if os == "android": "FAIL"
+      if debug and not e10s and (os == "linux"): FAIL
+      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
 
diff --git a/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-navigation-cert_fetch_error-downgraded.tentative.html.ini b/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-navigation-cert_fetch_error-downgraded.tentative.html.ini
deleted file mode 100644
index f1bb207bcd7f..000000000000
--- a/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-navigation-cert_fetch_error-downgraded.tentative.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[sxg-reporting-navigation-cert_fetch_error-downgraded.tentative.html]
-  [SXG reporting test of sxg.failed downgraded from sxg.cert_fetch_error for navigation.]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-navigation-cert_fetch_error.tentative.html.ini b/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-navigation-cert_fetch_error.tentative.html.ini
deleted file mode 100644
index 1dc63e11eac8..000000000000
--- a/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-navigation-cert_fetch_error.tentative.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[sxg-reporting-navigation-cert_fetch_error.tentative.html]
-  [SXG reporting test of sxg.cert_fetch_error for navigation.]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-navigation-cert_parse_error-downgraded.tentative.html.ini b/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-navigation-cert_parse_error-downgraded.tentative.html.ini
deleted file mode 100644
index 341cbef31754..000000000000
--- a/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-navigation-cert_parse_error-downgraded.tentative.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[sxg-reporting-navigation-cert_parse_error-downgraded.tentative.html]
-  [SXG reporting test of sxg.failed downgraded from sxg.cert_parse_error for navigation.]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-navigation-cert_parse_error.tentative.html.ini b/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-navigation-cert_parse_error.tentative.html.ini
deleted file mode 100644
index d1297a41bac2..000000000000
--- a/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-navigation-cert_parse_error.tentative.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[sxg-reporting-navigation-cert_parse_error.tentative.html]
-  [SXG reporting test of sxg.cert_parse_error for navigation.]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-navigation-cert_verification_error-downgraded.tentative.html.ini b/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-navigation-cert_verification_error-downgraded.tentative.html.ini
deleted file mode 100644
index c99909fadbf9..000000000000
--- a/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-navigation-cert_verification_error-downgraded.tentative.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[sxg-reporting-navigation-cert_verification_error-downgraded.tentative.html]
-  [SXG reporting test of sxg.failed downgraded from sxg.cert_verification_error for navigation.]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-navigation-cert_verification_error.tentative.html.ini b/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-navigation-cert_verification_error.tentative.html.ini
deleted file mode 100644
index b63a631f70e3..000000000000
--- a/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-navigation-cert_verification_error.tentative.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[sxg-reporting-navigation-cert_verification_error.tentative.html]
-  [SXG reporting test of sxg.cert_verification_error for navigation.]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-navigation-failed-zero-success-fraction.tentative.html.ini b/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-navigation-failed-zero-success-fraction.tentative.html.ini
deleted file mode 100644
index a86bd8d7960a..000000000000
--- a/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-navigation-failed-zero-success-fraction.tentative.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[sxg-reporting-navigation-failed-zero-success-fraction.tentative.html]
-  [SXG error report must be downgraded when the cert URL is different from the reporting origin. And succeeded normal NEL report should not be sent  when success fraction is zero.]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-navigation-invalid_integrity_header.tentative.html.ini b/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-navigation-invalid_integrity_header.tentative.html.ini
deleted file mode 100644
index c5f57d1cc58e..000000000000
--- a/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-navigation-invalid_integrity_header.tentative.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[sxg-reporting-navigation-invalid_integrity_header.tentative.html]
-  [SXG reporting test of sxg.invalid_integrity_header for navigation.]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-navigation-mi_error.tentative.html.ini b/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-navigation-mi_error.tentative.html.ini
deleted file mode 100644
index 7b88d582050b..000000000000
--- a/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-navigation-mi_error.tentative.html.ini
+++ /dev/null
@@ -1,26 +0,0 @@
-[sxg-reporting-navigation-mi_error.tentative.html]
-  expected:
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): TIMEOUT
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): TIMEOUT
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): TIMEOUT
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): TIMEOUT
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): TIMEOUT
-  [SXG reporting test of sxg.mi_error for navigation.]
-    expected:
-      if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-      if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): TIMEOUT
-      if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-      if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-      if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): TIMEOUT
-      if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-      if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-      if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-      if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): FAIL
-      if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-      if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): FAIL
-      if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
-      if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): TIMEOUT
-      if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): TIMEOUT
-      if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): TIMEOUT
-
diff --git a/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-navigation-ok.tentative.html.ini b/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-navigation-ok.tentative.html.ini
deleted file mode 100644
index de27f24f1a6d..000000000000
--- a/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-navigation-ok.tentative.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[sxg-reporting-navigation-ok.tentative.html]
-  [SXG success report must be sent for navigation.]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-navigation-parse_error.tentative.html.ini b/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-navigation-parse_error.tentative.html.ini
deleted file mode 100644
index 772914cd4752..000000000000
--- a/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-navigation-parse_error.tentative.html.ini
+++ /dev/null
@@ -1,26 +0,0 @@
-[sxg-reporting-navigation-parse_error.tentative.html]
-  expected:
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): TIMEOUT
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): TIMEOUT
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): TIMEOUT
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): TIMEOUT
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): TIMEOUT
-  [SXG reporting test of sxg.parse_error for navigation.]
-    expected:
-      if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-      if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): TIMEOUT
-      if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-      if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-      if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): TIMEOUT
-      if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-      if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-      if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-      if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): FAIL
-      if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-      if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): FAIL
-      if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
-      if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): TIMEOUT
-      if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): TIMEOUT
-      if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): TIMEOUT
-
diff --git a/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-navigation-signature_verification_error-downgraded.tentative.html.ini b/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-navigation-signature_verification_error-downgraded.tentative.html.ini
deleted file mode 100644
index 686d692bec15..000000000000
--- a/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-navigation-signature_verification_error-downgraded.tentative.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[sxg-reporting-navigation-signature_verification_error-downgraded.tentative.html]
-  [SXG reporting test of sxg.failed downgraded from sxg.signature_verification_error for navigation.]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-navigation-signature_verification_error.tentative.html.ini b/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-navigation-signature_verification_error.tentative.html.ini
deleted file mode 100644
index 4c9c6610c750..000000000000
--- a/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-navigation-signature_verification_error.tentative.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[sxg-reporting-navigation-signature_verification_error.tentative.html]
-  [SXG reporting test of sxg.signature_verification_error for navigation.]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-prefetch-cert_fetch_error-downgraded.tentative.html.ini b/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-prefetch-cert_fetch_error-downgraded.tentative.html.ini
deleted file mode 100644
index 32755178ea30..000000000000
--- a/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-prefetch-cert_fetch_error-downgraded.tentative.html.ini
+++ /dev/null
@@ -1,26 +0,0 @@
-[sxg-reporting-prefetch-cert_fetch_error-downgraded.tentative.html]
-  expected:
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): TIMEOUT
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): TIMEOUT
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): TIMEOUT
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): TIMEOUT
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): TIMEOUT
-  [SXG reporting test of sxg.failed downgraded from sxg.cert_fetch_error for prefetch.]
-    expected:
-      if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-      if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): TIMEOUT
-      if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-      if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-      if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): TIMEOUT
-      if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-      if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-      if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-      if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): FAIL
-      if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-      if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): FAIL
-      if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
-      if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): TIMEOUT
-      if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): TIMEOUT
-      if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): TIMEOUT
-
diff --git a/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-prefetch-cert_fetch_error.tentative.html.ini b/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-prefetch-cert_fetch_error.tentative.html.ini
deleted file mode 100644
index 532501cf1171..000000000000
--- a/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-prefetch-cert_fetch_error.tentative.html.ini
+++ /dev/null
@@ -1,26 +0,0 @@
-[sxg-reporting-prefetch-cert_fetch_error.tentative.html]
-  expected:
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): TIMEOUT
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): TIMEOUT
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): TIMEOUT
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): TIMEOUT
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): TIMEOUT
-  [SXG reporting test of sxg.cert_fetch_error for prefetch.]
-    expected:
-      if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-      if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): TIMEOUT
-      if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-      if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-      if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): TIMEOUT
-      if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-      if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-      if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-      if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): FAIL
-      if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-      if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): FAIL
-      if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
-      if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): TIMEOUT
-      if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): TIMEOUT
-      if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): TIMEOUT
-
diff --git a/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-prefetch-cert_parse_error-downgraded.tentative.html.ini b/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-prefetch-cert_parse_error-downgraded.tentative.html.ini
deleted file mode 100644
index d277ccc7063b..000000000000
--- a/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-prefetch-cert_parse_error-downgraded.tentative.html.ini
+++ /dev/null
@@ -1,26 +0,0 @@
-[sxg-reporting-prefetch-cert_parse_error-downgraded.tentative.html]
-  expected:
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): TIMEOUT
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): TIMEOUT
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): TIMEOUT
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): TIMEOUT
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): TIMEOUT
-  [SXG reporting test of sxg.failed downgraded from sxg.cert_parse_error for prefetch.]
-    expected:
-      if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-      if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): TIMEOUT
-      if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-      if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-      if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): TIMEOUT
-      if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-      if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-      if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-      if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): FAIL
-      if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-      if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): FAIL
-      if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
-      if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): TIMEOUT
-      if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): TIMEOUT
-      if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): TIMEOUT
-
diff --git a/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-prefetch-cert_parse_error.tentative.html.ini b/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-prefetch-cert_parse_error.tentative.html.ini
deleted file mode 100644
index 45b1889c8212..000000000000
--- a/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-prefetch-cert_parse_error.tentative.html.ini
+++ /dev/null
@@ -1,26 +0,0 @@
-[sxg-reporting-prefetch-cert_parse_error.tentative.html]
-  expected:
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): TIMEOUT
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): TIMEOUT
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): TIMEOUT
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): TIMEOUT
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): TIMEOUT
-  [SXG reporting test of sxg.cert_parse_error for prefetch.]
-    expected:
-      if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-      if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): TIMEOUT
-      if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-      if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-      if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): TIMEOUT
-      if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-      if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-      if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-      if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): FAIL
-      if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-      if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): FAIL
-      if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
-      if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): TIMEOUT
-      if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): TIMEOUT
-      if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): TIMEOUT
-
diff --git a/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-prefetch-cert_verification_error-downgraded.tentative.html.ini b/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-prefetch-cert_verification_error-downgraded.tentative.html.ini
deleted file mode 100644
index ed5c084e3244..000000000000
--- a/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-prefetch-cert_verification_error-downgraded.tentative.html.ini
+++ /dev/null
@@ -1,26 +0,0 @@
-[sxg-reporting-prefetch-cert_verification_error-downgraded.tentative.html]
-  expected:
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): TIMEOUT
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): TIMEOUT
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): TIMEOUT
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): TIMEOUT
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): TIMEOUT
-  [SXG reporting test of sxg.failed downgraded from sxg.cert_verification_error for prefetch.]
-    expected:
-      if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-      if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): TIMEOUT
-      if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-      if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-      if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): TIMEOUT
-      if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-      if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-      if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-      if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): FAIL
-      if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-      if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): FAIL
-      if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
-      if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): TIMEOUT
-      if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): TIMEOUT
-      if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): TIMEOUT
-
diff --git a/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-prefetch-cert_verification_error.tentative.html.ini b/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-prefetch-cert_verification_error.tentative.html.ini
deleted file mode 100644
index bf17e7d0d2c8..000000000000
--- a/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-prefetch-cert_verification_error.tentative.html.ini
+++ /dev/null
@@ -1,26 +0,0 @@
-[sxg-reporting-prefetch-cert_verification_error.tentative.html]
-  expected:
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): TIMEOUT
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): TIMEOUT
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): TIMEOUT
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): TIMEOUT
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): TIMEOUT
-  [SXG reporting test of sxg.cert_verification_error for prefetch.]
-    expected:
-      if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-      if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): TIMEOUT
-      if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-      if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-      if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): TIMEOUT
-      if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-      if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-      if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-      if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): FAIL
-      if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-      if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): FAIL
-      if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
-      if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): TIMEOUT
-      if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): TIMEOUT
-      if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): TIMEOUT
-
diff --git a/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-prefetch-failed-zero-success-feaction.tentative.html.ini b/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-prefetch-failed-zero-success-feaction.tentative.html.ini
deleted file mode 100644
index 5228d6e7320b..000000000000
--- a/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-prefetch-failed-zero-success-feaction.tentative.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[sxg-reporting-prefetch-failed-zero-success-feaction.tentative.html]
-  [SXG error report must be downgraded when the cert URL is different from the reporting origin. And succeeded normal NEL report should not be sent  when success fraction is zero.]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-prefetch-invalid_integrity_header.tentative.html.ini b/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-prefetch-invalid_integrity_header.tentative.html.ini
deleted file mode 100644
index f71a0c9ef5ab..000000000000
--- a/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-prefetch-invalid_integrity_header.tentative.html.ini
+++ /dev/null
@@ -1,26 +0,0 @@
-[sxg-reporting-prefetch-invalid_integrity_header.tentative.html]
-  expected:
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): TIMEOUT
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): TIMEOUT
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): TIMEOUT
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): TIMEOUT
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): TIMEOUT
-  [SXG reporting test of sxg.invalid_integrity_header for prefetch.]
-    expected:
-      if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-      if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): TIMEOUT
-      if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-      if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-      if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): TIMEOUT
-      if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-      if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-      if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-      if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): FAIL
-      if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-      if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): FAIL
-      if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
-      if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): TIMEOUT
-      if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): TIMEOUT
-      if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): TIMEOUT
-
diff --git a/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-prefetch-mi_error.tentative.html.ini b/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-prefetch-mi_error.tentative.html.ini
deleted file mode 100644
index 0ebd48a2090d..000000000000
--- a/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-prefetch-mi_error.tentative.html.ini
+++ /dev/null
@@ -1,26 +0,0 @@
-[sxg-reporting-prefetch-mi_error.tentative.html]
-  expected:
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): TIMEOUT
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): TIMEOUT
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): TIMEOUT
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): TIMEOUT
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): TIMEOUT
-  [SXG reporting test of sxg.mi_error for prefetch.]
-    expected:
-      if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-      if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): TIMEOUT
-      if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-      if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-      if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): TIMEOUT
-      if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-      if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-      if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-      if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): FAIL
-      if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-      if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): FAIL
-      if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
-      if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): TIMEOUT
-      if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): TIMEOUT
-      if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): TIMEOUT
-
diff --git a/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-prefetch-ok.tentative.html.ini b/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-prefetch-ok.tentative.html.ini
deleted file mode 100644
index aeb621408e5b..000000000000
--- a/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-prefetch-ok.tentative.html.ini
+++ /dev/null
@@ -1,26 +0,0 @@
-[sxg-reporting-prefetch-ok.tentative.html]
-  expected:
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): TIMEOUT
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): TIMEOUT
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): TIMEOUT
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): TIMEOUT
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): TIMEOUT
-  [SXG success report must be sent for prefetching.]
-    expected:
-      if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): TIMEOUT
-      if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-      if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-      if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-      if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): TIMEOUT
-      if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-      if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-      if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-      if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): FAIL
-      if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-      if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): FAIL
-      if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
-      if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): TIMEOUT
-      if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): TIMEOUT
-      if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): TIMEOUT
-
diff --git a/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-prefetch-parse_error.tentative.html.ini b/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-prefetch-parse_error.tentative.html.ini
deleted file mode 100644
index 4b21e6020a18..000000000000
--- a/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-prefetch-parse_error.tentative.html.ini
+++ /dev/null
@@ -1,26 +0,0 @@
-[sxg-reporting-prefetch-parse_error.tentative.html]
-  expected:
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): TIMEOUT
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): TIMEOUT
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): TIMEOUT
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): TIMEOUT
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): TIMEOUT
-  [SXG reporting test of sxg.parse_error for prefetch.]
-    expected:
-      if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-      if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): TIMEOUT
-      if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-      if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-      if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): TIMEOUT
-      if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-      if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-      if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-      if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): FAIL
-      if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-      if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): FAIL
-      if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
-      if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): TIMEOUT
-      if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): TIMEOUT
-      if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): TIMEOUT
-
diff --git a/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-prefetch-signature_verification_error-downgraded.tentative.html.ini b/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-prefetch-signature_verification_error-downgraded.tentative.html.ini
deleted file mode 100644
index 7c1fd4b99a4f..000000000000
--- a/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-prefetch-signature_verification_error-downgraded.tentative.html.ini
+++ /dev/null
@@ -1,26 +0,0 @@
-[sxg-reporting-prefetch-signature_verification_error-downgraded.tentative.html]
-  expected:
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): TIMEOUT
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): TIMEOUT
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): TIMEOUT
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): TIMEOUT
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): TIMEOUT
-  [SXG reporting test of sxg.failed downgraded from sxg.signature_verification_error for prefetch.]
-    expected:
-      if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-      if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): TIMEOUT
-      if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-      if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-      if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): TIMEOUT
-      if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-      if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-      if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-      if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): FAIL
-      if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-      if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): FAIL
-      if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
-      if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): TIMEOUT
-      if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): TIMEOUT
-      if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): TIMEOUT
-
diff --git a/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-prefetch-signature_verification_error.tentative.html.ini b/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-prefetch-signature_verification_error.tentative.html.ini
deleted file mode 100644
index 3d8f7d6b3e0d..000000000000
--- a/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-prefetch-signature_verification_error.tentative.html.ini
+++ /dev/null
@@ -1,26 +0,0 @@
-[sxg-reporting-prefetch-signature_verification_error.tentative.html]
-  expected:
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): TIMEOUT
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): TIMEOUT
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): TIMEOUT
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): TIMEOUT
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): TIMEOUT
-  [SXG reporting test of sxg.signature_verification_error for prefetch.]
-    expected:
-      if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-      if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): TIMEOUT
-      if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-      if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-      if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): TIMEOUT
-      if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-      if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-      if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-      if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): FAIL
-      if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-      if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): FAIL
-      if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
-      if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): TIMEOUT
-      if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): TIMEOUT
-      if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): TIMEOUT
-
diff --git a/testing/web-platform/meta/signed-exchange/sxg-prefetch-merkle-integrity-error.tentative.html.ini b/testing/web-platform/meta/signed-exchange/sxg-prefetch-merkle-integrity-error.tentative.html.ini
deleted file mode 100644
index 245f08d04d4f..000000000000
--- a/testing/web-platform/meta/signed-exchange/sxg-prefetch-merkle-integrity-error.tentative.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[sxg-prefetch-merkle-integrity-error.tentative.html]
-  [Prefetching SignedHTTPExchange with payload integrity error should fail]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/svg/extensibility/foreignObject/position-svg-root-in-foreign-object.html.ini b/testing/web-platform/meta/svg/extensibility/foreignObject/position-svg-root-in-foreign-object.html.ini
index 7d5c6ca98ead..123cab1542f2 100644
--- a/testing/web-platform/meta/svg/extensibility/foreignObject/position-svg-root-in-foreign-object.html.ini
+++ b/testing/web-platform/meta/svg/extensibility/foreignObject/position-svg-root-in-foreign-object.html.ini
@@ -1,3 +1,3 @@
 [position-svg-root-in-foreign-object.html]
   expected:
-    if os == "win": FAIL
+    if (os == "win"): FAIL
diff --git a/testing/web-platform/meta/svg/geometry/parsing/ry-valid.svg.ini b/testing/web-platform/meta/svg/geometry/parsing/ry-valid.svg.ini
index 89f5671cddc7..34e80e1b1c18 100644
--- a/testing/web-platform/meta/svg/geometry/parsing/ry-valid.svg.ini
+++ b/testing/web-platform/meta/svg/geometry/parsing/ry-valid.svg.ini
@@ -17,21 +17,3 @@
   [e.style['rx'\] = "5vh" should set the property value]
     expected: FAIL
 
-  [e.style['ry'\] = "auto" should set the property value]
-    expected: FAIL
-
-  [e.style['ry'\] = "0" should set the property value]
-    expected: FAIL
-
-  [e.style['ry'\] = "calc(2em + 3ex)" should set the property value]
-    expected: FAIL
-
-  [e.style['ry'\] = "4%" should set the property value]
-    expected: FAIL
-
-  [e.style['ry'\] = "1px" should set the property value]
-    expected: FAIL
-
-  [e.style['ry'\] = "5vh" should set the property value]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/svg/geometry/svg-image-intrinsic-size-with-cssstyle-auto-dynamic-image-change.html.ini b/testing/web-platform/meta/svg/geometry/svg-image-intrinsic-size-with-cssstyle-auto-dynamic-image-change.html.ini
deleted file mode 100644
index bf5f3e7f36f0..000000000000
--- a/testing/web-platform/meta/svg/geometry/svg-image-intrinsic-size-with-cssstyle-auto-dynamic-image-change.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[svg-image-intrinsic-size-with-cssstyle-auto-dynamic-image-change.html]
-  [Test <svg:image>'s sizing with css size as auto, with dynamic image change]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/svg/geometry/svg-image-intrinsic-size-with-cssstyle-auto.html.ini b/testing/web-platform/meta/svg/geometry/svg-image-intrinsic-size-with-cssstyle-auto.html.ini
deleted file mode 100644
index 1c424718b5ca..000000000000
--- a/testing/web-platform/meta/svg/geometry/svg-image-intrinsic-size-with-cssstyle-auto.html.ini
+++ /dev/null
@@ -1,73 +0,0 @@
-[svg-image-intrinsic-size-with-cssstyle-auto.html]
-  [<svg:image> 'auto' sizing with 200x100 svg image viewBox='0 0 400 100', attributes width='60' height='60' and CSS 'height:auto']
-    expected: FAIL
-
-  [<svg:image> 'auto' sizing with default sized svg image viewBox='0 0 400 100', attributes width='60' height='60' and CSS 'width:auto']
-    expected: FAIL
-
-  [<svg:image> 'auto' sizing with default sized svg image, attributes width='200' and CSS 'width:auto; height:auto']
-    expected: FAIL
-
-  [<svg:image> 'auto' sizing with 200x100 svg image, attributes width='50' height='50' and CSS 'width:auto; height:auto']
-    expected: FAIL
-
-  [<svg:image> 'auto' sizing with 256x256 png image, attributes width='64' height='128' and CSS 'height:auto']
-    expected: FAIL
-
-  [<svg:image> 'auto' sizing with default sized svg image, without attributes width and height, no css width/height specified]
-    expected: FAIL
-
-  [<svg:image> 'auto' sizing with 200x100 svg image, without attributes width and height and CSS 'width:auto']
-    expected: FAIL
-
-  [<svg:image> 'auto' sizing with svg image height='100' viewBox='0 0 400 100', attributes width='60' height='60' and CSS 'height:auto']
-    expected: FAIL
-
-  [<svg:image> 'auto' sizing with svg image width='200' viewBox='0 0 400 100', attributes width='60' height='60' and CSS 'width:auto; height:auto']
-    expected: FAIL
-
-  [<svg:image> 'auto' sizing with svg image height='100' viewBox='0 0 400 100', attributes width='60' height='60' and CSS 'width:auto; height:auto']
-    expected: FAIL
-
-  [<svg:image> 'auto' sizing with 256x256 png image, attributes width='64' height='64' and CSS 'width:auto; height:auto']
-    expected: FAIL
-
-  [<svg:image> 'auto' sizing with 200x100 svg image viewBox='0 0 400 100', attributes width='60' height='60' and CSS 'width:auto; height:auto']
-    expected: FAIL
-
-  [<svg:image> 'auto' sizing with default sized svg image, attributes height='200' and CSS 'width:auto; height:auto']
-    expected: FAIL
-
-  [<svg:image> 'auto' sizing with svg image width='200' viewBox='0 0 400 100', attributes width='60' height='60' and CSS 'width:auto']
-    expected: FAIL
-
-  [<svg:image> 'auto' sizing with svg image width='200' viewBox='0 0 400 100', attributes width='60' height='60' and CSS 'height:auto']
-    expected: FAIL
-
-  [<svg:image> 'auto' sizing with 200x100 svg image, attributes width='50' height='50' and CSS 'width:auto']
-    expected: FAIL
-
-  [<svg:image> 'auto' sizing with svg image height='100' viewBox='0 0 400 100', attributes width='60' height='60' and CSS 'width:auto']
-    expected: FAIL
-
-  [<svg:image> 'auto' sizing with default sized svg image, attributes width='200' height='200' and CSS 'width:auto; height:auto']
-    expected: FAIL
-
-  [<svg:image> 'auto' sizing with 200x100 svg image viewBox='0 0 400 100', attributes width='60' height='60' and CSS 'width:auto']
-    expected: FAIL
-
-  [<svg:image> 'auto' sizing with default sized svg image viewBox='0 0 400 100', attributes width='60' height='60' and CSS 'height:auto']
-    expected: FAIL
-
-  [<svg:image> 'auto' sizing with 200x100 svg image, attributes width='50' and CSS height:auto]
-    expected: FAIL
-
-  [<svg:image> 'auto' sizing with 256x256 png image, attributes width='128' height='64' and CSS 'width:auto']
-    expected: FAIL
-
-  [<svg:image> 'auto' sizing with 200x100 svg image, attributes height='50' and 'width:auto']
-    expected: FAIL
-
-  [<svg:image> 'auto' sizing with default sized svg image viewBox='0 0 400 100', attributes width='60' height='60' and CSS 'width:auto; height:auto']
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/svg/painting/reftests/markers-orient-001.svg.ini b/testing/web-platform/meta/svg/painting/reftests/markers-orient-001.svg.ini
deleted file mode 100644
index 4086e340e45b..000000000000
--- a/testing/web-platform/meta/svg/painting/reftests/markers-orient-001.svg.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[markers-orient-001.svg]
-  expected:
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/svg/path/bearing/absolute.svg.ini b/testing/web-platform/meta/svg/path/bearing/absolute.svg.ini
index 9ed8a88f3a0a..d05b386eb121 100644
--- a/testing/web-platform/meta/svg/path/bearing/absolute.svg.ini
+++ b/testing/web-platform/meta/svg/path/bearing/absolute.svg.ini
@@ -1,12 +1,7 @@
 [absolute.svg]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
+    if e10s and (os == "linux"): FAIL
     if debug and not e10s and (os == "linux"): FAIL
-    if os == "win": FAIL
-    if os == "android": FAIL
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if (os == "win"): FAIL
+    if (os == "android"): FAIL
diff --git a/testing/web-platform/meta/svg/path/bearing/relative.svg.ini b/testing/web-platform/meta/svg/path/bearing/relative.svg.ini
index 181640bd0896..fc684a7994f9 100644
--- a/testing/web-platform/meta/svg/path/bearing/relative.svg.ini
+++ b/testing/web-platform/meta/svg/path/bearing/relative.svg.ini
@@ -1,12 +1,7 @@
 [relative.svg]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
+    if e10s and (os == "linux"): FAIL
     if debug and not e10s and (os == "linux"): FAIL
-    if os == "win": FAIL
-    if os == "android": FAIL
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if (os == "win"): FAIL
+    if (os == "android"): FAIL
diff --git a/testing/web-platform/meta/svg/pservers/reftests/meshgradient-basic-001.svg.ini b/testing/web-platform/meta/svg/pservers/reftests/meshgradient-basic-001.svg.ini
index 90fc3631b7d4..64f10c3a61f2 100644
--- a/testing/web-platform/meta/svg/pservers/reftests/meshgradient-basic-001.svg.ini
+++ b/testing/web-platform/meta/svg/pservers/reftests/meshgradient-basic-001.svg.ini
@@ -1,10 +1,8 @@
 [meshgradient-basic-001.svg]
   expected:
-    if os == "mac": FAIL
-    if os == "win": FAIL
-    if os == "android": FAIL
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    FAIL
+    if debug and (os == "linux") and (processor == "x86"): FAIL
+    if e10s and (os == "linux") and (processor == "x86_64"): FAIL
+    if (os == "mac"): FAIL
+    if not debug and e10s and (os == "linux") and (processor == "x86"): FAIL
+    if (os == "win"): FAIL
+    if (os == "android"): FAIL
diff --git a/testing/web-platform/meta/svg/pservers/reftests/meshgradient-basic-002.svg.ini b/testing/web-platform/meta/svg/pservers/reftests/meshgradient-basic-002.svg.ini
index 54ecdc790df9..8083bbc21019 100644
--- a/testing/web-platform/meta/svg/pservers/reftests/meshgradient-basic-002.svg.ini
+++ b/testing/web-platform/meta/svg/pservers/reftests/meshgradient-basic-002.svg.ini
@@ -1,11 +1,8 @@
 [meshgradient-basic-002.svg]
   expected:
     if debug and (os == "linux") and (processor == "x86"): FAIL
-    if os == "mac": FAIL
-    if os == "win": FAIL
-    if os == "android": FAIL
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if e10s and (os == "linux") and (processor == "x86_64"): FAIL
+    if (os == "mac"): FAIL
+    if not debug and e10s and (os == "linux") and (processor == "x86"): FAIL
+    if (os == "win"): FAIL
+    if (os == "android"): FAIL
diff --git a/testing/web-platform/meta/svg/pservers/reftests/meshgradient-basic-003.svg.ini b/testing/web-platform/meta/svg/pservers/reftests/meshgradient-basic-003.svg.ini
index 10b22b8f7d22..f897d7f56bc4 100644
--- a/testing/web-platform/meta/svg/pservers/reftests/meshgradient-basic-003.svg.ini
+++ b/testing/web-platform/meta/svg/pservers/reftests/meshgradient-basic-003.svg.ini
@@ -1,11 +1,8 @@
 [meshgradient-basic-003.svg]
   expected:
     if debug and (os == "linux") and (processor == "x86"): FAIL
-    if os == "mac": FAIL
-    if os == "win": FAIL
-    if os == "android": FAIL
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    FAIL
+    if e10s and (os == "linux") and (processor == "x86_64"): FAIL
+    if (os == "mac"): FAIL
+    if not debug and e10s and (os == "linux") and (processor == "x86"): FAIL
+    if (os == "win"): FAIL
+    if (os == "android"): FAIL
diff --git a/testing/web-platform/meta/svg/pservers/reftests/meshgradient-basic-004.svg.ini b/testing/web-platform/meta/svg/pservers/reftests/meshgradient-basic-004.svg.ini
index af9af7cecfa4..41aa3d3dfc7a 100644
--- a/testing/web-platform/meta/svg/pservers/reftests/meshgradient-basic-004.svg.ini
+++ b/testing/web-platform/meta/svg/pservers/reftests/meshgradient-basic-004.svg.ini
@@ -1,11 +1,8 @@
 [meshgradient-basic-004.svg]
   expected:
     if debug and (os == "linux") and (processor == "x86"): FAIL
-    if os == "mac": FAIL
-    if os == "win": FAIL
-    if os == "android": FAIL
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if e10s and (os == "linux") and (processor == "x86_64"): FAIL
+    if (os == "mac"): FAIL
+    if not debug and e10s and (os == "linux") and (processor == "x86"): FAIL
+    if (os == "win"): FAIL
+    if (os == "android"): FAIL
diff --git a/testing/web-platform/meta/svg/pservers/reftests/meshgradient-basic-005.svg.ini b/testing/web-platform/meta/svg/pservers/reftests/meshgradient-basic-005.svg.ini
index dee124785e6d..b363916bd2ff 100644
--- a/testing/web-platform/meta/svg/pservers/reftests/meshgradient-basic-005.svg.ini
+++ b/testing/web-platform/meta/svg/pservers/reftests/meshgradient-basic-005.svg.ini
@@ -1,11 +1,8 @@
 [meshgradient-basic-005.svg]
   expected:
     if debug and (os == "linux") and (processor == "x86"): FAIL
-    if os == "mac": FAIL
-    if os == "win": FAIL
-    if os == "android": FAIL
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    FAIL
+    if e10s and (os == "linux") and (processor == "x86_64"): FAIL
+    if (os == "mac"): FAIL
+    if not debug and e10s and (os == "linux") and (processor == "x86"): FAIL
+    if (os == "win"): FAIL
+    if (os == "android"): FAIL
diff --git a/testing/web-platform/meta/svg/pservers/reftests/meshgradient-bicubic-001.svg.ini b/testing/web-platform/meta/svg/pservers/reftests/meshgradient-bicubic-001.svg.ini
index 819b64c3e77a..7c7f189768c5 100644
--- a/testing/web-platform/meta/svg/pservers/reftests/meshgradient-bicubic-001.svg.ini
+++ b/testing/web-platform/meta/svg/pservers/reftests/meshgradient-bicubic-001.svg.ini
@@ -1,11 +1,8 @@
 [meshgradient-bicubic-001.svg]
   expected:
     if debug and (os == "linux") and (processor == "x86"): FAIL
-    if os == "mac": FAIL
+    if e10s and (os == "linux") and (processor == "x86_64"): FAIL
+    if (os == "mac"): FAIL
     if not debug and e10s and (os == "linux") and (processor == "x86"): FAIL
-    if os == "win": FAIL
-    if os == "android": FAIL
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if (os == "win"): FAIL
+    if (os == "android"): FAIL
diff --git a/testing/web-platform/meta/svg/pservers/reftests/meshgradient-complex-001.svg.ini b/testing/web-platform/meta/svg/pservers/reftests/meshgradient-complex-001.svg.ini
index 90cf87700f5d..5111e2d3aa64 100644
--- a/testing/web-platform/meta/svg/pservers/reftests/meshgradient-complex-001.svg.ini
+++ b/testing/web-platform/meta/svg/pservers/reftests/meshgradient-complex-001.svg.ini
@@ -1,12 +1,9 @@
 [meshgradient-complex-001.svg]
   expected:
     if debug and (os == "linux") and (processor == "x86"): FAIL
-    if os == "mac": FAIL
+    if e10s and (os == "linux") and (processor == "x86_64"): FAIL
+    if (os == "mac"): FAIL
     if not debug and e10s and (os == "linux") and (processor == "x86"): FAIL
-    if os == "win": FAIL
-    if os == "android": FAIL
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if (os == "win"): FAIL
+    if (os == "android"): FAIL
   restart-after: true
diff --git a/testing/web-platform/meta/svg/render/reftests/blending-002.svg.ini b/testing/web-platform/meta/svg/render/reftests/blending-002.svg.ini
index 4b80a48d0dc3..e81b33b2e38b 100644
--- a/testing/web-platform/meta/svg/render/reftests/blending-002.svg.ini
+++ b/testing/web-platform/meta/svg/render/reftests/blending-002.svg.ini
@@ -1,4 +1,5 @@
 [blending-002.svg]
   expected:
+    if (os == "win") and (version == "6.1.7601"): PASS
     if webrender and (os == "linux"): FAIL
     if webrender and (os == "win"): FAIL
diff --git a/testing/web-platform/meta/svg/shapes/reftests/pathlength-001.svg.ini b/testing/web-platform/meta/svg/shapes/reftests/pathlength-001.svg.ini
index 8b216df776ca..701309d9df5d 100644
--- a/testing/web-platform/meta/svg/shapes/reftests/pathlength-001.svg.ini
+++ b/testing/web-platform/meta/svg/shapes/reftests/pathlength-001.svg.ini
@@ -1,7 +1,3 @@
 [pathlength-001.svg]
   expected:
-    if os == "android": FAIL
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): FAIL
+    if (os == "android"): FAIL
diff --git a/testing/web-platform/meta/trusted-types/trusted-types-report-only.tentative.https.html.ini b/testing/web-platform/meta/trusted-types/trusted-types-report-only.tentative.https.html.ini
deleted file mode 100644
index e871cfdccf27..000000000000
--- a/testing/web-platform/meta/trusted-types/trusted-types-report-only.tentative.https.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[trusted-types-report-only.tentative.https.html]
-  [trusted-types-report-only]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/trusted-types/trusted-types-reporting-check-report.https.html.ini b/testing/web-platform/meta/trusted-types/trusted-types-reporting-check-report.https.html.ini
deleted file mode 100644
index f6b22175bb57..000000000000
--- a/testing/web-platform/meta/trusted-types/trusted-types-reporting-check-report.https.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[trusted-types-reporting-check-report.https.html]
-  [Check Trusted Type violation reports]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/trusted-types/trusted-types-reporting.tentative.https.html.ini b/testing/web-platform/meta/trusted-types/trusted-types-reporting.tentative.https.html.ini
deleted file mode 100644
index d563fbafb66b..000000000000
--- a/testing/web-platform/meta/trusted-types/trusted-types-reporting.tentative.https.html.ini
+++ /dev/null
@@ -1,26 +0,0 @@
-[trusted-types-reporting.tentative.https.html]
-  expected: TIMEOUT
-  [Trusted Type violation report: assign trusted HTML to html; no report]
-    expected: NOTRUN
-
-  [Trusted Type violation report: creating a forbidden policy.]
-    expected: TIMEOUT
-
-  [By now, the "one" policy should have been created.]
-    expected: NOTRUN
-
-  [Trusted Type violation report: creating a forbidden-but-not-reported policy.]
-    expected: NOTRUN
-
-  [Trusted Type violation report: assign trusted URL to url; no report]
-    expected: NOTRUN
-
-  [Trusted Type violation report: creating a report-only-forbidden policy.]
-    expected: NOTRUN
-
-  [Trusted Type violation report: assign string to html]
-    expected: NOTRUN
-
-  [Trusted Type violation report: assign string to url]
-    expected: NOTRUN
-
diff --git a/testing/web-platform/meta/wasm/jsapi/constructor/instantiate.any.js.ini b/testing/web-platform/meta/wasm/jsapi/constructor/instantiate.any.js.ini
index f1201aeb8c3f..f8eeebdbe572 100644
--- a/testing/web-platform/meta/wasm/jsapi/constructor/instantiate.any.js.ini
+++ b/testing/web-platform/meta/wasm/jsapi/constructor/instantiate.any.js.ini
@@ -1,6 +1,30 @@
 [instantiate.any.html]
+  [exports and imports: Module argument]
+    expected: FAIL
+
+  [No imports: Module argument]
+    expected: FAIL
+
+  [exports and imports: BufferSource argument]
+    expected: FAIL
+
+  [No imports: BufferSource argument]
+    expected: FAIL
+
 
 [instantiate.any.worker.html]
+  [exports and imports: Module argument]
+    expected: FAIL
+
+  [No imports: Module argument]
+    expected: FAIL
+
+  [exports and imports: BufferSource argument]
+    expected: FAIL
+
+  [No imports: BufferSource argument]
+    expected: FAIL
+
 
 [instantiate.any.js]
   [exports and imports: Module argument]
diff --git a/testing/web-platform/meta/wasm/jsapi/instance/constructor.any.js.ini b/testing/web-platform/meta/wasm/jsapi/instance/constructor.any.js.ini
index 9cefb44b5c38..c81379d601db 100644
--- a/testing/web-platform/meta/wasm/jsapi/instance/constructor.any.js.ini
+++ b/testing/web-platform/meta/wasm/jsapi/instance/constructor.any.js.ini
@@ -1,6 +1,18 @@
 [constructor.any.html]
+  [exports and imports]
+    expected: FAIL
+
+  [No imports]
+    expected: FAIL
+
 
 [constructor.any.worker.html]
+  [exports and imports]
+    expected: FAIL
+
+  [No imports]
+    expected: FAIL
+
 
 [constructor.any.js]
   [exports and imports]
diff --git a/testing/web-platform/meta/wasm/jsapi/memory/constructor.any.js.ini b/testing/web-platform/meta/wasm/jsapi/memory/constructor.any.js.ini
deleted file mode 100644
index aa60309343c3..000000000000
--- a/testing/web-platform/meta/wasm/jsapi/memory/constructor.any.js.ini
+++ /dev/null
@@ -1,15 +0,0 @@
-[constructor.any.worker.html]
-  [Order of evaluation for descriptor (with shared)]
-    expected: FAIL
-
-  [Shared memory]
-    expected: FAIL
-
-
-[constructor.any.html]
-  [Order of evaluation for descriptor (with shared)]
-    expected: FAIL
-
-  [Shared memory]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/wasm/jsapi/memory/grow.any.js.ini b/testing/web-platform/meta/wasm/jsapi/memory/grow.any.js.ini
deleted file mode 100644
index d1dab31df880..000000000000
--- a/testing/web-platform/meta/wasm/jsapi/memory/grow.any.js.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[grow.any.worker.html]
-  [Growing shared memory does not detach old buffer]
-    expected: FAIL
-
-
-[grow.any.html]
-  [Growing shared memory does not detach old buffer]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/wasm/jsapi/module/customSections.any.js.ini b/testing/web-platform/meta/wasm/jsapi/module/customSections.any.js.ini
deleted file mode 100644
index 13b03d06e582..000000000000
--- a/testing/web-platform/meta/wasm/jsapi/module/customSections.any.js.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[customSections.any.html]
-  [Custom sections with U+FFFD]
-    expected: FAIL
-
-
-[customSections.any.worker.html]
-  [Custom sections with U+FFFD]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/wasm/jsapi/module/exports.any.js.ini b/testing/web-platform/meta/wasm/jsapi/module/exports.any.js.ini
index 956dd5f49371..76076c2f167e 100644
--- a/testing/web-platform/meta/wasm/jsapi/module/exports.any.js.ini
+++ b/testing/web-platform/meta/wasm/jsapi/module/exports.any.js.ini
@@ -1,6 +1,12 @@
 [exports.any.html]
+  [exports]
+    expected: FAIL
+
 
 [exports.any.worker.html]
+  [exports]
+    expected: FAIL
+
 
 [exports.any.js]
   [exports]
diff --git a/testing/web-platform/meta/wasm/jsapi/table/get-set.any.js.ini b/testing/web-platform/meta/wasm/jsapi/table/get-set.any.js.ini
index 8e47809cd5ae..d9355cad5e8e 100644
--- a/testing/web-platform/meta/wasm/jsapi/table/get-set.any.js.ini
+++ b/testing/web-platform/meta/wasm/jsapi/table/get-set.any.js.ini
@@ -1,6 +1,32 @@
 [get-set.any.worker.html]
+  expected: ERROR
+  [Basic]
+    expected: FAIL
+
+  [Setting out-of-bounds]
+    expected: FAIL
+
+  [Growing]
+    expected: FAIL
+
+  [Stray argument]
+    expected: FAIL
+
 
 [get-set.any.html]
+  expected: ERROR
+  [Basic]
+    expected: FAIL
+
+  [Setting out-of-bounds]
+    expected: FAIL
+
+  [Growing]
+    expected: FAIL
+
+  [Stray argument]
+    expected: FAIL
+
 
 [get-set.any.js]
   expected: ERROR
diff --git a/testing/web-platform/meta/wasm/jsapi/table/grow-reftypes.tentative.any.js.ini b/testing/web-platform/meta/wasm/jsapi/table/grow-reftypes.tentative.any.js.ini
index 03d97d8faed1..88e5f6434aff 100644
--- a/testing/web-platform/meta/wasm/jsapi/table/grow-reftypes.tentative.any.js.ini
+++ b/testing/web-platform/meta/wasm/jsapi/table/grow-reftypes.tentative.any.js.ini
@@ -11,7 +11,6 @@
     expected:
       if release_or_beta: FAIL
 
-
 [grow.reftypes-tentative.any.html]
   [Grow with exported-function argument]
     expected:
@@ -25,7 +24,6 @@
     expected:
       if release_or_beta: FAIL
 
-
 [grow.reftypes-tentative.any.worker.html]
   [Grow with exported-function argument]
     expected:
@@ -38,14 +36,3 @@
   [Grow with JS-function argument]
     expected:
       if release_or_beta: FAIL
-
-
-[grow-reftypes.tentative.any.worker.html]
-  [Grow with exported-function argument]
-    expected: FAIL
-
-
-[grow-reftypes.tentative.any.html]
-  [Grow with exported-function argument]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/wasm/webapi/instantiateStreaming.any.js.ini b/testing/web-platform/meta/wasm/webapi/instantiateStreaming.any.js.ini
new file mode 100644
index 000000000000..bc74866cd100
--- /dev/null
+++ b/testing/web-platform/meta/wasm/webapi/instantiateStreaming.any.js.ini
@@ -0,0 +1,31 @@
+[instantiateStreaming.any.html]
+  [exports and imports]
+    expected: FAIL
+
+  [No imports]
+    expected: FAIL
+
+
+[instantiateStreaming.any.serviceworker.html]
+  [exports and imports]
+    expected: FAIL
+
+  [No imports]
+    expected: FAIL
+
+
+[instantiateStreaming.any.sharedworker.html]
+  [exports and imports]
+    expected: FAIL
+
+  [No imports]
+    expected: FAIL
+
+
+[instantiateStreaming.any.worker.html]
+  [exports and imports]
+    expected: FAIL
+
+  [No imports]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/web-nfc/idlharness.https.window.js.ini b/testing/web-platform/meta/web-nfc/idlharness.https.window.js.ini
index 24aa00bf1cc4..3432bcf6fb07 100644
--- a/testing/web-platform/meta/web-nfc/idlharness.https.window.js.ini
+++ b/testing/web-platform/meta/web-nfc/idlharness.https.window.js.ini
@@ -170,6 +170,3 @@
   [NFCErrorEvent interface object length]
     expected: FAIL
 
-  [NFCWriter interface: operation push(NDEFMessageSource, NFCPushOptions)]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/webaudio/idlharness.https.window.js.ini b/testing/web-platform/meta/webaudio/idlharness.https.window.js.ini
index 2d3c5d7c0f16..440fa3d72aec 100644
--- a/testing/web-platform/meta/webaudio/idlharness.https.window.js.ini
+++ b/testing/web-platform/meta/webaudio/idlharness.https.window.js.ini
@@ -1,10 +1,25 @@
 [idlharness.https.window.html]
+  [AudioNode interface: worklet_node must inherit property "numberOfOutputs" with the proper type]
+    expected: FAIL
+
   [AudioListener interface: context.listener must inherit property "upZ" with the proper type]
     expected: FAIL
 
   [AudioProcessingEvent interface: new AudioProcessingEvent('', {\n        playbackTime: 0, inputBuffer: buffer, outputBuffer: buffer\n      }) must inherit property "outputBuffer" with the proper type]
     expected: FAIL
 
+  [AudioWorkletNode interface: worklet_node must inherit property "port" with the proper type]
+    expected: FAIL
+
+  [AudioWorkletNode interface: worklet_node must inherit property "onprocessorerror" with the proper type]
+    expected: FAIL
+
+  [AudioNode interface: worklet_node must inherit property "disconnect(AudioParam, unsigned long)" with the proper type]
+    expected: FAIL
+
+  [Stringification of context.audioWorklet]
+    expected: FAIL
+
   [AudioListener interface: attribute forwardZ]
     expected: FAIL
 
@@ -14,15 +29,33 @@
   [AudioListener interface: attribute forwardX]
     expected: FAIL
 
+  [AudioWorkletNode interface: attribute onprocessorerror]
+    expected: FAIL
+
   [MediaStreamAudioSourceNode interface: attribute mediaStream]
     expected: FAIL
 
+  [AudioNode interface: worklet_node must inherit property "channelInterpretation" with the proper type]
+    expected: FAIL
+
+  [AudioWorkletNode interface object name]
+    expected: FAIL
+
+  [AudioWorkletNode interface: existence and properties of interface object]
+    expected: FAIL
+
+  [Stringification of worklet_node]
+    expected: FAIL
+
   [AudioParam interface: calling cancelAndHoldAtTime(double) on new AudioBufferSourceNode(context).playbackRate with too few arguments must throw TypeError]
     expected: FAIL
 
   [AudioContext interface: context must inherit property "getOutputTimestamp()" with the proper type]
     expected: FAIL
 
+  [AudioNode interface: calling disconnect(unsigned long) on worklet_node with too few arguments must throw TypeError]
+    expected: FAIL
+
   [AudioListener interface: context.listener must inherit property "forwardX" with the proper type]
     expected: FAIL
 
@@ -44,171 +77,33 @@
   [AudioListener interface: context.listener must inherit property "positionY" with the proper type]
     expected: FAIL
 
-  [MediaElementAudioSourceNode interface: new MediaElementAudioSourceNode(context, {mediaElement: new Audio}) must inherit property "mediaElement" with the proper type]
-    expected: FAIL
-
-  [MediaStreamTrackAudioSourceNode interface: existence and properties of interface prototype object's @@unscopables property]
-    expected: FAIL
-
-  [AudioContext interface: operation getOutputTimestamp()]
-    expected: FAIL
-
-  [AudioContext interface: operation createMediaStreamTrackSource(MediaStreamTrack)]
-    expected: FAIL
-
-  [Stringification of new AudioProcessingEvent('', {\n        playbackTime: 0, inputBuffer: buffer, outputBuffer: buffer\n      })]
-    expected: FAIL
-
-  [OfflineAudioContext interface: new OfflineAudioContext(1, 1, sample_rate) must inherit property "suspend(double)" with the proper type]
-    expected: FAIL
-
-  [MediaStreamTrackAudioSourceNode interface object length]
-    expected: FAIL
-
-  [AudioParam interface: operation cancelAndHoldAtTime(double)]
-    expected: FAIL
-
-  [AudioParam interface: new AudioBufferSourceNode(context).playbackRate must inherit property "automationRate" with the proper type]
-    expected: FAIL
-
-  [AudioListener interface: context.listener must inherit property "upY" with the proper type]
-    expected: FAIL
-
-  [AudioParam interface: attribute automationRate]
-    expected: FAIL
-
-  [OfflineAudioContext interface: calling suspend(double) on new OfflineAudioContext(1, 1, sample_rate) with too few arguments must throw TypeError]
-    expected: FAIL
-
-  [AudioProcessingEvent interface object length]
-    expected: FAIL
-
-  [AudioListener interface: context.listener must inherit property "forwardY" with the proper type]
-    expected: FAIL
-
-  [AudioContext interface: context must inherit property "baseLatency" with the proper type]
-    expected: FAIL
-
-  [MediaStreamTrackAudioSourceNode interface: existence and properties of interface prototype object]
-    expected: FAIL
-
-  [AudioContext interface: calling createMediaStreamTrackSource(MediaStreamTrack) on context with too few arguments must throw TypeError]
-    expected: FAIL
-
-  [MediaElementAudioSourceNode interface: attribute mediaElement]
-    expected: FAIL
-
-  [AudioListener interface: context.listener must inherit property "positionX" with the proper type]
-    expected: FAIL
-
-  [AudioProcessingEvent must be primary interface of new AudioProcessingEvent('', {\n        playbackTime: 0, inputBuffer: buffer, outputBuffer: buffer\n      })]
-    expected: FAIL
-
-  [AudioListener interface: context.listener must inherit property "forwardZ" with the proper type]
-    expected: FAIL
-
-  [Test driver]
-    expected: FAIL
-
-  [AudioListener interface: context.listener must inherit property "positionZ" with the proper type]
-    expected: FAIL
-
-  [MediaStreamTrackAudioSourceNode interface object name]
-    expected: FAIL
-
-  [AudioParamMap must be primary interface of worklet_node.parameters]
-    expected: FAIL
-
-  [AudioContext interface: context must inherit property "outputLatency" with the proper type]
-    expected: FAIL
-
-  [OfflineAudioContext interface: operation suspend(double)]
-    expected: FAIL
-
-  [AudioContext interface: attribute baseLatency]
-    expected: FAIL
-
-  [MediaStreamTrackAudioSourceNode interface: existence and properties of interface prototype object's "constructor" property]
-    expected: FAIL
-
-  [AudioParam interface: new AudioBufferSourceNode(context).playbackRate must inherit property "cancelAndHoldAtTime(double)" with the proper type]
-    expected: FAIL
-
-  [MediaStreamTrackAudioSourceNode interface: existence and properties of interface object]
-    expected: FAIL
-
-  [AudioContext interface: attribute outputLatency]
-    expected: FAIL
-
-  [AudioListener interface: attribute upX]
-    expected: FAIL
-
-  [AudioListener interface: attribute upY]
-    expected: FAIL
-
-  [AudioListener interface: attribute upZ]
-    expected: FAIL
-
-  [AudioProcessingEvent interface: new AudioProcessingEvent('', {\n        playbackTime: 0, inputBuffer: buffer, outputBuffer: buffer\n      }) must inherit property "inputBuffer" with the proper type]
-    expected: FAIL
-
-  [AudioProcessingEvent interface: new AudioProcessingEvent('', {\n        playbackTime: 0, inputBuffer: buffer, outputBuffer: buffer\n      }) must inherit property "playbackTime" with the proper type]
-    expected: FAIL
-
-  [AudioListener interface: context.listener must inherit property "upX" with the proper type]
-    expected: FAIL
-
-  [OfflineAudioContext interface: operation resume()]
-    expected: FAIL
-
-  [AudioContext interface: operation resume()]
-    expected: FAIL
-
-  [AudioWorkletNode interface: worklet_node must inherit property "port" with the proper type]
-    expected: FAIL
-
-  [AudioNode interface: worklet_node must inherit property "disconnect(AudioParam, unsigned long)" with the proper type]
-    expected: FAIL
-
-  [Stringification of context.audioWorklet]
-    expected: FAIL
-
-  [AudioNode interface: worklet_node must inherit property "numberOfOutputs" with the proper type]
-    expected: FAIL
-
-  [AudioWorkletNode interface: attribute onprocessorerror]
-    expected: FAIL
-
-  [idl_test setup]
-    expected: FAIL
-
-  [AudioWorkletNode interface object name]
-    expected: FAIL
-
-  [AudioWorkletNode interface: existence and properties of interface object]
-    expected: FAIL
-
-  [Stringification of worklet_node]
-    expected: FAIL
-
-  [AudioNode interface: calling disconnect(unsigned long) on worklet_node with too few arguments must throw TypeError]
-    expected: FAIL
-
   [AudioParamMap interface: existence and properties of interface object]
     expected: FAIL
 
   [AudioWorklet interface object name]
     expected: FAIL
 
+  [MediaElementAudioSourceNode interface: new MediaElementAudioSourceNode(context, {mediaElement: new Audio}) must inherit property "mediaElement" with the proper type]
+    expected: FAIL
+
+  [AudioWorkletNode interface: worklet_node must inherit property "parameters" with the proper type]
+    expected: FAIL
+
   [AudioWorklet interface: existence and properties of interface prototype object's "constructor" property]
     expected: FAIL
 
   [AudioNode interface: calling disconnect(AudioNode) on worklet_node with too few arguments must throw TypeError]
     expected: FAIL
 
+  [MediaStreamTrackAudioSourceNode interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
   [AudioNode interface: calling connect(AudioParam, unsigned long) on worklet_node with too few arguments must throw TypeError]
     expected: FAIL
 
+  [AudioContext interface: operation getOutputTimestamp()]
+    expected: FAIL
+
   [AudioNode interface: worklet_node must inherit property "connect(AudioNode, unsigned long, unsigned long)" with the proper type]
     expected: FAIL
 
@@ -218,12 +113,18 @@
   [AudioParamMap interface object length]
     expected: FAIL
 
+  [AudioContext interface: operation createMediaStreamTrackSource(MediaStreamTrack)]
+    expected: FAIL
+
   [AudioNode interface: worklet_node must inherit property "disconnect()" with the proper type]
     expected: FAIL
 
   [BaseAudioContext interface: attribute audioWorklet]
     expected: FAIL
 
+  [AudioWorklet interface object length]
+    expected: FAIL
+
   [AudioWorkletNode interface: existence and properties of interface prototype object]
     expected: FAIL
 
@@ -239,7 +140,13 @@
   [AudioNode interface: worklet_node must inherit property "disconnect(AudioParam)" with the proper type]
     expected: FAIL
 
-  [AudioNode interface: worklet_node must inherit property "channelCount" with the proper type]
+  [Stringification of new AudioProcessingEvent('', {\n        playbackTime: 0, inputBuffer: buffer, outputBuffer: buffer\n      })]
+    expected: FAIL
+
+  [OfflineAudioContext interface: new OfflineAudioContext(1, 1, sample_rate) must inherit property "suspend(double)" with the proper type]
+    expected: FAIL
+
+  [MediaStreamTrackAudioSourceNode interface object length]
     expected: FAIL
 
   [AudioWorkletNode interface: attribute port]
@@ -248,25 +155,43 @@
   [AudioNode interface: worklet_node must inherit property "connect(AudioParam, unsigned long)" with the proper type]
     expected: FAIL
 
-  [AudioNode interface: worklet_node must inherit property "channelInterpretation" with the proper type]
+  [AudioParam interface: operation cancelAndHoldAtTime(double)]
     expected: FAIL
 
   [AudioWorkletNode must be primary interface of worklet_node]
     expected: FAIL
 
+  [AudioParam interface: new AudioBufferSourceNode(context).playbackRate must inherit property "automationRate" with the proper type]
+    expected: FAIL
+
+  [AudioWorklet interface: existence and properties of interface object]
+    expected: FAIL
+
+  [AudioListener interface: context.listener must inherit property "upY" with the proper type]
+    expected: FAIL
+
+  [AudioNode interface: worklet_node must inherit property "channelCountMode" with the proper type]
+    expected: FAIL
+
+  [AudioParam interface: attribute automationRate]
+    expected: FAIL
+
   [AudioNode interface: worklet_node must inherit property "context" with the proper type]
     expected: FAIL
 
+  [OfflineAudioContext interface: calling suspend(double) on new OfflineAudioContext(1, 1, sample_rate) with too few arguments must throw TypeError]
+    expected: FAIL
+
   [AudioWorkletNode interface: existence and properties of interface prototype object's @@unscopables property]
     expected: FAIL
 
-  [AudioParamMap interface object name]
+  [AudioNode interface: worklet_node must inherit property "channelCount" with the proper type]
     expected: FAIL
 
-  [AudioWorkletNode interface: worklet_node must inherit property "parameters" with the proper type]
+  [AudioProcessingEvent interface object length]
     expected: FAIL
 
-  [AudioWorklet interface: existence and properties of interface object]
+  [AudioListener interface: context.listener must inherit property "forwardY" with the proper type]
     expected: FAIL
 
   [AudioNode interface: calling connect(AudioNode, unsigned long, unsigned long) on worklet_node with too few arguments must throw TypeError]
@@ -275,28 +200,70 @@
   [AudioWorkletNode interface: attribute parameters]
     expected: FAIL
 
-  [AudioWorklet must be primary interface of context.audioWorklet]
+  [AudioContext interface: context must inherit property "baseLatency" with the proper type]
+    expected: FAIL
+
+  [MediaStreamTrackAudioSourceNode interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [AudioContext interface: calling createMediaStreamTrackSource(MediaStreamTrack) on context with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [MediaElementAudioSourceNode interface: attribute mediaElement]
     expected: FAIL
 
   [AudioWorklet interface: existence and properties of interface prototype object's @@unscopables property]
     expected: FAIL
 
+  [AudioListener interface: context.listener must inherit property "positionX" with the proper type]
+    expected: FAIL
+
+  [AudioProcessingEvent must be primary interface of new AudioProcessingEvent('', {\n        playbackTime: 0, inputBuffer: buffer, outputBuffer: buffer\n      })]
+    expected: FAIL
+
+  [AudioListener interface: context.listener must inherit property "forwardZ" with the proper type]
+    expected: FAIL
+
+  [Test driver]
+    expected: FAIL
+
   [BaseAudioContext interface: new OfflineAudioContext(1, 1, sample_rate) must inherit property "audioWorklet" with the proper type]
     expected: FAIL
 
   [AudioNode interface: calling disconnect(AudioParam, unsigned long) on worklet_node with too few arguments must throw TypeError]
     expected: FAIL
 
+  [AudioParamMap interface object name]
+    expected: FAIL
+
   [AudioParamMap interface: existence and properties of interface prototype object's "constructor" property]
     expected: FAIL
 
   [AudioNode interface: worklet_node must inherit property "disconnect(AudioNode, unsigned long, unsigned long)" with the proper type]
     expected: FAIL
 
+  [AudioListener interface: context.listener must inherit property "positionZ" with the proper type]
+    expected: FAIL
+
+  [MediaStreamTrackAudioSourceNode interface object name]
+    expected: FAIL
+
+  [AudioNode interface: worklet_node must inherit property "numberOfInputs" with the proper type]
+    expected: FAIL
+
   [AudioNode interface: calling disconnect(AudioNode, unsigned long, unsigned long) on worklet_node with too few arguments must throw TypeError]
     expected: FAIL
 
-  [AudioWorklet interface object length]
+  [AudioParamMap must be primary interface of worklet_node.parameters]
+    expected: FAIL
+
+  [AudioContext interface: context must inherit property "outputLatency" with the proper type]
+    expected: FAIL
+
+  [OfflineAudioContext interface: operation suspend(double)]
+    expected: FAIL
+
+  [AudioContext interface: attribute baseLatency]
     expected: FAIL
 
   [AudioNode interface: calling disconnect(AudioNode, unsigned long) on worklet_node with too few arguments must throw TypeError]
@@ -305,16 +272,28 @@
   [AudioWorkletNode interface object length]
     expected: FAIL
 
+  [MediaStreamTrackAudioSourceNode interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [AudioParam interface: new AudioBufferSourceNode(context).playbackRate must inherit property "cancelAndHoldAtTime(double)" with the proper type]
+    expected: FAIL
+
+  [MediaStreamTrackAudioSourceNode interface: existence and properties of interface object]
+    expected: FAIL
+
+  [AudioContext interface: attribute outputLatency]
+    expected: FAIL
+
   [AudioParamMap interface: existence and properties of interface prototype object's @@unscopables property]
     expected: FAIL
 
-  [AudioWorkletNode interface: worklet_node must inherit property "onprocessorerror" with the proper type]
+  [AudioListener interface: attribute upX]
     expected: FAIL
 
-  [AudioNode interface: worklet_node must inherit property "channelCountMode" with the proper type]
+  [AudioListener interface: attribute upY]
     expected: FAIL
 
-  [AudioNode interface: worklet_node must inherit property "numberOfInputs" with the proper type]
+  [AudioListener interface: attribute upZ]
     expected: FAIL
 
   [AudioNode interface: calling disconnect(AudioParam) on worklet_node with too few arguments must throw TypeError]
@@ -323,9 +302,30 @@
   [AudioWorklet interface: existence and properties of interface prototype object]
     expected: FAIL
 
+  [AudioProcessingEvent interface: new AudioProcessingEvent('', {\n        playbackTime: 0, inputBuffer: buffer, outputBuffer: buffer\n      }) must inherit property "inputBuffer" with the proper type]
+    expected: FAIL
+
+  [AudioProcessingEvent interface: new AudioProcessingEvent('', {\n        playbackTime: 0, inputBuffer: buffer, outputBuffer: buffer\n      }) must inherit property "playbackTime" with the proper type]
+    expected: FAIL
+
   [AudioWorkletNode interface: existence and properties of interface prototype object's "constructor" property]
     expected: FAIL
 
+  [AudioListener interface: context.listener must inherit property "upX" with the proper type]
+    expected: FAIL
+
+  [AudioWorklet must be primary interface of context.audioWorklet]
+    expected: FAIL
+
   [AudioNode interface: worklet_node must inherit property "disconnect(AudioNode, unsigned long)" with the proper type]
     expected: FAIL
 
+  [idl_test setup]
+    expected: FAIL
+
+  [OfflineAudioContext interface: operation resume()]
+    expected: FAIL
+
+  [AudioContext interface: operation resume()]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini b/testing/web-platform/meta/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
index 231c4bca522a..3fe95ea9c67e 100644
--- a/testing/web-platform/meta/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
+++ b/testing/web-platform/meta/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
@@ -43,15 +43,3 @@
   [X SNR (58.62182033056576 dB) is not greater than or equal to 85.586. Got 58.62182033056576.]
     expected: FAIL
 
-  [X SNR (58.62182031202294 dB) is not greater than or equal to 85.58. Got 58.62182031202294.]
-    expected: FAIL
-
-  [X SNR (58.62182033056576 dB) is not greater than or equal to 85.58. Got 58.62182033056576.]
-    expected: FAIL
-
-  [X SNR (58.62182032943065 dB) is not greater than or equal to 85.58. Got 58.62182032943065.]
-    expected: FAIL
-
-  [X SNR (58.62182025211463 dB) is not greater than or equal to 85.58. Got 58.62182025211463.]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/webrtc/RTCPeerConnection-onsignalingstatechanged.https.html.ini b/testing/web-platform/meta/webrtc/RTCPeerConnection-onsignalingstatechanged.https.html.ini
deleted file mode 100644
index d564904adfb2..000000000000
--- a/testing/web-platform/meta/webrtc/RTCPeerConnection-onsignalingstatechanged.https.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[RTCPeerConnection-onsignalingstatechanged.https.html]
-  [RTCPeerConnection onsignalingstatechanged]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/websockets/__dir__.ini b/testing/web-platform/meta/websockets/__dir__.ini
index 0e9dca022d9c..18d27e674b96 100644
--- a/testing/web-platform/meta/websockets/__dir__.ini
+++ b/testing/web-platform/meta/websockets/__dir__.ini
@@ -1,2 +1,2 @@
 leak-threshold: [default:102400]
-lsan-allowed: [Alloc, Create, MakeUnique, NewPage, PLDHashTable::Add, Realloc, SetPropertyAsInterface, mozilla::BasePrincipal::CreateCodebasePrincipal, mozilla::SchedulerGroup::CreateEventTargetFor, mozilla::WeakPtr, mozilla::dom::WebSocket::ConstructorCommon, mozilla::dom::WebSocket::WebSocket, mozilla::extensions::ChannelWrapper::ChannelWrapper, mozilla::net::BaseWebSocketChannel::InitLoadInfo, mozilla::net::CookieSettings::Create, mozilla::net::WebSocketChannelChild::AsyncOpen, mozilla::net::WebSocketEventService::GetOrCreate, mozilla::net::nsHttpTransaction::ParseHead, mozilla::net::nsStandardURL::TemplatedMutator, nsNodeSupportsWeakRefTearoff::GetWeakReference, nsSupportsWeakReference::GetWeakReference]
+lsan-allowed: [Alloc, Create, MakeUnique, NewPage, PLDHashTable::Add, Realloc, SetPropertyAsInterface, mozilla::BasePrincipal::CreateCodebasePrincipal, mozilla::SchedulerGroup::CreateEventTargetFor, mozilla::WeakPtr, mozilla::dom::WebSocket::ConstructorCommon, mozilla::dom::WebSocket::WebSocket, mozilla::extensions::ChannelWrapper::ChannelWrapper, mozilla::net::BaseWebSocketChannel::InitLoadInfo, mozilla::net::WebSocketChannelChild::AsyncOpen, mozilla::net::WebSocketEventService::GetOrCreate, mozilla::net::nsHttpTransaction::ParseHead, mozilla::net::nsStandardURL::TemplatedMutator, nsNodeSupportsWeakRefTearoff::GetWeakReference, nsSupportsWeakReference::GetWeakReference]
diff --git a/testing/web-platform/meta/websockets/constructor/__dir__.ini b/testing/web-platform/meta/websockets/constructor/__dir__.ini
index f52ad39cebc3..7756ed5ec2ee 100644
--- a/testing/web-platform/meta/websockets/constructor/__dir__.ini
+++ b/testing/web-platform/meta/websockets/constructor/__dir__.ini
@@ -1,3 +1,3 @@
-lsan-allowed: [Alloc, Create, MakeUnique, Malloc, NewPage, PLDHashTable::Add, PLDHashTable::ChangeTable, Realloc, RecvOnAcknowledge, RecvOnStop, SetPropertyAsInterface, SetSucceededCertChain, allocate, mozilla::BasePrincipal::CreateCodebasePrincipal, mozilla::SchedulerGroup::CreateEventTargetFor, mozilla::ThrottledEventQueue::Create, mozilla::WeakPtr, mozilla::dom::ContentChild::GetConstructedEventTarget, mozilla::dom::ScriptElement::MaybeProcessScript, mozilla::dom::WebSocket::ConstructorCommon, mozilla::dom::WebSocket::WebSocket, mozilla::dom::WorkerCSPEventListener::Create, mozilla::extensions::ChannelWrapper::ChannelWrapper, mozilla::net::BaseWebSocketChannel::InitLoadInfo, mozilla::net::WebSocketChannelChild::AsyncOpen, mozilla::net::WebSocketChannelChild::RecvOnServerClose, mozilla::net::WebSocketEventService::GetOrCreate, mozilla::net::nsHttpTransaction::ParseHead, mozilla::net::nsStandardURL::TemplatedMutator, nsAtomTable::Atomize, nsDocShell::Create, nsNSSCertificate::Create, nsNodeSupportsWeakRefTearoff::GetWeakReference, nsSSLIOLayerAddToSocket]
+lsan-allowed: [Alloc, Create, MakeUnique, Malloc, NewPage, PLDHashTable::Add, PLDHashTable::ChangeTable, Realloc, RecvOnAcknowledge, RecvOnStop, SetPropertyAsInterface, SetSucceededCertChain, allocate, mozilla::BasePrincipal::CreateCodebasePrincipal, mozilla::SchedulerGroup::CreateEventTargetFor, mozilla::ThrottledEventQueue::Create, mozilla::WeakPtr, mozilla::dom::ScriptElement::MaybeProcessScript, mozilla::dom::WebSocket::ConstructorCommon, mozilla::dom::WebSocket::WebSocket, mozilla::dom::WorkerCSPEventListener::Create, mozilla::dom::ContentChild::GetConstructedEventTarget, mozilla::extensions::ChannelWrapper::ChannelWrapper, mozilla::net::BaseWebSocketChannel::InitLoadInfo, mozilla::net::WebSocketChannelChild::AsyncOpen, mozilla::net::WebSocketChannelChild::RecvOnServerClose, mozilla::net::WebSocketEventService::GetOrCreate, mozilla::net::nsHttpTransaction::ParseHead, mozilla::net::nsStandardURL::TemplatedMutator, nsAtomTable::Atomize, nsDocShell::Create, nsNSSCertificate::Create, nsNodeSupportsWeakRefTearoff::GetWeakReference, nsSSLIOLayerAddToSocket]
 lsan-max-stack-depth: 7
 leak-threshold: [tab:51200]
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/basic.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/basic.html.ini
index 57e3ba3ae72f..7a5ee6ff749f 100644
--- a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/basic.html.ini
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/basic.html.ini
@@ -1,3 +1,3 @@
 [basic.html]
   expected:
-    if os == "android": FAIL
+    if (os == "android"): FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/bidi/bidi_ruby.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/bidi/bidi_ruby.html.ini
index b9acfd5485f4..61537b9c0715 100644
--- a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/bidi/bidi_ruby.html.ini
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/bidi/bidi_ruby.html.ini
@@ -1,3 +1,3 @@
 [bidi_ruby.html]
   expected:
-    if os == "android": FAIL
+    if (os == "android"): FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/bidi/u0041_first.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/bidi/u0041_first.html.ini
index 66ba782f2e54..a6050fcebac1 100644
--- a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/bidi/u0041_first.html.ini
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/bidi/u0041_first.html.ini
@@ -1,3 +1,3 @@
 [u0041_first.html]
   expected:
-    if os == "android": FAIL
+    if (os == "android"): FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/disable_controls_reposition.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/disable_controls_reposition.html.ini
index 91df7230fdec..018f91fd93c2 100644
--- a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/disable_controls_reposition.html.ini
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/disable_controls_reposition.html.ini
@@ -1,4 +1,5 @@
 [disable_controls_reposition.html]
   disabled:
-    if os == "android": https://bugzilla.mozilla.org/show_bug.cgi?id=1511369
+    if (os == "android"): https://bugzilla.mozilla.org/show_bug.cgi?id=1511369
     if (os == "win") and (processor == "aarch64"): https://bugzilla.mozilla.org/show_bug.cgi?id=1534426
+
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue/color_hex.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue/color_hex.html.ini
index 353f356c775a..0770beea9c31 100644
--- a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue/color_hex.html.ini
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue/color_hex.html.ini
@@ -1,3 +1,3 @@
 [color_hex.html]
   expected:
-    if os == "android": FAIL
+    if (os == "android"): FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue/color_hsla.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue/color_hsla.html.ini
index 3c2047e8adf9..f4682fa3aaed 100644
--- a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue/color_hsla.html.ini
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue/color_hsla.html.ini
@@ -1,3 +1,3 @@
 [color_hsla.html]
   expected:
-    if os == "android": FAIL
+    if (os == "android"): FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue/color_rgba.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue/color_rgba.html.ini
index 8ad0a7015ca6..237758a631a5 100644
--- a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue/color_rgba.html.ini
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue/color_rgba.html.ini
@@ -1,3 +1,3 @@
 [color_rgba.html]
   expected:
-    if os == "android": FAIL
+    if (os == "android"): FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue/cue_selector_single_colon.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue/cue_selector_single_colon.html.ini
index 750913c6192d..2da86c267d65 100644
--- a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue/cue_selector_single_colon.html.ini
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue/cue_selector_single_colon.html.ini
@@ -1,3 +1,3 @@
 [cue_selector_single_colon.html]
   expected:
-    if os == "android": FAIL
+    if (os == "android"): FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue/font_properties.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue/font_properties.html.ini
index 7405b050850c..da5f2dd905da 100644
--- a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue/font_properties.html.ini
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue/font_properties.html.ini
@@ -1,3 +1,3 @@
 [font_properties.html]
   expected:
-    if os == "android": FAIL
+    if (os == "android"): FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue/font_shorthand.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue/font_shorthand.html.ini
index 2bce9c2f297d..949aef4c3843 100644
--- a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue/font_shorthand.html.ini
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue/font_shorthand.html.ini
@@ -1,3 +1,3 @@
 [font_shorthand.html]
   expected:
-    if os == "android": FAIL
+    if (os == "android"): FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue/outline_properties.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue/outline_properties.html.ini
index 1428c1a0dea7..10229ffa6886 100644
--- a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue/outline_properties.html.ini
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue/outline_properties.html.ini
@@ -1,3 +1,3 @@
 [outline_properties.html]
   expected:
-    if os == "android": FAIL
+    if (os == "android"): FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue/text-decoration_line-through.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue/text-decoration_line-through.html.ini
index c1eb0f0af2b6..7afb038d79a4 100644
--- a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue/text-decoration_line-through.html.ini
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue/text-decoration_line-through.html.ini
@@ -1,3 +1,3 @@
 [text-decoration_line-through.html]
   expected:
-    if os == "android": FAIL
+    if (os == "android"): FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue/text-decoration_overline.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue/text-decoration_overline.html.ini
index ac7d01c2b8c3..2af552e38fcd 100644
--- a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue/text-decoration_overline.html.ini
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue/text-decoration_overline.html.ini
@@ -1,3 +1,3 @@
 [text-decoration_overline.html]
   expected:
-    if os == "android": FAIL
+    if (os == "android"): FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_normal_wrapped.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_normal_wrapped.html.ini
index d9c01f2889d7..dd8be0dca4e3 100644
--- a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_normal_wrapped.html.ini
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_normal_wrapped.html.ini
@@ -1,3 +1,3 @@
 [white-space_normal_wrapped.html]
   expected:
-    if os == "android": FAIL
+    if (os == "android"): FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/background_box.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/background_box.html.ini
index ad448599ea3a..a8d3d6af8c19 100644
--- a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/background_box.html.ini
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/background_box.html.ini
@@ -1,3 +1,3 @@
 [background_box.html]
   expected:
-    if os == "android": FAIL
+    if (os == "android"): FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_namespace.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_namespace.html.ini
index 3f4fe4e031cc..967a3042ef56 100644
--- a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_namespace.html.ini
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_namespace.html.ini
@@ -1,3 +1,3 @@
 [class_namespace.html]
   expected:
-    if os == "android": FAIL
+    if (os == "android"): FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_namespace.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_namespace.html.ini
index ac52954c69f5..b1fb199bc7cc 100644
--- a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_namespace.html.ini
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_namespace.html.ini
@@ -2,4 +2,4 @@
   disabled:
     if (os == "win") and (processor == "aarch64"): https://bugzilla.mozilla.org/show_bug.cgi?id=1519947
   expected:
-    if os == "android": FAIL
+    if (os == "android"): FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/default_styles/bold_object_default_font-style.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/default_styles/bold_object_default_font-style.html.ini
index a549402e9dda..dff8770e7373 100644
--- a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/default_styles/bold_object_default_font-style.html.ini
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/default_styles/bold_object_default_font-style.html.ini
@@ -2,4 +2,4 @@
   disabled:
     if (os == "win") and (processor == "aarch64"): https://bugzilla.mozilla.org/show_bug.cgi?id=1534755
   expected:
-    if os == "android": FAIL
+    if (os == "android"): FAIL
\ No newline at end of file
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/default_styles/italic_object_default_font-style.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/default_styles/italic_object_default_font-style.html.ini
index 1f7f58bf1e65..4b9e1dd2d34c 100644
--- a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/default_styles/italic_object_default_font-style.html.ini
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/default_styles/italic_object_default_font-style.html.ini
@@ -3,4 +3,4 @@
     if verify and (os == "mac"): fails in verify mode
     if (os == "win") and (processor == "aarch64"): https://bugzilla.mozilla.org/show_bug.cgi?id=1533941
   expected:
-    if os == "android": FAIL
+    if (os == "android"): FAIL
diff --git a/testing/web-platform/meta/webxr/idlharness.https.window.js.ini b/testing/web-platform/meta/webxr/idlharness.https.window.js.ini
index b5d37be8c165..a8c45ae4e5e7 100644
--- a/testing/web-platform/meta/webxr/idlharness.https.window.js.ini
+++ b/testing/web-platform/meta/webxr/idlharness.https.window.js.ini
@@ -971,39 +971,3 @@
   [XRSession interface: attribute renderState]
     expected: FAIL
 
-  [XRPose interface: existence and properties of interface prototype object's "constructor" property]
-    expected: FAIL
-
-  [XRInputSource interface: attribute targetRaySpace]
-    expected: FAIL
-
-  [XRPose interface: attribute emulatedPosition]
-    expected: FAIL
-
-  [XRPose interface object length]
-    expected: FAIL
-
-  [XRFrame interface: operation getPose(XRSpace, XRSpace)]
-    expected: FAIL
-
-  [XRPose interface: existence and properties of interface prototype object's @@unscopables property]
-    expected: FAIL
-
-  [XRPose interface: attribute transform]
-    expected: FAIL
-
-  [XRPose interface: existence and properties of interface prototype object]
-    expected: FAIL
-
-  [XRPose interface: existence and properties of interface object]
-    expected: FAIL
-
-  [XRPose interface object name]
-    expected: FAIL
-
-  [XRInputSource interface: attribute gripSpace]
-    expected: FAIL
-
-  [XRSession interface: attribute viewerSpace]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/webxr/xrFrame_lifetime.https.html.ini b/testing/web-platform/meta/webxr/xrFrame_lifetime.https.html.ini
deleted file mode 100644
index e6867166ccd6..000000000000
--- a/testing/web-platform/meta/webxr/xrFrame_lifetime.https.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[xrFrame_lifetime.https.html]
-  [XRFrame methods throw exceptions outside of the requestAnimationFrame callback for non-immersive sessions]
-    expected: FAIL
-
-  [XRFrame methods throw exceptions outside of the requestAnimationFrame callback for immersive sessions]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/workers/semantics/multiple-workers/005.html.ini b/testing/web-platform/meta/workers/semantics/multiple-workers/005.html.ini
index bf39bd724d91..268949ced5ce 100644
--- a/testing/web-platform/meta/workers/semantics/multiple-workers/005.html.ini
+++ b/testing/web-platform/meta/workers/semantics/multiple-workers/005.html.ini
@@ -1,6 +1,4 @@
 [005.html]
-  expected:
-    if os == "android": "ERROR"
   [dedicated worker in shared worker in dedicated worker]
     expected: FAIL
 
diff --git a/testing/web-platform/meta/workers/semantics/navigation/002.html.ini b/testing/web-platform/meta/workers/semantics/navigation/002.html.ini
index 97bd26576858..5530a39d48f2 100644
--- a/testing/web-platform/meta/workers/semantics/navigation/002.html.ini
+++ b/testing/web-platform/meta/workers/semantics/navigation/002.html.ini
@@ -1 +1,2 @@
 prefs: [privacy.reduceTimerPrecision:false]
+[002.html]
diff --git a/testing/web-platform/tests/.azure-pipelines.yml b/testing/web-platform/tests/.azure-pipelines.yml
index b4f71f048b81..0f3747500486 100644
--- a/testing/web-platform/tests/.azure-pipelines.yml
+++ b/testing/web-platform/tests/.azure-pipelines.yml
@@ -10,7 +10,9 @@
 # project is required:
 #  - The "Build pull requests from forks of this repository" setting must be
 #    enabled: https://docs.microsoft.com/en-us/azure/devops/pipelines/repos/github#validate-contributions-from-forks
-#  - A scheduled build needs to be set up for one of the epochs/* branches.
+#  - A scheduled build needs to be set up for the the epochs/daily branch.
+#  - To get results from scheduled builds into wpt.fyi, a service connection
+#    named wpt.fyi with URL https://wpt.fyi is needed.
 #  - Self-hosted agents for Windows 10 are used:
 #    - 'Hosted Windows Client' is the latest Windows 10
 #    - 'Hosted Windows Client Next' is Windows 10 Insider Preview
@@ -20,7 +22,7 @@
 jobs:
 # The affected tests jobs are unconditional for speed, as most PRs have one or
 # more affected tests: https://github.com/web-platform-tests/wpt/issues/13936.
-- job: affected_safari_preview
+- job: affected_macOS
   displayName: 'affected tests (Safari Technology Preview)'
   condition: eq(variables['Build.Reason'], 'PullRequest')
   pool:
@@ -28,13 +30,9 @@ jobs:
   steps:
   - template: tools/ci/azure/affected_tests.yml
     parameters:
-      artifactName: 'safari-preview-affected-tests'
-- template: tools/ci/azure/fyi_hook.yml
-  parameters:
-    dependsOn: affected_safari_preview
-    artifactName: safari-preview-affected-tests
+      artifactName: 'affected-tests'
 
-- job: affected_without_changes_safari_preview
+- job: affected_without_changes_macOS
   displayName: 'affected tests without changes (Safari Technology Preview)'
   condition: eq(variables['Build.Reason'], 'PullRequest')
   pool:
@@ -44,11 +42,7 @@ jobs:
     parameters:
       checkoutCommit: 'HEAD^1'
       affectedRange: 'HEAD@{1}'
-      artifactName: 'safari-preview-affected-tests-without-changes'
-- template: tools/ci/azure/fyi_hook.yml
-  parameters:
-    dependsOn: affected_without_changes_safari_preview
-    artifactName: safari-preview-affected-tests-without-changes
+      artifactName: 'affected-tests-without-changes'
 
 # The decision jobs runs `./wpt test-jobs` to determine which jobs to run,
 # and all following jobs wait for it to finish and depend on its output.
@@ -163,7 +157,7 @@ jobs:
     condition: succeededOrFailed()
   - template: tools/ci/azure/cleanup_win10.yml
 
-- job: results_edge
+- job: all_edge
   displayName: 'all tests (Edge)'
   # This job is only triggered manually until it has been shown to be robust.
   condition: and(eq(variables['Build.Reason'], 'Manual'), variables['run_all_edge'])
@@ -188,20 +182,12 @@ jobs:
   - task: PublishBuildArtifacts@1
     displayName: 'Publish results'
     inputs:
-      artifactName: 'edge-results'
+      artifactName: 'results'
   - template: tools/ci/azure/cleanup_win10.yml
-- template: tools/ci/azure/fyi_hook.yml
-  parameters:
-    dependsOn: results_edge
-    artifactName: edge-results
 
-# All `./wpt run` tests are run from epochs/* branches on a schedule. See
-# documentation at the top of this file for required setup.
-- job: results_safari_preview
+- job: all_macOS
   displayName: 'all tests (Safari Technology Preview)'
-  condition: |
-    or(eq(variables['Build.Reason'], 'Schedule'),
-       and(eq(variables['Build.Reason'], 'Manual'), variables['run_all_safari_preview']))
+  condition: eq(variables['Build.Reason'], 'Schedule')
   strategy:
     parallel: 4 # chosen to make runtime ~2h
   timeoutInMinutes: 360
@@ -222,8 +208,21 @@ jobs:
   - task: PublishBuildArtifacts@1
     displayName: 'Publish results'
     inputs:
-      artifactName: 'safari-preview-results'
-- template: tools/ci/azure/fyi_hook.yml
-  parameters:
-    dependsOn: results_safari_preview
-    artifactName: safari-preview-results
+      artifactName: 'results'
+
+# The InvokeRESTAPI task can only run in a server job.
+- job: all_post
+  displayName: 'all tests (wpt.fyi hook)'
+  dependsOn: all_macOS
+  pool: server
+  steps:
+  - task: InvokeRESTAPI@1
+    displayName: 'Invoke wpt.fyi hook'
+    inputs:
+      serviceConnection: wpt.fyi
+      urlSuffix: /api/checks/azure/$(Build.BuildId)
+  - task: InvokeRESTAPI@1
+    displayName: 'Invoke staging.wpt.fyi hook'
+    inputs:
+      serviceConnection: staging.wpt.fyi
+      urlSuffix: /api/checks/azure/$(Build.BuildId)
diff --git a/testing/web-platform/tests/WebIDL/ecmascript-binding/constructors-support.html b/testing/web-platform/tests/WebIDL/ecmascript-binding/constructors-support.html
deleted file mode 100644
index 3b2616170b1d..000000000000
--- a/testing/web-platform/tests/WebIDL/ecmascript-binding/constructors-support.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!DOCTYPE html>
-<script>
-window.badNewTarget = function() {};
-badNewTarget.prototype = 8;
-
-window.DOMParserSubclass = class extends DOMParser {}
-window.ForeignDOMParserSubclass = class extends parent.DOMParser {}
-</script>
diff --git a/testing/web-platform/tests/WebIDL/ecmascript-binding/constructors.html b/testing/web-platform/tests/WebIDL/ecmascript-binding/constructors.html
deleted file mode 100644
index 423e1bed2282..000000000000
--- a/testing/web-platform/tests/WebIDL/ecmascript-binding/constructors.html
+++ /dev/null
@@ -1,96 +0,0 @@
-<!DOCTYPE html>
-<meta charset=utf-8>
-<title>Realm for constructed objects</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<div id=log></div>
-<script>
-function object_realm(dp) {
-  // Note that browsers use the URL of the relevant global object's associated
-  // Document.
-  // https://github.com/w3c/DOM-Parsing/issues/46
-  var url = DOMParser.prototype.parseFromString.call(dp, "x", "text/html").documentURI;
-  var file = url.slice(url.lastIndexOf("/") + 1);
-  switch (file) {
-  case "constructors.html":
-    return "parent window";
-  case "constructors-support.html":
-    return "child window";
-  default:
-    return "???";
-  }
-}
-
-async_test(function() {
-  var iframe = document.createElement("iframe");
-  iframe.onload = this.step_func_done(function() {
-    var child = iframe.contentWindow;
-    test(function() {
-      var dp = new DOMParser();
-      assert_equals(Object.getPrototypeOf(dp), DOMParser.prototype);
-      assert_equals(object_realm(dp), "parent window");
-    }, "Normal constructor in parent window");
-
-    test(function() {
-      var dp = new child.DOMParser();
-      assert_equals(Object.getPrototypeOf(dp), child.DOMParser.prototype);
-      assert_equals(object_realm(dp), "child window");
-    }, "Normal constructor in child window");
-
-    test(function() {
-      var dp = Reflect.construct(child.DOMParser, [], DOMParser);
-      assert_equals(Object.getPrototypeOf(dp), DOMParser.prototype);
-      assert_equals(object_realm(dp), "child window");
-    }, "Constructor in child window with normal NewTarget from parent window");
-
-    test(function() {
-      var dp = Reflect.construct(DOMParser, [], child.DOMParser);
-      assert_equals(Object.getPrototypeOf(dp), child.DOMParser.prototype);
-      assert_equals(object_realm(dp), "parent window");
-    }, "Constructor in parent window with normal NewTarget from child window");
-
-    test(function() {
-      class DOMParserSubclass extends DOMParser {}
-      var dp = new DOMParserSubclass();
-      assert_equals(Object.getPrototypeOf(dp), DOMParserSubclass.prototype);
-      assert_equals(object_realm(dp), "parent window");
-    }, "Subclass constructor in parent window");
-
-    test(function() {
-      var dp = new child.DOMParserSubclass();
-      assert_equals(Object.getPrototypeOf(dp), child.DOMParserSubclass.prototype);
-      assert_equals(object_realm(dp), "child window");
-    }, "Subclass constructor in child window");
-
-    test(function() {
-      class ForeignDOMParserSubclass extends child.DOMParser {}
-      var dp = new ForeignDOMParserSubclass();
-      assert_equals(Object.getPrototypeOf(dp), ForeignDOMParserSubclass.prototype);
-      assert_equals(object_realm(dp), "child window");
-    }, "Subclass constructor in parent window with parent class in child window");
-
-    test(function() {
-      var dp = new child.ForeignDOMParserSubclass();
-      assert_equals(Object.getPrototypeOf(dp), child.ForeignDOMParserSubclass.prototype);
-      assert_equals(object_realm(dp), "parent window");
-    }, "Subclass constructor in child window with parent class in parent window");
-
-    test(function() {
-      var badNewTarget = function() {};
-      badNewTarget.prototype = 7;
-
-      var dp = Reflect.construct(child.DOMParser, [], badNewTarget);
-      assert_equals(Object.getPrototypeOf(dp), DOMParser.prototype);
-      assert_equals(object_realm(dp), "child window");
-    }, "Constructor in child window with bad NewTarget from parent window");
-
-    test(function() {
-      var dp = Reflect.construct(DOMParser, [], child.badNewTarget);
-      assert_equals(Object.getPrototypeOf(dp), child.DOMParser.prototype);
-      assert_equals(object_realm(dp), "parent window");
-    }, "Constructor in parent window with bad NewTarget from child window");
-  });
-  iframe.src = "constructors-support.html";
-  document.body.appendChild(iframe);
-});
-</script>
diff --git a/testing/web-platform/tests/animation-worklet/animate-multiple-effects-on-different-targets-via-main-thread.https.html b/testing/web-platform/tests/animation-worklet/animate-multiple-effects-on-different-targets-via-main-thread.https.html
deleted file mode 100644
index d22ed4cd251a..000000000000
--- a/testing/web-platform/tests/animation-worklet/animate-multiple-effects-on-different-targets-via-main-thread.https.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<!DOCTYPE html>
-<title>Animate multiple effects on different targets via main thread</title>
-<link rel="help" href="https://drafts.css-houdini.org/css-animationworklet/">
-
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/web-animations/testcommon.js"></script>
-<script src="common.js"></script>
-
-<style>
-  #target {
-    width: 100px;
-    height: 100px;
-    background-color: green;
-  }
-  #target2 {
-    width: 100px;
-    height: 100px;
-    background-color: blue;
-    box-shadow: 4px 4px 25px blue;
-  }
-</style>
-
-<div id="target"></div>
-<div id="target2"></div>
-
-<script id="simple_animate" type="text/worklet">
-  registerAnimator("test_animator", class {
-    animate(currentTime, effect) {
-      let effects = effect.getChildren();
-      effects[0].localTime = 1000;
-      effects[1].localTime = 1000;
-    }
-  });
-</script>
-
-<script>
-  promise_test(async t => {
-    await runInAnimationWorklet(document.getElementById('simple_animate').textContent);
-
-    const effect = new KeyframeEffect(
-        document.getElementById("target"),
-        [
-          { background: 'green' },
-          { background: 'blue' },
-        ],
-        { duration: 2000 }
-    );
-    const effect2 = new KeyframeEffect(
-        document.getElementById("target2"),
-        [
-          { boxShadow: '4px 4px 25px blue' },
-          { boxShadow: '4px 4px 25px green' }
-        ],
-        { duration: 2000 }
-    );
-
-    const animation = new WorkletAnimation('test_animator', [effect, effect2]);
-    animation.play();
-    await waitForAsyncAnimationFrames(1);
-
-    assert_equals(getComputedStyle(document.getElementById('target')).backgroundColor, "rgb(0, 64, 128)");
-    assert_equals(getComputedStyle(document.getElementById('target2')).boxShadow, "rgb(0, 64, 128) 4px 4px 25px 0px");
-  }, 'Animating multiple effects on different targets via main thread should produce new output values accordingly');
-</script>
\ No newline at end of file
diff --git a/testing/web-platform/tests/animation-worklet/animate-non-accelerated-property.https.html b/testing/web-platform/tests/animation-worklet/animate-non-accelerated-property.https.html
deleted file mode 100644
index 8e30387530ca..000000000000
--- a/testing/web-platform/tests/animation-worklet/animate-non-accelerated-property.https.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE html>
-<title>Animate non-accelerated property using worklet animation</title>
-<link rel="help" href="https://drafts.css-houdini.org/css-animationworklet/">
-
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/web-animations/testcommon.js"></script>
-<script src="common.js"></script>
-
-<div id="target"></div>
-<div id="target2"></div>
-
-<script>
-  promise_test(async t => {
-    await registerConstantLocalTimeAnimator(1000);
-    const target = document.getElementById("target");
-    const effect = new KeyframeEffect(
-        target,
-        [
-          { background: 'green' },
-          { background: 'blue' },
-        ],
-        { duration: 2000 }
-    );
-
-    const target2 = document.getElementById("target2");
-    const effect2 = new KeyframeEffect(
-        target2,
-        [
-          { boxShadow: '4px 4px 25px blue' },
-          { boxShadow: '4px 4px 25px green' }
-        ],
-        { duration: 2000 }
-    );
-    const animation = new WorkletAnimation('constant_time', effect);
-    animation.play();
-    const animation2 = new WorkletAnimation('constant_time', effect2);
-    animation2.play();
-
-    await waitForAsyncAnimationFrames(1);
-    assert_equals(getComputedStyle(target).backgroundColor, "rgb(0, 64, 128)");
-    assert_equals(getComputedStyle(target2).boxShadow, "rgb(0, 64, 128) 4px 4px 25px 0px");
-  }, "Individual worklet animation should output values at specified local time for corresponding targets and effects");
-</script>
diff --git a/testing/web-platform/tests/animation-worklet/animator-animate.https.html b/testing/web-platform/tests/animation-worklet/animator-animate.https.html
deleted file mode 100644
index 6efc3caf89d7..000000000000
--- a/testing/web-platform/tests/animation-worklet/animator-animate.https.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<title>Basic use of Worklet Animation</title>
-<link rel="help" href="https://drafts.css-houdini.org/css-animationworklet/">
-
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/web-animations/testcommon.js"></script>
-<script src="common.js"></script>
-
-<div id="target"></div>
-
-<script>
-  promise_test(async t => {
-    await registerConstantLocalTimeAnimator(500);
-    const effect = new KeyframeEffect(target, [{ opacity: 0 }], { duration: 1000 });
-    const animation = new WorkletAnimation('constant_time', effect);
-    animation.play();
-
-    await waitForAsyncAnimationFrames(1);
-    assert_equals(getComputedStyle(target).opacity, "0.5");
-  }, "Simple worklet animation should output values at specified local time");
-</script>
\ No newline at end of file
diff --git a/testing/web-platform/tests/animation-worklet/animator-with-options.https.html b/testing/web-platform/tests/animation-worklet/animator-with-options.https.html
deleted file mode 100644
index 1ff2544d6a9a..000000000000
--- a/testing/web-platform/tests/animation-worklet/animator-with-options.https.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html>
-<title>Worklet Animation with options</title>
-<link rel="help" href="https://drafts.css-houdini.org/css-animationworklet/">
-
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/web-animations/testcommon.js"></script>
-<script src="common.js"></script>
-
-<div id="target"></div>
-
-<script id="animate_with_options" type="text/worklet">
-  registerAnimator("test_animator", class {
-    constructor(options) {
-      this.time_ = options.time;
-    }
-    animate(currentTime, effect) {
-      effect.localTime = this.time_;
-    }
-  });
-</script>
-
-<script>
-  promise_test(async t => {
-    await runInAnimationWorklet(document.getElementById('animate_with_options').textContent);
-    const target = document.getElementById('target');
-    const effect = new KeyframeEffect(target, [{ opacity: 0 }], { duration: 1000 });
-    const options = {'time': 500};
-    const animation = new WorkletAnimation('test_animator', effect, document.timeline, options);
-    animation.play();
-
-    await waitForAsyncAnimationFrames(1);
-    assert_equals(getComputedStyle(target).opacity, "0.5");
-  }, "Animator should be able to use options to update the animation");
-</script>
\ No newline at end of file
diff --git a/testing/web-platform/tests/animation-worklet/cancel-non-accelerated-property.https.html b/testing/web-platform/tests/animation-worklet/cancel-non-accelerated-property.https.html
deleted file mode 100644
index 594da4c41913..000000000000
--- a/testing/web-platform/tests/animation-worklet/cancel-non-accelerated-property.https.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE html>
-<title>Cancel non accelerated property using worklet animation</title>
-<link rel="help" href="https://drafts.css-houdini.org/css-animationworklet/">
-
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/web-animations/testcommon.js"></script>
-<script src="common.js"></script>
-
-<style>
-#target {
-  background-color: red;
-}
-</style>
-
-<div id="target"></div>
-
-<script>
-  promise_test(async t => {
-    await registerConstantLocalTimeAnimator(1000);
-    const target = document.getElementById('target');
-    const effect = new KeyframeEffect(
-        target,
-        [
-          { background: 'green' },
-          { background: 'blue' },
-        ],
-        {
-          duration: 2000,
-          iteration: Infinity
-        }
-    );
-    const animation = new WorkletAnimation('constant_time', effect);
-    animation.play();
-
-    await waitForAsyncAnimationFrames(1);
-    // establish that the animation started
-    assert_equals(getComputedStyle(target).backgroundColor, "rgb(0, 64, 128)");
-    animation.cancel();
-
-    await waitForAsyncAnimationFrames(1);
-    // confirm the animation is cancelled
-    assert_equals(getComputedStyle(target).backgroundColor, "rgb(255, 0, 0)");
-  }, "Animation should update the outputs after starting and then return to pre-animated values after being cancelled");
-</script>
\ No newline at end of file
diff --git a/testing/web-platform/tests/animation-worklet/current-time.https.html b/testing/web-platform/tests/animation-worklet/current-time.https.html
index a445d5b004f8..402c49307df7 100644
--- a/testing/web-platform/tests/animation-worklet/current-time.https.html
+++ b/testing/web-platform/tests/animation-worklet/current-time.https.html
@@ -2,63 +2,47 @@
 <meta charset=utf-8>
 <title>The current time of a worklet animation</title>
 <link rel="help" href="https://drafts.css-houdini.org/css-animationworklet/">
-
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/web-animations/testcommon.js"></script>
 <script src="common.js"></script>
-
-<div id="box"></div>
-
+<body>
+<div id="log"></div>
 <script>
 'use strict';
 
-function CreateAnimation() {
-  const box = document.getElementById('box');
-  const effect = new KeyframeEffect(
-      box,
-      { height: ['100px', '50px'] },
-      10000);
+const DURATION = 10000; // ms
+const KEYFRAMES = { height : ['100px', '50px'] };
 
-  return new WorkletAnimation('passthrough', effect);
-}
+promise_test(async t => {
+  await registerPassthroughAnimator();
+  const animation =
+    new WorkletAnimation('passthrough', new KeyframeEffect(createDiv(t),
+        KEYFRAMES, DURATION), document.timeline);
 
-setup(setupAndRegisterTests, {explicit_done: true});
+  animation.play();
+  assert_equals(animation.currentTime, 0,
+    'Current time returns the hold time set when entering the play-pending' +
+    'state');
+}, 'The current time returns the hold time when set');
 
-function setupAndRegisterTests() {
-  registerPassthroughAnimator().then(() => {
-    promise_test(async t => {
-      const animation = CreateAnimation();
-      animation.play();
+promise_test(async t => {
+  await registerPassthroughAnimator();
+  const animation =
+    new WorkletAnimation('passthrough', new KeyframeEffect(createDiv(t),
+        KEYFRAMES, DURATION), document.timeline);
 
-      assert_equals(animation.currentTime, 0,
-        'Current time returns the hold time set when entering the play-pending' +
-        'state');
-
-      animation.cancel();
-    }, 'The current time returns the hold time when set');
-
-    promise_test(async t => {
-      const animation = CreateAnimation();
-      animation.play();
-
-      // Allow one async animation frame to pass so that animation is running.
-      await waitForAsyncAnimationFrames(1);
-      assert_equals(animation.playState, "running");
-      // Allow time to advance so that we have a non-zero current time.
-      await waitForDocumentTimelineAdvance();
-      const timelineTime = document.timeline.currentTime;
-      assert_greater_than(animation.currentTime, 0);
-      assert_times_equal(animation.currentTime, (timelineTime - animation.startTime));
-
-      animation.cancel();
-    }, 'The current time is calculated from the timeline time and start time');
-
-    done();
-  });
-}
+  // TODO(majidvp): We should use Animation.startTime here because the
+  // animation may not immediately start.
+  const startTime = document.timeline.currentTime;
+  animation.play();
+  await waitForNextFrame();
+  const timelineTime = document.timeline.currentTime;
+  assert_times_equal(animation.currentTime, (timelineTime - startTime));
+}, 'The current time is calculated from the timeline time and start time');
 
 // TODO(majidvp): Add tests for playbackRate and animations that are not
 // associated with a timeline once these are supported in  WorkletAnimation.
 // http://crbug.com/833846
 </script>
+</body>
diff --git a/testing/web-platform/tests/animation-worklet/multiple-effects-on-same-target-driven-by-individual-local-time.https.html b/testing/web-platform/tests/animation-worklet/multiple-effects-on-same-target-driven-by-individual-local-time.https.html
deleted file mode 100644
index edf8488deda7..000000000000
--- a/testing/web-platform/tests/animation-worklet/multiple-effects-on-same-target-driven-by-individual-local-time.https.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<!DOCTYPE html>
-<title>Multiple effects on same target driven by individual local time</title>
-<link rel="help" href="https://drafts.css-houdini.org/css-animationworklet/">
-
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/web-animations/testcommon.js"></script>
-<script src="common.js"></script>
-
-<style>
-  #target {
-    width: 100px;
-    height: 100px;
-    background-color: green;
-  }
-  #target2 {
-    width: 100px;
-    height: 100px;
-    background-color: blue;
-    box-shadow: 4px 4px 25px blue;
-  }
-</style>
-
-<div id="target"></div>
-
-<script id="simple_animate" type="text/worklet">
-  registerAnimator("test_animator", class {
-    animate(currentTime, effect) {
-      let effects = effect.getChildren();
-      effects[0].localTime = 0;
-      effects[1].localTime = 1000;
-    }
-  });
-</script>
-
-<script>
-  promise_test(async t => {
-    await runInAnimationWorklet(document.getElementById('simple_animate').textContent);
-
-    const effect = new KeyframeEffect(
-        document.getElementById("target"),
-        [
-          { background: 'green' },
-          { background: 'blue' },
-        ],
-        { duration: 2000 }
-    );
-    const effect2 = new KeyframeEffect(
-        document.getElementById("target"),
-        [
-          { width: '100px' },
-          { width: '200px' }
-        ],
-        { duration: 2000 }
-    );
-
-    const animation = new WorkletAnimation('test_animator', [effect, effect2]);
-    animation.play();
-    await waitForAsyncAnimationFrames(1);
-
-    assert_equals(getComputedStyle(document.getElementById('target')).backgroundColor, "rgb(0, 128, 0)");
-    assert_equals(getComputedStyle(document.getElementById('target')).width, "150px");
-  }, `Animating multiple effects on the same target using effect specific local time should output values
-  relative to each effects unique local time`);
-</script>
\ No newline at end of file
diff --git a/testing/web-platform/tests/client-hints/resources/sec-ch-ua.py b/testing/web-platform/tests/client-hints/resources/sec-ch-ua.py
deleted file mode 100644
index a14a27dadf9e..000000000000
--- a/testing/web-platform/tests/client-hints/resources/sec-ch-ua.py
+++ /dev/null
@@ -1,11 +0,0 @@
-def main(request, response):
-    ua = request.headers.get('sec-ch-ua', '')
-    response.headers.set("Content-Type", "text/html")
-    response.headers.set("Accept-CH", "UA")
-    response.headers.set("Accept-CH-Lifetime", "10")
-    response.content = '''
-<script>
-  window.opener.postMessage({ header: "%s" }, "*");
-</script>
-Sec-CH-UA: %s
-''' % (ua, ua)
diff --git a/testing/web-platform/tests/client-hints/sec-ch-ua.http.html b/testing/web-platform/tests/client-hints/sec-ch-ua.http.html
deleted file mode 100644
index e333c605301e..000000000000
--- a/testing/web-platform/tests/client-hints/sec-ch-ua.http.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE html>
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script>
-  promise_test(t => {
-    return new Promise((resolve, reject) => {
-      var w;
-      window.onmessage = e => {
-        assert_equals(e.data.header, "", "The `Sec-CH-UA` header is not delivered.");
-        w.close();
-        resolve();
-      };
-      w = window.open("./resources/sec-ch-ua.py");
-    });
-  }, "Open HTTP window: no `Sec-CH-UA` header.")
-</script>
diff --git a/testing/web-platform/tests/client-hints/sec-ch-ua.https.html b/testing/web-platform/tests/client-hints/sec-ch-ua.https.html
deleted file mode 100644
index b293745365a6..000000000000
--- a/testing/web-platform/tests/client-hints/sec-ch-ua.https.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<head>
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script>
-  var minor = "";
-  promise_test(t => {
-    return new Promise((resolve, reject) => {
-      var w;
-      window.onmessage = e => {
-        try {
-          assert_not_equals(e.data.header, "", "The `Sec-CH-UA` header is delivered.");
-          minor = e.data.header;
-        } catch (ex) {
-          reject(ex);
-        }
-        w.close();
-        resolve();
-      };
-      w = window.open("./resources/sec-ch-ua.py");
-    });
-  }, "Open HTTPS window prior to opt-in: `Sec-CH-UA` header with minor version.")
-
-  promise_test(t => {
-    return new Promise((resolve, reject) => {
-      var w;
-      window.onmessage = e => {
-        try {
-          assert_not_equals(e.data.header, "", "The `Sec-CH-UA` header is delivered.");
-          assert_not_equals(e.data.header, minor, "The `Sec-CH-UA` header is different after the opt-in than before.");
-        } catch (ex) {
-          reject(ex);
-        }
-        w.close();
-        resolve();
-      };
-      w = window.open("./resources/sec-ch-ua.py");
-    });
-  }, "Open HTTPS window post-opt-in: `Sec-CH-UA` header with minor version.")
-</script>
-</head>
diff --git a/testing/web-platform/tests/clipboard-apis/async-navigator-clipboard-basics.https.html b/testing/web-platform/tests/clipboard-apis/async-navigator-clipboard-basics.https.html
index 3c1a0af76c26..5a23598fb0bd 100644
--- a/testing/web-platform/tests/clipboard-apis/async-navigator-clipboard-basics.https.html
+++ b/testing/web-platform/tests/clipboard-apis/async-navigator-clipboard-basics.https.html
@@ -11,14 +11,12 @@ test(() => {
   assert_equals(navigator.clipboard, navigator.clipboard);
 }, "navigator.clipboard exists");
 
-/* clipboard.write(text/plain Blob) */
+/* clipboard.write(Blob/text) */
 
 promise_test(async () => {
   const blob = new Blob(["hello"], {type: 'text/plain'});
   await navigator.clipboard.write(blob);
-}, "navigator.clipboard.write(text/plain Blob) succeeds");
-
-/* clipboard.write(invalid input) */
+}, "navigator.clipboard.write(Blob) succeeds");
 
 promise_test(async t => {
   await promise_rejects(t, new TypeError(),
@@ -47,7 +45,7 @@ promise_test(async t => {
                          navigator.clipboard.writeText());
 }, "navigator.clipboard.writeText() fails (expect DOMString)");
 
-/* clipboard.write(image/png Blob) */
+/* clipboard.write(Blob/image) */
 
 promise_test(async () => {
   const fetched = await fetch(
@@ -55,9 +53,15 @@ promise_test(async () => {
   const image = await fetched.blob();
 
   await navigator.clipboard.write(image);
-}, "navigator.clipboard.write(image/png Blob) succeeds");
+}, "navigator.clipboard.writeImageExperimental(Blob) succeeds");
 
-/* text/plain or image/png Blob clipboard.read() */
+promise_test(async t => {
+  await promise_rejects(t, new TypeError(),
+                        navigator.clipboard.write());
+}, "navigator.clipboard.writeImageExperimental() fails (expect Blob)");
+
+
+/* Blob/text or Blob/image clipboard.read() */
 
 promise_test(async () => {
   const result = await navigator.clipboard.read();
diff --git a/testing/web-platform/tests/clipboard-apis/async-write-blobtext-read-blobtext-manual.https.html b/testing/web-platform/tests/clipboard-apis/async-write-blobtext-read-blobtext-manual.https.html
index ea6e93695179..f860bf23db2e 100644
--- a/testing/web-platform/tests/clipboard-apis/async-write-blobtext-read-blobtext-manual.https.html
+++ b/testing/web-platform/tests/clipboard-apis/async-write-blobtext-read-blobtext-manual.https.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>Async Clipboard write (text/plain Blob) -> read (text/plain Blob) tests</title>
+<title>Async Clipboard write (Blob/text) -> read (Blob/text) tests</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script>
@@ -17,7 +17,7 @@ async function readWriteTest(textInput) {
   }, "Verify write and read clipboard given text: " + textInput);
 }
 
-readWriteTest("Clipboard write (text/plain Blob) -> read (text/plain Blob) test");
+readWriteTest("Clipboard write (Blob/text) -> read (Blob/text) test");
 readWriteTest("non-Latin1 text encoding test データ");
 </script>
 <p>
diff --git a/testing/web-platform/tests/clipboard-apis/async-write-blobtext-read-text-manual.https.html b/testing/web-platform/tests/clipboard-apis/async-write-blobtext-read-text-manual.https.html
index ecb744a65704..685b6cb603dd 100644
--- a/testing/web-platform/tests/clipboard-apis/async-write-blobtext-read-text-manual.https.html
+++ b/testing/web-platform/tests/clipboard-apis/async-write-blobtext-read-text-manual.https.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>Async Clipboard write (text/plain Blob) -> readText tests</title>
+<title>Async Clipboard write (Blob/text) -> readText tests</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script>
@@ -15,7 +15,7 @@ async function readWriteTest(textInput) {
   }, "Verify write and read clipboard given text: " + textInput);
 }
 
-readWriteTest("Clipboard write (text/plain Blob) -> read text test");
+readWriteTest("Clipboard write (Blob/text) -> read text test");
 readWriteTest("non-Latin1 text encoding test データ");
 </script>
 <p>
diff --git a/testing/web-platform/tests/clipboard-apis/async-write-image-read-image-manual.https.html b/testing/web-platform/tests/clipboard-apis/async-write-image-read-image-manual.https.html
index a8e2956b7e14..ee90e7e89a89 100644
--- a/testing/web-platform/tests/clipboard-apis/async-write-image-read-image-manual.https.html
+++ b/testing/web-platform/tests/clipboard-apis/async-write-image-read-image-manual.https.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
 <title>
-  Async Clipboard write image/png Blob -> read image/png Blob tests
+  Async Clipboard writeImageExperimental -> readImageExperimental tests
 </title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff --git a/testing/web-platform/tests/clipboard-apis/async-write-text-read-blobtext-manual.https.html b/testing/web-platform/tests/clipboard-apis/async-write-text-read-blobtext-manual.https.html
index 7e682f1dbdd4..69f72db82c07 100644
--- a/testing/web-platform/tests/clipboard-apis/async-write-text-read-blobtext-manual.https.html
+++ b/testing/web-platform/tests/clipboard-apis/async-write-text-read-blobtext-manual.https.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>Async Clipboard writeText -> read (text/plain Blob) tests</title>
+<title>Async Clipboard writeText -> read (Blob/text) tests</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script>
@@ -15,7 +15,7 @@ async function readWriteTest(textInput) {
   }, "Verify write and read clipboard given text: " + textInput);
 }
 
-readWriteTest("Clipboard write text -> read (text/plain Blob) test");
+readWriteTest("Clipboard write text -> read (Blob/text) test");
 readWriteTest("non-Latin1 text encoding test データ");
 </script>
 <p>
diff --git a/testing/web-platform/tests/common/security-features/README.md b/testing/web-platform/tests/common/security-features/README.md
deleted file mode 100644
index 45cd74ede74d..000000000000
--- a/testing/web-platform/tests/common/security-features/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-This directory contains the common infrastructure for the following tests.
-- referrer-policy/
-- mixed-content/
-- upgrade-insecure-requests/
diff --git a/testing/web-platform/tests/common/sleep.py b/testing/web-platform/tests/common/sleep.py
index afc0a7c26e1c..28065eff5fc9 100644
--- a/testing/web-platform/tests/common/sleep.py
+++ b/testing/web-platform/tests/common/sleep.py
@@ -5,8 +5,4 @@ import time
 sleep_padding = 15.0
 
 def sleep_at_least(sleep_in_ms):
-    sleep_until = time.time() + (sleep_in_ms / 1E3)
-    time.sleep((sleep_in_ms + sleep_padding) / 1E3)
-    # Check if the padding was sufficient; if not, sleep again.
-    while time.time() < sleep_until:
-        time.sleep(sleep_padding / 1E3)
+    time.sleep((sleep_in_ms + sleep_padding) / 1E3);
diff --git a/testing/web-platform/tests/css/CSS2/text/text-indent-wrap-001-notref-block-margin.xht b/testing/web-platform/tests/css/CSS2/text/text-indent-wrap-001-notref-block-margin.xht
index fdae290bc6f1..37852d9253c4 100644
--- a/testing/web-platform/tests/css/CSS2/text/text-indent-wrap-001-notref-block-margin.xht
+++ b/testing/web-platform/tests/css/CSS2/text/text-indent-wrap-001-notref-block-margin.xht
@@ -2,7 +2,6 @@
 <title>CSS Reftest Reference</title>
 <link rel="author" title="L. David Baron" href="https://dbaron.org/" />
 <link rel="author" title="Mozilla Corporation" href="http://mozilla.com/" />
-<link rel="mismatch" href="text-indent-wrap-001-ref-inline-margin.xht"/>
 <meta name="flags" content="" />
 <style type="text/css">
 p { margin-left: 100px }
diff --git a/testing/web-platform/tests/css/CSS2/text/text-indent-wrap-001-ref-float.xht b/testing/web-platform/tests/css/CSS2/text/text-indent-wrap-001-ref-float.xht
index 8c8c4a5e72d4..18809f0adbf3 100644
--- a/testing/web-platform/tests/css/CSS2/text/text-indent-wrap-001-ref-float.xht
+++ b/testing/web-platform/tests/css/CSS2/text/text-indent-wrap-001-ref-float.xht
@@ -2,7 +2,7 @@
 <title>CSS Reftest Reference</title>
 <link rel="author" title="L. David Baron" href="https://dbaron.org/" />
 <link rel="author" title="Mozilla Corporation" href="http://mozilla.com/" />
-<link rel="mismatch" href="text-indent-wrap-001-notref-block-margin.xht"/>
+<link rel="match" href="text-indent-wrap-001-ref-inline-margin.xht"/>
 <meta name="flags" content="" />
 <style type="text/css">
 i { float: left; height: 0.3em; width: 100px; }
diff --git a/testing/web-platform/tests/css/CSS2/text/text-indent-wrap-001.xht b/testing/web-platform/tests/css/CSS2/text/text-indent-wrap-001.xht
index 31c226631ae8..dc4c9b3abd29 100644
--- a/testing/web-platform/tests/css/CSS2/text/text-indent-wrap-001.xht
+++ b/testing/web-platform/tests/css/CSS2/text/text-indent-wrap-001.xht
@@ -4,6 +4,7 @@
 <link rel="author" title="Mozilla Corporation" href="http://mozilla.com/" />
 <link rel="help" href="http://www.w3.org/TR/CSS21/text.html#indentation-prop" />
 <link rel="match" href="text-indent-wrap-001-ref-inline-margin.xht"/>
+<link rel="mismatch" href="text-indent-wrap-001-notref-block-margin.xht"/>
 <meta name="flags" content="" />
 <style type="text/css">
 p { text-indent: 100px }
@@ -14,4 +15,4 @@ span { background: yellow }
 <p><span>This is a long piece of text that will wrap to multiple lines.  This is a long piece of text that will wrap to multiple lines.  This is a long piece of text that will wrap to multiple lines.  This is a long piece of text that will wrap to multiple lines.  This is a long piece of text that will wrap to multiple lines.  This is a long piece of text that will wrap to multiple lines.  This is a long piece of text that will wrap to multiple lines.  This is a long piece of text that will wrap to multiple lines.  This is a long piece of text that will wrap to multiple lines.  This is a long piece of text that will wrap to multiple lines.  This is a long piece of text that will wrap to multiple lines.  This is a long piece of text that will wrap to multiple lines.</span></p>
 
 
-</body></html>
+</body></html>
\ No newline at end of file
diff --git a/testing/web-platform/tests/css/css-backgrounds/border-bottom-left-radius-003.xht b/testing/web-platform/tests/css/css-backgrounds/border-bottom-left-radius-003.xht
new file mode 100644
index 000000000000..312211138d23
--- /dev/null
+++ b/testing/web-platform/tests/css/css-backgrounds/border-bottom-left-radius-003.xht
@@ -0,0 +1,64 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <title>CSS Test: Borders. Border-bottom-left-radius using two length values: 40px 20px</title>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+		<meta http-equiv="Content-Style-Type" content="text/css" />
+        <meta http-equiv="Content-Script-Type" content="text/javascript" />
+        <link rel="author" title="Nokia" href="http://www.nokia.com/" />
+        <link rel="help" href="http://www.w3.org/TR/css3-background/#the-border-radius" />
+        <link rel="match" href="border-bottom-left-radius-004.xht" />
+        <meta name="flags" content="" />
+        <meta name="assert" content="To verify border-bottom-left-radius property set to two length values, works as expected" />
+        <style type="text/css">
+        /* <![CDATA[ */
+        	div
+			{
+        		border:2px solid #a1a1a1;
+        		background:#dddddd;
+        		width:200px;
+        		height: 100px;
+        		border-bottom-left-radius: 40px 20px;
+        	}
+        /* ]]> */
+        </style>
+<!--
+        <script type="text/javascript" src="js/css3_test_helper.js"></script>
+-->
+    </head>
+    <body>
+		<p>
+			There should be a box with a rounded bottom left corner.
+		</p>
+		 <!-- PASS AND FAIL CRITERIA ARE IN THE LIST BELOW -->
+				<ul>
+					<li>PASS if only bottom left corner is rounded.</li>
+					<li>FAIL if the output is not as expected.</li>
+				</ul>
+
+         <!-- PLACE TEST CONTENT FROM HERE -->
+
+    	<div id="test"></div>
+    	<p><br/></p>
+<!--
+    	<script type="text/javascript">
+        /* <![CDATA[ */
+        	var expectedBorderRadius = "40px 20px";
+
+        	var testResult = check_CSS_property("border-bottom-left-radius", expectedBorderRadius);
+
+        	// if (testResult.pass)
+        	  /* This portion of the code has been removed to ensure that the test case is not automated */
+        	// else
+        		/* This portion of the code has been removed to ensure that the test case is not automated */
+
+
+
+          if (top.FrameEnabled)	top.fnLog(testResult);
+
+        /* ]]> */
+        </script>
+-->
+    </body>
+</html>
+
diff --git a/testing/web-platform/tests/css/css-backgrounds/border-bottom-left-radius-004-ref.xht b/testing/web-platform/tests/css/css-backgrounds/border-bottom-left-radius-004-ref.xht
deleted file mode 100644
index 15732f1c068b..000000000000
--- a/testing/web-platform/tests/css/css-backgrounds/border-bottom-left-radius-004-ref.xht
+++ /dev/null
@@ -1,23 +0,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <title>border-bottom-left-radius: 48px 28px reference</title>
-    <style type="text/css">
-      div
-      {
-          width: 200px;
-          height: 100px;
-
-          background: orange;
-          border: 20px solid teal;
-          border-bottom-left-radius: 48px 28px;
-      }
-    </style>
-  </head>
-  <body>
-    <p>The box should have a border-bottom-left-radius of 48px 28px. The
-        horizontal radius should therefore be clearly larger than the
-        vertical radius.</p>
-    <div></div>
-  </body>
-</html>
-
diff --git a/testing/web-platform/tests/css/css-backgrounds/border-bottom-left-radius-004.xht b/testing/web-platform/tests/css/css-backgrounds/border-bottom-left-radius-004.xht
index 92bcec5d16f8..01ff790f9d75 100644
--- a/testing/web-platform/tests/css/css-backgrounds/border-bottom-left-radius-004.xht
+++ b/testing/web-platform/tests/css/css-backgrounds/border-bottom-left-radius-004.xht
@@ -1,25 +1,64 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <title>border-bottom-left-radius using one percentage</title>
-    <link rel="match" href="border-bottom-left-radius-004-ref.xht" />
-    <link rel="help" href="https://drafts.csswg.org/css-backgrounds/#border-radius" />
-    <style type="text/css">
-      div
-      {
-          width: 200px;
-          height: 100px;
+    <head>
+        <title>CSS Test: Borders. Border-bottom-left-radius using one percentage value: 20%</title>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+		<meta http-equiv="Content-Style-Type" content="text/css" />
+        <meta http-equiv="Content-Script-Type" content="text/javascript" />
+        <link rel="author" title="Nokia" href="http://www.nokia.com/" />
+        <link rel="help" href="http://www.w3.org/TR/css3-background/#the-border-radius" />
+        <link rel="match" href="border-bottom-left-radius-003.xht" />
+        <meta name="flags" content="" />
+        <meta name="assert" content="To verify border-bottom-left-radius property set to percentage value, works as expected" />
+        <style type="text/css">
+        /* <![CDATA[ */
+        	div
+            {
+        		border:2px solid #a1a1a1;
+        		background:#dddddd;
+        		width:200px;
+        		height: 100px;
+        		border-bottom-left-radius: 20%;
+        	}
+        /* ]]> */
+        </style>
+<!--
+        <script type="text/javascript" src="js/css3_test_helper.js"></script>
+-->
+    </head>
+    <body>
+    	<p>
+			There should be a box with a rounded bottom left corner.
+		</p>
+		 <!-- PASS AND FAIL CRITERIA ARE IN THE LIST BELOW -->
+				<ul>
+					<li>PASS if only bottom left corner is rounded.</li>
+					<li>FAIL if the output is not as expected.</li>
+				</ul>
 
-          background: orange;
-          border: 20px solid teal;
-          border-bottom-left-radius: 20%;
-      }
-    </style>
-  </head>
-  <body>
-    <p>The box should have a border-bottom-left-radius of 48px 28px. The
-        horizontal radius should therefore be clearly larger than the
-        vertical radius.</p>
-    <div></div>
-  </body>
+         <!-- PLACE TEST CONTENT FROM HERE -->
+
+    	<div id="test"></div>
+    	<p><br/></p>
+<!--
+    	<script type="text/javascript">
+        /* <![CDATA[ */
+        	var expectedBorderRadius = "20%";
+
+        	var testResult = check_CSS_property("border-bottom-left-radius", expectedBorderRadius);
+
+        	// if (testResult.pass)
+        	  /* This portion of the code has been removed to ensure that the test case is not automated */
+        	// else
+        		/* This portion of the code has been removed to ensure that the test case is not automated */
+
+
+
+          if (top.FrameEnabled)	top.fnLog(testResult);
+
+        /* ]]> */
+       </script>
+-->
+    </body>
 </html>
 
diff --git a/testing/web-platform/tests/css/css-backgrounds/border-bottom-left-radius-005-ref.xht b/testing/web-platform/tests/css/css-backgrounds/border-bottom-left-radius-005-ref.xht
deleted file mode 100644
index 26621b9a75c3..000000000000
--- a/testing/web-platform/tests/css/css-backgrounds/border-bottom-left-radius-005-ref.xht
+++ /dev/null
@@ -1,22 +0,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <title>border-bottom-left-radius: 48px 14px reference</title>
-    <style type="text/css">
-      div
-      {
-          width: 200px;
-          height: 100px;
-
-          background: orange;
-          border: 20px solid teal;
-          border-bottom-left-radius: 48px 14px;
-      }
-    </style>
-  </head>
-  <body>
-    <p>The box should have a border-bottom-left-radius of 48px 14px. The
-        horizontal radius should therefore be clearly larger than the
-        vertical radius.</p>
-    <div></div>
-  </body>
-</html>
diff --git a/testing/web-platform/tests/css/css-backgrounds/border-bottom-left-radius-005.xht b/testing/web-platform/tests/css/css-backgrounds/border-bottom-left-radius-005.xht
index cc9fee12108c..04d8a849238e 100644
--- a/testing/web-platform/tests/css/css-backgrounds/border-bottom-left-radius-005.xht
+++ b/testing/web-platform/tests/css/css-backgrounds/border-bottom-left-radius-005.xht
@@ -1,24 +1,63 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <title>border-bottom-left-radius using two percentages</title>
-    <link rel="match" href="border-bottom-left-radius-005-ref.xht" />
-    <link rel="help" href="https://drafts.csswg.org/css-backgrounds/#border-radius" />
-    <style type="text/css">
-      div
-      {
-          width: 200px;
-          height: 100px;
+    <head>
+        <title>CSS Test: Borders. Border-bottom-left-radius using two percentage values: 20% 30%</title>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+		<meta http-equiv="Content-Style-Type" content="text/css" />
+        <meta http-equiv="Content-Script-Type" content="text/javascript" />
+        <link rel="author" title="Nokia" href="http://www.nokia.com/" />
+        <link rel="help" href="http://www.w3.org/TR/css3-background/#the-border-radius" />
+        <link rel="match" href="border-bottom-left-radius-006.xht" />
+        <meta name="flags" content="" />
+        <meta name="assert" content="To verify border-bottom-left-radius property set to two precentage value, works as expected" />
+        <style type="text/css">
+        /* <![CDATA[ */
+        	div
+          {
+        		border:2px solid #a1a1a1;
+        		background:#dddddd;
+        		width:200px;
+        		height: 100px;
+        		border-bottom-left-radius: 20% 30%;
+        	}
+        /* ]]> */
+        </style>
+<!--
+        <script type="text/javascript" src="js/css3_test_helper.js"></script>
+-->
+    </head>
+    <body>
+    	<p>
+			There should be a box with a rounded bottom left corner.
+		</p>
+		 <!-- PASS AND FAIL CRITERIA ARE IN THE LIST BELOW -->
+				<ul>
+					<li>PASS if only bottom left corner is rounded.</li>
+					<li>FAIL if the output is not as expected.</li>
+				</ul>
 
-          background: orange;
-          border: 20px solid teal;
-          border-bottom-left-radius: 20% 10%;
-      }
-    </style>
-  </head>
-  <body>
-    <p>The box should have a border-bottom-left-radius of 48px 14px. The
-        horizontal radius should therefore be clearly larger than the
-        vertical radius.</p>
-    <div></div>
-  </body>
+         <!-- PLACE TEST CONTENT FROM HERE -->
+    	<div id="test"></div>
+    	<p><br/></p>
+<!--
+    	<script type="text/javascript">
+        /* <![CDATA[ */
+        	var expectedBorderRadius = "20% 30%";
+
+        	var testResult = check_CSS_property("border-bottom-left-radius", expectedBorderRadius);
+
+        	// if (testResult.pass)
+        	  /* This portion of the code has been removed to ensure that the test case is not automated */
+        	// else
+        		/* This portion of the code has been removed to ensure that the test case is not automated */
+
+
+
+          if (top.FrameEnabled)	top.fnLog(testResult);
+
+        /* ]]> */
+        </script>
+-->
+    </body>
 </html>
+
diff --git a/testing/web-platform/tests/css/css-backgrounds/border-bottom-left-radius-006.xht b/testing/web-platform/tests/css/css-backgrounds/border-bottom-left-radius-006.xht
new file mode 100644
index 000000000000..8f522644c849
--- /dev/null
+++ b/testing/web-platform/tests/css/css-backgrounds/border-bottom-left-radius-006.xht
@@ -0,0 +1,63 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <title>CSS Test: Borders. Border-bottom-left-radius using two values: 40px 30%</title>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+		<meta http-equiv="Content-Style-Type" content="text/css" />
+        <meta http-equiv="Content-Script-Type" content="text/javascript" />
+        <link rel="author" title="Nokia" href="http://www.nokia.com/" />
+        <link rel="help" href="http://www.w3.org/TR/css3-background/#the-border-radius" />
+        <link rel="match" href="border-bottom-left-radius-005.xht" />
+        <meta name="flags" content="" />
+        <meta name="assert" content="To verify border-bottom-left-radius property set to two values in different unit, works fine" />
+        <style type="text/css">
+        /* <![CDATA[ */
+        	div
+           {
+        		border:2px solid #a1a1a1;
+        		background:#dddddd;
+        		width:200px;
+        		height: 100px;
+        		border-bottom-left-radius: 40px 30%;
+        	}
+        /* ]]> */
+      </style>
+<!--
+        <script type="text/javascript" src="js/css3_test_helper.js"></script>
+-->
+    </head>
+    <body>
+    	<p>
+			There should be a box with a rounded bottom left corner.
+		</p>
+		 <!-- PASS AND FAIL CRITERIA ARE IN THE LIST BELOW -->
+				<ul>
+					<li>PASS if only bottom left corner is rounded.</li>
+					<li>FAIL if the output is not as expected.</li>
+				</ul>
+
+         <!-- PLACE TEST CONTENT FROM HERE -->
+    	<div id="test"></div>
+    	<p><br/></p>
+<!--
+    	<script type="text/javascript">
+        /* <![CDATA[ */
+        	var expectedBorderRadius = "40px 30%";
+
+        	var testResult = check_CSS_property("border-bottom-left-radius", expectedBorderRadius);
+
+        	// if (testResult.pass)
+        	  /* This portion of the code has been removed to ensure that the test case is not automated */
+        	// else
+        		/* This portion of the code has been removed to ensure that the test case is not automated */
+
+
+
+          if (top.FrameEnabled)	top.fnLog(testResult);
+
+        /* ]]> */
+        </script>
+-->
+    </body>
+</html>
+
diff --git a/testing/web-platform/tests/css/css-backgrounds/border-bottom-left-radius-007.xht b/testing/web-platform/tests/css/css-backgrounds/border-bottom-left-radius-007.xht
new file mode 100644
index 000000000000..54bd5bd352f2
--- /dev/null
+++ b/testing/web-platform/tests/css/css-backgrounds/border-bottom-left-radius-007.xht
@@ -0,0 +1,63 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <title>CSS Test: Borders. Border-bottom-left-radius using two values: 20% 25px</title>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+		<meta http-equiv="Content-Style-Type" content="text/css" />
+        <meta http-equiv="Content-Script-Type" content="text/javascript" />
+        <link rel="author" title="Nokia" href="http://www.nokia.com/" />
+        <link rel="help" href="http://www.w3.org/TR/css3-background/#the-border-radius" />
+        <link rel="match" href="border-bottom-left-radius-009.xht" />
+        <meta name="flags" content="" />
+        <meta name="assert" content="To verify border-bottom-left-radius property set to two values in different unit, works fine" />
+        <style type="text/css">
+        /* <![CDATA[ */
+        	div
+            {
+        		border:2px solid #a1a1a1;
+        		background:#dddddd;
+        		width:200px;
+        		height: 100px;
+        		border-bottom-left-radius: 20% 25px;
+        	}
+        /* ]]> */
+        </style>
+<!--
+        <script type="text/javascript" src="js/css3_test_helper.js"></script>
+-->
+    </head>
+    <body>
+    	<p>
+			There should be a box with a rounded bottom left corner.
+		</p>
+		 <!-- PASS AND FAIL CRITERIA ARE IN THE LIST BELOW -->
+				<ul>
+					<li>PASS if only bottom left corner is rounded.</li>
+					<li>FAIL if the output is not as expected.</li>
+				</ul>
+
+         <!-- PLACE TEST CONTENT FROM HERE -->
+    	<div id="test"></div>
+    	<p><br/></p>
+<!--
+    	<script type="text/javascript">
+        /* <![CDATA[ */
+        	var expectedBorderRadius = "20% 25px";
+
+        	var testResult = check_CSS_property("border-bottom-left-radius", expectedBorderRadius);
+
+        	// if (testResult.pass)
+        	  /* This portion of the code has been removed to ensure that the test case is not automated */
+        	// else
+        		/* This portion of the code has been removed to ensure that the test case is not automated */
+
+
+
+          if (top.FrameEnabled)	top.fnLog(testResult);
+
+        /* ]]> */
+       </script>
+-->
+    </body>
+</html>
+
diff --git a/testing/web-platform/tests/css/css-backgrounds/border-bottom-left-radius-008.xht b/testing/web-platform/tests/css/css-backgrounds/border-bottom-left-radius-008.xht
new file mode 100644
index 000000000000..33876eeb3ba9
--- /dev/null
+++ b/testing/web-platform/tests/css/css-backgrounds/border-bottom-left-radius-008.xht
@@ -0,0 +1,62 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <title>CSS Test: Borders. Border-bottom-left-radius using two values: 4em 30%</title>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+		<meta http-equiv="Content-Style-Type" content="text/css" />
+        <meta http-equiv="Content-Script-Type" content="text/javascript" />
+        <link rel="author" title="Nokia" href="http://www.nokia.com/" />
+        <link rel="help" href="http://www.w3.org/TR/css3-background/#the-border-radius" />
+        <meta name="flags" content="" />
+        <meta name="assert" content="To verify border-bottom-left-radius property set to two values in different units, works fine" />
+        <style type="text/css">
+        /* <![CDATA[ */
+        	div
+            {
+        		border:2px solid #a1a1a1;
+        		background:#dddddd;
+        		width:200px;
+        		height: 100px;
+        		border-bottom-left-radius: 4em 30%;
+        	}
+        /* ]]> */
+        </style>
+<!--
+        <script type="text/javascript" src="js/css3_test_helper.js"></script>
+-->
+    </head>
+    <body>
+    	<p>
+			There should be a box with a rounded bottom left corner.
+		</p>
+		 <!-- PASS AND FAIL CRITERIA ARE IN THE LIST BELOW -->
+				<ul>
+					<li>PASS if only bottom left corner is rounded.</li>
+					<li>FAIL if the output is not as expected.</li>
+				</ul>
+
+         <!-- PLACE TEST CONTENT FROM HERE -->
+    	<div id="test"></div>
+    	<p><br/></p>
+<!--
+    	<script type="text/javascript">
+        /* <![CDATA[ */
+        	var expectedBorderRadius = "64px 30%";
+
+        	var testResult = check_CSS_property("border-bottom-left-radius", expectedBorderRadius);
+
+        	// if (testResult.pass)
+        	  /* This portion of the code has been removed to ensure that the test case is not automated */
+        	// else
+        		/* This portion of the code has been removed to ensure that the test case is not automated */
+
+
+
+          if (top.FrameEnabled)	top.fnLog(testResult);
+
+        /* ]]> */
+        </script>
+-->
+    </body>
+</html>
+
diff --git a/testing/web-platform/tests/css/css-backgrounds/border-bottom-left-radius-009.xht b/testing/web-platform/tests/css/css-backgrounds/border-bottom-left-radius-009.xht
new file mode 100644
index 000000000000..17df815ff453
--- /dev/null
+++ b/testing/web-platform/tests/css/css-backgrounds/border-bottom-left-radius-009.xht
@@ -0,0 +1,67 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <title>CSS Test: Borders. Border-bottom-left-radius using &quot;inherit&quot;</title>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+		<meta http-equiv="Content-Style-Type" content="text/css" />
+        <meta http-equiv="Content-Script-Type" content="text/javascript" />
+        <link rel="author" title="Nokia" href="http://www.nokia.com/" />
+        <link rel="help" href="http://www.w3.org/TR/css3-background/#the-border-radius" />
+        <link rel="match" href="border-bottom-left-radius-007.xht" />
+       <meta name="flags" content="" />
+        <meta name="assert" content="To verify if inherit feature works, when assigned to border-bottom-left-radius" />
+        <style type="text/css">
+        /* <![CDATA[ */
+        	body
+        	{
+        		border-bottom-left-radius: 20% 25px;
+        	}
+        	div
+            {
+        		border:2px solid #a1a1a1;
+        		background:#dddddd;
+        		width:200px;
+        		height: 100px;
+        		border-bottom-left-radius: inherit;
+        	}
+        /* ]]> */
+        </style>
+<!--
+        <script type="text/javascript" src="js/css3_test_helper.js"></script>
+-->
+    </head>
+    <body>
+    	<p>
+			There should be a box with a rounded bottom left corner.
+		</p>
+		 <!-- PASS AND FAIL CRITERIA ARE IN THE LIST BELOW -->
+				<ul>
+					<li>PASS if only bottom left corner is rounded.</li>
+					<li>FAIL if the output is not as expected.</li>
+				</ul>
+
+         <!-- PLACE TEST CONTENT FROM HERE -->
+    	<div id="test"></div>
+    	<p><br/></p>
+<!--
+    	<script type="text/javascript">
+        /* <![CDATA[ */
+        	var expectedBorderRadius = "20% 25px";
+
+        	var testResult = check_CSS_property("border-bottom-left-radius", expectedBorderRadius);
+
+        	// if (testResult.pass)
+        	  /* This portion of the code has been removed to ensure that the test case is not automated */
+        	// else
+        		/* This portion of the code has been removed to ensure that the test case is not automated */
+
+
+
+          if (top.FrameEnabled)	top.fnLog(testResult);
+
+        /* ]]> */
+        </script>
+-->
+    </body>
+</html>
+
diff --git a/testing/web-platform/tests/css/css-backgrounds/border-bottom-right-radius-003.xht b/testing/web-platform/tests/css/css-backgrounds/border-bottom-right-radius-003.xht
new file mode 100644
index 000000000000..ba13706e1fc1
--- /dev/null
+++ b/testing/web-platform/tests/css/css-backgrounds/border-bottom-right-radius-003.xht
@@ -0,0 +1,63 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <title>CSS Test: Borders. Border-bottom-right-radius using two length values: 40px 20px</title>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+		<meta http-equiv="Content-Style-Type" content="text/css" />
+        <meta http-equiv="Content-Script-Type" content="text/javascript" />
+        <link rel="author" title="Nokia" href="http://www.nokia.com/" />
+        <link rel="help" href="http://www.w3.org/TR/css3-background/#the-border-radius" />
+        <link rel="match" href="border-bottom-right-radius-004.xht" />
+        <meta name="flags" content="" />
+        <meta name="assert" content="To verify border-bottom-right-radius property set with two length values, works as expected" />
+        <style type="text/css">
+        /* <![CDATA[ */
+        	div
+            {
+        		border:2px solid #a1a1a1;
+        		background:#dddddd;
+        		width:200px;
+        		height: 100px;
+        		border-bottom-right-radius: 40px 20px;
+        	}
+        /* ]]> */
+        </style>
+<!--
+        <script type="text/javascript" src="js/css3_test_helper.js"></script>
+-->
+    </head>
+    <body>
+    	 <p>
+			There should be a box with a rounded bottom right corner.
+		 </p>
+		 <!-- PASS AND FAIL CRITERIA ARE IN THE LIST BELOW -->
+				<ul>
+					<li>PASS if only bottom right corner is rounded.</li>
+					<li>FAIL if the output is not as expected.</li>
+				</ul>
+
+         <!-- PLACE TEST CONTENT FROM HERE -->
+    	<div id="test"></div>
+    	<p><br/></p>
+<!--
+    	<script type="text/javascript">
+        /* <![CDATA[ */
+        	var expectedBorderRadius = "40px 20px";
+
+        	var testResult = check_CSS_property("border-bottom-right-radius", expectedBorderRadius);
+
+        	// if (testResult.pass)
+        	  /* This portion of the code has been removed to ensure that the test case is not automated */
+        	// else
+        		/* This portion of the code has been removed to ensure that the test case is not automated */
+
+
+
+          if (top.FrameEnabled)	top.fnLog(testResult);
+
+        /* ]]> */
+       </script>
+-->
+    </body>
+</html>
+
diff --git a/testing/web-platform/tests/css/css-backgrounds/border-bottom-right-radius-004-ref.xht b/testing/web-platform/tests/css/css-backgrounds/border-bottom-right-radius-004-ref.xht
deleted file mode 100644
index 8589ee96b117..000000000000
--- a/testing/web-platform/tests/css/css-backgrounds/border-bottom-right-radius-004-ref.xht
+++ /dev/null
@@ -1,23 +0,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <title>border-bottom-right-radius: 48px 28px reference</title>
-    <style type="text/css">
-      div
-      {
-          width: 200px;
-          height: 100px;
-
-          background: orange;
-          border: 20px solid teal;
-          border-bottom-right-radius: 48px 28px;
-      }
-    </style>
-  </head>
-  <body>
-    <p>The box should have a border-bottom-right-radius of 48px 28px. The
-        horizontal radius should therefore be clearly larger than the
-        vertical radius.</p>
-    <div></div>
-  </body>
-</html>
-
diff --git a/testing/web-platform/tests/css/css-backgrounds/border-bottom-right-radius-004.xht b/testing/web-platform/tests/css/css-backgrounds/border-bottom-right-radius-004.xht
index d9bbcf95900a..907ed8255e6d 100644
--- a/testing/web-platform/tests/css/css-backgrounds/border-bottom-right-radius-004.xht
+++ b/testing/web-platform/tests/css/css-backgrounds/border-bottom-right-radius-004.xht
@@ -1,25 +1,63 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <title>border-bottom-right-radius using one percentage</title>
-    <link rel="match" href="border-bottom-right-radius-004-ref.xht" />
-    <link rel="help" href="https://drafts.csswg.org/css-backgrounds/#border-radius" />
-    <style type="text/css">
-      div
-      {
-          width: 200px;
-          height: 100px;
+    <head>
+        <title>CSS Test: Borders. Border-bottom-right-radius using one percentage value: 20%</title>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+		<meta http-equiv="Content-Style-Type" content="text/css" />
+        <meta http-equiv="Content-Script-Type" content="text/javascript" />
+        <link rel="author" title="Nokia" href="http://www.nokia.com/" />
+        <link rel="help" href="http://www.w3.org/TR/css3-background/#the-border-radius" />
+        <link rel="match" href="border-bottom-right-radius-003.xht" />
+        <meta name="flags" content="" />
+        <meta name="assert" content="To verify border-bottom-right-radius property set with one percentage value, works as expected" />
+        <style type="text/css">
+        /* <![CDATA[ */
+        	div
+          {
+        		border:2px solid #a1a1a1;
+        		background:#dddddd;
+        		width:200px;
+        		height: 100px;
+        		border-bottom-right-radius: 20%;
+        	}
+        /* ]]> */
+        </style>
+<!--
+        <script type="text/javascript" src="js/css3_test_helper.js"></script>
+-->
+    </head>
+    <body>
+    	<p>
+			There should be a box with a rounded bottom right corner.
+		</p>
+		 <!-- PASS AND FAIL CRITERIA ARE IN THE LIST BELOW -->
+				<ul>
+					<li>PASS if only bottom right corner is rounded.</li>
+					<li>FAIL if the output is not as expected.</li>
+				</ul>
 
-          background: orange;
-          border: 20px solid teal;
-          border-bottom-right-radius: 20%;
-      }
-    </style>
-  </head>
-  <body>
-    <p>The box should have a border-bottom-right-radius of 48px 28px. The
-        horizontal radius should therefore be clearly larger than the
-        vertical radius.</p>
-    <div></div>
-  </body>
+         <!-- PLACE TEST CONTENT FROM HERE -->
+    	<div id="test"></div>
+    	<p><br/></p>
+<!--
+    	<script type="text/javascript">
+        /* <![CDATA[ */
+        	var expectedBorderRadius = "20%";
+
+        	var testResult = check_CSS_property("border-bottom-right-radius", expectedBorderRadius);
+
+        	// if (testResult.pass)
+        	  /* This portion of the code has been removed to ensure that the test case is not automated */
+        	// else
+        		/* This portion of the code has been removed to ensure that the test case is not automated */
+
+
+
+          if (top.FrameEnabled)	top.fnLog(testResult);
+
+        /* ]]> */
+        </script>
+-->
+    </body>
 </html>
 
diff --git a/testing/web-platform/tests/css/css-backgrounds/border-bottom-right-radius-005-ref.xht b/testing/web-platform/tests/css/css-backgrounds/border-bottom-right-radius-005-ref.xht
deleted file mode 100644
index 9ed21b722270..000000000000
--- a/testing/web-platform/tests/css/css-backgrounds/border-bottom-right-radius-005-ref.xht
+++ /dev/null
@@ -1,22 +0,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <title>border-bottom-right-radius: 48px 14px reference</title>
-    <style type="text/css">
-      div
-      {
-          width: 200px;
-          height: 100px;
-
-          background: orange;
-          border: 20px solid teal;
-          border-bottom-right-radius: 48px 14px;
-      }
-    </style>
-  </head>
-  <body>
-    <p>The box should have a border-bottom-right-radius of 48px 14px. The
-        horizontal radius should therefore be clearly larger than the
-        vertical radius.</p>
-    <div></div>
-  </body>
-</html>
diff --git a/testing/web-platform/tests/css/css-backgrounds/border-bottom-right-radius-005.xht b/testing/web-platform/tests/css/css-backgrounds/border-bottom-right-radius-005.xht
index 899125420faa..899b3b585b10 100644
--- a/testing/web-platform/tests/css/css-backgrounds/border-bottom-right-radius-005.xht
+++ b/testing/web-platform/tests/css/css-backgrounds/border-bottom-right-radius-005.xht
@@ -1,24 +1,63 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <title>border-bottom-right-radius using two percentages</title>
-    <link rel="match" href="border-bottom-right-radius-005-ref.xht" />
-    <link rel="help" href="https://drafts.csswg.org/css-backgrounds/#border-radius" />
-    <style type="text/css">
-      div
-      {
-          width: 200px;
-          height: 100px;
+    <head>
+        <title>CSS Test: Borders. Border-bottom-right-radius using two percentage value: 20% 30%</title>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+		<meta http-equiv="Content-Style-Type" content="text/css" />
+        <meta http-equiv="Content-Script-Type" content="text/javascript" />
+        <link rel="author" title="Nokia" href="http://www.nokia.com/" />
+        <link rel="help" href="http://www.w3.org/TR/css3-background/#the-border-radius" />
+        <link rel="match" href="border-bottom-right-radius-006.xht" />
+        <meta name="flags" content="" />
+        <meta name="assert" content="To verify border-bottom-right-radius property set with two percentage value works as expected" />
+        <style type="text/css">
+        /* <![CDATA[ */
+        	div
+            {
+        		border:2px solid #a1a1a1;
+        		background:#dddddd;
+        		width:200px;
+        		height: 100px;
+        		border-bottom-right-radius: 20% 30%;
+        	}
+        /* ]]> */
+        </style>
+<!--
+        <script type="text/javascript" src="js/css3_test_helper.js"></script>
+-->
+    </head>
+    <body>
+    	<p>
+			There should be a box with a rounded bottom right corner.
+		</p>
+		 <!-- PASS AND FAIL CRITERIA ARE IN THE LIST BELOW -->
+				<ul>
+					<li>PASS if only bottom right corner is rounded.</li>
+					<li>FAIL if the output is not as expected.</li>
+				</ul>
 
-          background: orange;
-          border: 20px solid teal;
-          border-bottom-right-radius: 20% 10%;
-      }
-    </style>
-  </head>
-  <body>
-    <p>The box should have a border-bottom-right-radius of 48px 14px. The
-        horizontal radius should therefore be clearly larger than the
-        vertical radius.</p>
-    <div></div>
-  </body>
+         <!-- PLACE TEST CONTENT FROM HERE -->
+    	<div id="test"></div>
+    	<p><br/></p>
+<!--
+    	<script type="text/javascript">
+        /* <![CDATA[ */
+        	var expectedBorderRadius = "20% 30%";
+
+        	var testResult = check_CSS_property("border-bottom-right-radius", expectedBorderRadius);
+
+        	// if (testResult.pass)
+        	  /* This portion of the code has been removed to ensure that the test case is not automated */
+        	// else
+        		/* This portion of the code has been removed to ensure that the test case is not automated */
+
+
+
+          if (top.FrameEnabled)	top.fnLog(testResult);
+
+        /* ]]> */
+        </script>
+-->
+    </body>
 </html>
+
diff --git a/testing/web-platform/tests/css/css-backgrounds/border-bottom-right-radius-006.xht b/testing/web-platform/tests/css/css-backgrounds/border-bottom-right-radius-006.xht
new file mode 100644
index 000000000000..d47009d11970
--- /dev/null
+++ b/testing/web-platform/tests/css/css-backgrounds/border-bottom-right-radius-006.xht
@@ -0,0 +1,63 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <title>CSS Test: Borders. Border-bottom-right-radius using two value: 40px 30%</title>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+		<meta http-equiv="Content-Style-Type" content="text/css" />
+        <meta http-equiv="Content-Script-Type" content="text/javascript" />
+        <link rel="author" title="Nokia" href="http://www.nokia.com/" />
+        <link rel="help" href="http://www.w3.org/TR/css3-background/#the-border-radius" />
+        <link rel="match" href="border-bottom-right-radius-005.xht" />
+        <meta name="flags" content="" />
+        <meta name="assert" content="To verify border-bottom-right-radius property set to two value with different unit, works as expected"/>
+        <style type="text/css">
+        /* <![CDATA[ */
+        	div
+            {
+        		border:2px solid #a1a1a1;
+        		background:#dddddd;
+        		width:200px;
+        		height: 100px;
+        		border-bottom-right-radius: 40px 30%;
+        	}
+        /* ]]> */
+        </style>
+<!--
+        <script type="text/javascript" src="js/css3_test_helper.js"></script>
+-->
+    </head>
+    <body>
+    	<p>
+			There should be a box with a rounded bottom right corner.
+		</p>
+		 <!-- PASS AND FAIL CRITERIA ARE IN THE LIST BELOW -->
+				<ul>
+					<li>PASS if only bottom right corner is rounded.</li>
+					<li>FAIL if the output is not as expected.</li>
+				</ul>
+
+         <!-- PLACE TEST CONTENT FROM HERE -->
+    	<div id="test"></div>
+    	<p><br/></p>
+<!--
+    	<script type="text/javascript">
+        /* <![CDATA[ */
+        	var expectedBorderRadius = "40px 30%";
+
+        	var testResult = check_CSS_property("border-bottom-right-radius", expectedBorderRadius);
+
+        	// if (testResult.pass)
+        	  /* This portion of the code has been removed to ensure that the test case is not automated */
+        	// else
+        		/* This portion of the code has been removed to ensure that the test case is not automated */
+
+
+
+          if (top.FrameEnabled)	top.fnLog(testResult);
+
+        /* ]]> */
+        </script>
+-->
+    </body>
+</html>
+
diff --git a/testing/web-platform/tests/css/css-backgrounds/border-bottom-right-radius-007.xht b/testing/web-platform/tests/css/css-backgrounds/border-bottom-right-radius-007.xht
new file mode 100644
index 000000000000..c0d5b733b579
--- /dev/null
+++ b/testing/web-platform/tests/css/css-backgrounds/border-bottom-right-radius-007.xht
@@ -0,0 +1,63 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <title>CSS Test: Borders. Border-bottom-right-radius using two value: 20% 25px</title>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+		<meta http-equiv="Content-Style-Type" content="text/css" />
+        <meta http-equiv="Content-Script-Type" content="text/javascript" />
+        <link rel="author" title="Nokia" href="http://www.nokia.com/" />
+        <link rel="help" href="http://www.w3.org/TR/css3-background/#the-border-radius" />
+        <link rel="match" href="border-bottom-right-radius-009.xht" />
+        <meta name="flags" content="" />
+        <meta name="assert" content="To verify border-bottom-right-radius property set to two value with different unit, works as expected" />
+        <style type="text/css">
+        /* <![CDATA[ */
+        	div
+            {
+        		border:2px solid #a1a1a1;
+        		background:#dddddd;
+        		width:200px;
+        		height: 100px;
+        		border-bottom-right-radius: 20% 25px;
+        	}
+        /* ]]> */
+        </style>
+<!--
+        <script type="text/javascript" src="js/css3_test_helper.js"></script>
+-->
+    </head>
+    <body>
+    	<p>
+			There should be a box with a rounded bottom right corner.
+		</p>
+		 <!-- PASS AND FAIL CRITERIA ARE IN THE LIST BELOW -->
+				<ul>
+					<li>PASS if only bottom right corner is rounded.</li>
+					<li>FAIL if the output is not as expected.</li>
+				</ul>
+
+         <!-- PLACE TEST CONTENT FROM HERE -->
+    	<div id="test"></div>
+    	<p><br/></p>
+<!--
+    	<script type="text/javascript">
+        /* <![CDATA[ */
+        	var expectedBorderRadius = "20% 25px";
+
+        	var testResult = check_CSS_property("border-bottom-right-radius", expectedBorderRadius);
+
+        	// if (testResult.pass)
+        	  /* This portion of the code has been removed to ensure that the test case is not automated */
+        	// else
+        		/* This portion of the code has been removed to ensure that the test case is not automated */
+
+
+
+          if (top.FrameEnabled)	top.fnLog(testResult);
+
+        /* ]]> */
+        </script>
+-->
+    </body>
+</html>
+
diff --git a/testing/web-platform/tests/css/css-backgrounds/border-bottom-right-radius-008.xht b/testing/web-platform/tests/css/css-backgrounds/border-bottom-right-radius-008.xht
new file mode 100644
index 000000000000..b4b7b6e8f7c8
--- /dev/null
+++ b/testing/web-platform/tests/css/css-backgrounds/border-bottom-right-radius-008.xht
@@ -0,0 +1,62 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <title>CSS Test: Borders. Border-bottom-right-radius using two values: 4em 30%</title>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+		<meta http-equiv="Content-Style-Type" content="text/css" />
+        <meta http-equiv="Content-Script-Type" content="text/javascript" />
+        <link rel="author" title="Nokia" href="http://www.nokia.com/" />
+        <link rel="help" href="http://www.w3.org/TR/css3-background/#the-border-radius" />
+        <meta name="flags" content="" />
+        <meta name="assert" content="To verify border-bottom-right-radius property set to two values with different units, works as expected" />
+        <style type="text/css">
+        /* <![CDATA[ */
+        	div
+            {
+        		border:2px solid #a1a1a1;
+        		background:#dddddd;
+        		width:200px;
+        		height: 100px;
+        		border-bottom-right-radius: 4em 30%;
+        	}
+        /* ]]> */
+        </style>
+<!--
+        <script type="text/javascript" src="js/css3_test_helper.js"></script>
+-->
+    </head>
+    <body>
+    	<p>
+			There should be a box with a rounded bottom right corner.
+		</p>
+		 <!-- PASS AND FAIL CRITERIA ARE IN THE LIST BELOW -->
+				<ul>
+					<li>PASS if only bottom right corner is rounded.</li>
+					<li>FAIL if the output is not as expected.</li>
+				</ul>
+
+         <!-- PLACE TEST CONTENT FROM HERE -->
+    	<div id="test"></div>
+    	<p><br/></p>
+<!--
+    	<script type="text/javascript">
+        /* <![CDATA[ */
+        	var expectedBorderRadius = "64px 30%";
+
+        	var testResult = check_CSS_property("border-bottom-right-radius", expectedBorderRadius);
+
+        	// if (testResult.pass)
+        	  /* This portion of the code has been removed to ensure that the test case is not automated */
+        	// else
+        		/* This portion of the code has been removed to ensure that the test case is not automated */
+
+
+
+          if (top.FrameEnabled)	top.fnLog(testResult);
+
+        /* ]]> */
+        </script>
+-->
+    </body>
+</html>
+
diff --git a/testing/web-platform/tests/css/css-backgrounds/border-bottom-right-radius-009.xht b/testing/web-platform/tests/css/css-backgrounds/border-bottom-right-radius-009.xht
new file mode 100644
index 000000000000..633caa5ff246
--- /dev/null
+++ b/testing/web-platform/tests/css/css-backgrounds/border-bottom-right-radius-009.xht
@@ -0,0 +1,67 @@
+ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <title>CSS Test: Borders. Border-bottom-right-radius using &quot;inherit&quot;</title>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+		<meta http-equiv="Content-Style-Type" content="text/css" />
+        <meta http-equiv="Content-Script-Type" content="text/javascript" />
+        <link rel="author" title="Nokia" href="http://www.nokia.com/" />
+        <link rel="help" href="http://www.w3.org/TR/css3-background/#the-border-radius" />
+        <link rel="match" href="border-bottom-right-radius-007.xht" />
+        <meta name="flags" content="" />
+        <meta name="assert" content="To verify if inherit feature works, when assigned to &quot;border&ndash;bottom&ndash;right&ndash;radius&quot; property" />
+        <style type="text/css">
+        /* <![CDATA[ */
+        	body
+        	{
+        		border-bottom-right-radius: 20% 25px;
+        	}
+        	div
+            {
+        		border:2px solid #a1a1a1;
+        		background:#dddddd;
+        		width:200px;
+        		height: 100px;
+        		border-bottom-right-radius: inherit;
+        	}
+        /* ]]> */
+        </style>
+<!--
+        <script type="text/javascript" src="js/css3_test_helper.js"></script>
+-->
+    </head>
+    <body>
+    	<p>
+			There should be a box with a rounded bottom right corner.
+		</p>
+		 <!-- PASS AND FAIL CRITERIA ARE IN THE LIST BELOW -->
+				<ul>
+					<li>PASS if only bottom right corner is rounded.</li>
+					<li>FAIL if the output is not as expected.</li>
+				</ul>
+
+         <!-- PLACE TEST CONTENT FROM HERE -->
+    	<div id="test"></div>
+    	<p><br/></p>
+<!--
+    	<script type="text/javascript">
+        /* <![CDATA[ */
+        	var expectedBorderRadius = "20% 25px";
+
+        	var testResult = check_CSS_property("border-bottom-right-radius", expectedBorderRadius);
+
+        	// if (testResult.pass)
+        	  /* This portion of the code has been removed to ensure that the test case is not automated */
+        	// else
+        		/* This portion of the code has been removed to ensure that the test case is not automated */
+
+
+
+          if (top.FrameEnabled)	top.fnLog(testResult);
+
+        /* ]]> */
+       </script>
+-->
+    </body>
+</html>
+
diff --git a/testing/web-platform/tests/css/css-backgrounds/border-image-5.html b/testing/web-platform/tests/css/css-backgrounds/border-image-5.html
new file mode 100644
index 000000000000..4fecfc7bf950
--- /dev/null
+++ b/testing/web-platform/tests/css/css-backgrounds/border-image-5.html
@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <title>
+        CSS Border and Background: border-image #5 border-image-slice
+    </title>
+    <meta name="assert" content="Negative values for the the border-image-slice property should not be supported" />
+
+    <link rel="author" title="Jérémie Patonnier" href="mailto:jeremie@patonnier.net" / >
+
+    <link rel="help" href="http://www.w3.org/TR/css3-background/#border-image-slice">
+
+    <link rel="match" href="support/reftest-border-image-5.png" />
+
+    <style type="text/css">
+
+        #filler {
+            background-color : #009900;
+            width : 40px;
+            height: 40px;
+        }
+
+        #test {
+            border : 10px solid red;
+            width  : 40px;
+            height : 40px;
+
+            border-image-source: url(support/img-ref-1.png);
+            border-image-slice : -10;
+        }
+
+    </style>
+
+</head>
+<body>
+
+    <p>
+        Pass if the green square have smaller green squares at its corners and <strong>no</strong> red.
+    </p>
+
+    <div id="test">
+        <div id="filler"></div>
+    </div>
+
+</body>
+</html>
diff --git a/testing/web-platform/tests/css/css-backgrounds/border-image-6-ref.html b/testing/web-platform/tests/css/css-backgrounds/border-image-6-ref.html
deleted file mode 100644
index f3e3bb79c053..000000000000
--- a/testing/web-platform/tests/css/css-backgrounds/border-image-6-ref.html
+++ /dev/null
@@ -1,69 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>border-image-6-ref</title>
-
-    <style type="text/css">
-      #container {
-          position: relative;
-
-          width: 60px;
-          height: 60px;
-      }
-
-      #filler {
-          position: absolute;
-          top: 10px;
-          left: 10px;
-
-          width: 40px;
-          height: 40px;
-
-          background-color: #090;
-      }
-
-      .small {
-          position: absolute;
-
-          width: 10px;
-          height: 10px;
-
-          /* orange appears here to make it super-clear if this doesn't load */
-          background: url(support/img-ref-1.png) orange;
-      }
-
-      .small.top {
-          top: 0;
-      }
-
-      .small.bottom {
-          bottom: 0;
-      }
-
-      .small.left {
-          left: 0;
-      }
-
-      .small.right {
-          right: 0;
-      }
-    </style>
-
-  </head>
-  <body>
-
-    <p>
-      Pass if the green square have smaller green squares at its corners and <strong>no</strong> red borders.
-    </p>
-
-    <div id="container">
-      <div id="filler"></div>
-      <div class="small top left"></div>
-      <div class="small top right"></div>
-      <div class="small bottom left"></div>
-      <div class="small bottom right"></div>
-    </div>
-
-  </body>
-</html>
diff --git a/testing/web-platform/tests/css/css-backgrounds/border-image-6.html b/testing/web-platform/tests/css/css-backgrounds/border-image-6.html
index bc4cb1386b5c..235d263fac88 100644
--- a/testing/web-platform/tests/css/css-backgrounds/border-image-6.html
+++ b/testing/web-platform/tests/css/css-backgrounds/border-image-6.html
@@ -11,7 +11,7 @@
 
     <link rel="help" href="http://www.w3.org/TR/css3-background/#border-image-slice">
 
-    <link rel="match" href="border-image-6-ref.html" />
+    <link rel="match" href="support/reftest-border-image-5.png" />
 
     <style type="text/css">
 
diff --git a/testing/web-platform/tests/css/css-backgrounds/border-top-left-radius-003.xht b/testing/web-platform/tests/css/css-backgrounds/border-top-left-radius-003.xht
new file mode 100644
index 000000000000..deed8ad6ad1e
--- /dev/null
+++ b/testing/web-platform/tests/css/css-backgrounds/border-top-left-radius-003.xht
@@ -0,0 +1,62 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <title>CSS Test: Borders. Border-top-left-radius using two length values: 40px 20px</title>
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+        <meta http-equiv="Content-Style-Type" content="text/css"/>
+        <meta http-equiv="Content-Script-Type" content="text/javascript"/>
+        <link rel="author" title="Nokia" href="http://www.nokia.com/"/>
+        <link rel="help" href="http://www.w3.org/TR/css3-background/#the-border-radius"/>
+        <link rel="match" href="border-top-left-radius-004.xht" />
+        <meta name="flags" content=""/>
+        <meta name="assert" content="To verify border-top-left-radius property set to two length values, works fine"/>
+        <style type="text/css">
+        /* <![CDATA[ */
+        	div
+          {
+        		border:2px solid #a1a1a1;
+        		background:#dddddd;
+        		width:200px;
+        		height: 100px;
+        		border-top-left-radius: 40px 20px;
+        	}
+        /* ]]> */
+        </style>
+<!--
+        <script type="text/javascript" src="js/css3_test_helper.js"></script>
+-->
+    </head>
+    <body>
+		<p>
+			There should be a box with a rounded top left corner.
+		</p>
+		 <!-- PASS AND FAIL CRITERIA ARE IN THE LIST BELOW -->
+        <ul>
+            <li>PASS if only top left corner is rounded.</li>
+            <li>FAIL if the output is not as expected.</li>
+        </ul>
+
+         <!-- PLACE TEST CONTENT FROM HERE -->
+
+    	<div id="test"></div>
+    	<p><br/></p>
+<!--
+    	<script type="text/javascript">
+        /* <![CDATA[ */
+        	var expectedBorderRadius = "40px 20px";
+
+        	var testResult = check_CSS_property("border-top-left-radius", expectedBorderRadius);
+
+        	/* if (testResult.pass)
+        	  // This portion of the code has been removed to ensure that the test case is not automated
+        	else {
+        		// This portion of the code has been removed to ensure that the test case is not automated
+          } */
+
+          if (top.FrameEnabled)	top.fnLog(testResult);
+         /* ]]> */
+        </script>
+-->
+    </body>
+</html>
+
diff --git a/testing/web-platform/tests/css/css-backgrounds/border-top-left-radius-004-ref.xht b/testing/web-platform/tests/css/css-backgrounds/border-top-left-radius-004-ref.xht
deleted file mode 100644
index b9c9cdac8826..000000000000
--- a/testing/web-platform/tests/css/css-backgrounds/border-top-left-radius-004-ref.xht
+++ /dev/null
@@ -1,23 +0,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <title>border-top-left-radius: 48px 28px reference</title>
-    <style type="text/css">
-      div
-      {
-          width: 200px;
-          height: 100px;
-
-          background: orange;
-          border: 20px solid teal;
-          border-top-left-radius: 48px 28px;
-      }
-    </style>
-  </head>
-  <body>
-    <p>The box should have a border-top-left-radius of 48px 28px. The
-        horizontal radius should therefore be clearly larger than the
-        vertical radius.</p>
-    <div></div>
-  </body>
-</html>
-
diff --git a/testing/web-platform/tests/css/css-backgrounds/border-top-left-radius-004.xht b/testing/web-platform/tests/css/css-backgrounds/border-top-left-radius-004.xht
index 39e636db6bb6..31e06fc2397a 100644
--- a/testing/web-platform/tests/css/css-backgrounds/border-top-left-radius-004.xht
+++ b/testing/web-platform/tests/css/css-backgrounds/border-top-left-radius-004.xht
@@ -1,25 +1,62 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <title>border-top-left-radius using one percentage</title>
-    <link rel="match" href="border-top-left-radius-004-ref.xht" />
-    <link rel="help" href="https://drafts.csswg.org/css-backgrounds/#border-radius" />
-    <style type="text/css">
-      div
-      {
-          width: 200px;
-          height: 100px;
+    <head>
+        <title>CSS Test: Borders. Border-top-left-radius using one percentage value: 20%</title>
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+        <meta http-equiv="Content-Style-Type" content="text/css"/>
+        <meta http-equiv="Content-Script-Type" content="text/javascript"/>
+        <link rel="author" title="Nokia" href="http://www.nokia.com/"/>
+        <link rel="help" href="http://www.w3.org/TR/css3-background/#the-border-radius"/>
+        <link rel="match" href="border-top-left-radius-003.xht" />
+        <meta name="flags" content=""/>
+        <meta name="assert" content="To verify border-top-left-radius property set to one percentage value, works fine"/>
+        <style type="text/css">
+        /* <![CDATA[ */
+        	div
+          {
+        		border:2px solid #a1a1a1;
+        		background:#dddddd;
+        		width:200px;
+        		height: 100px;
+        		border-top-left-radius: 20%;
+        	}
+        /* ]]> */
+        </style>
+<!--
+        <script type="text/javascript" src="js/css3_test_helper.js"></script>
+-->
+    </head>
+    <body>
+		<p>
+			There should be a box with a rounded top left corner.
+		</p>
+		 <!-- PASS AND FAIL CRITERIA ARE IN THE LIST BELOW -->
+        <ul>
+            <li>PASS if only top left corner is rounded.</li>
+            <li>FAIL if the output is not as expected.</li>
+        </ul>
 
-          background: orange;
-          border: 20px solid teal;
-          border-top-left-radius: 20%;
-      }
-    </style>
-  </head>
-  <body>
-    <p>The box should have a border-top-left-radius of 48px 28px. The
-        horizontal radius should therefore be clearly larger than the
-        vertical radius.</p>
-    <div></div>
-  </body>
+         <!-- PLACE TEST CONTENT FROM HERE -->
+
+    	<div id="test"></div>
+    	<p><br/></p>
+<!--
+    	<script type="text/javascript">
+        /* <![CDATA[ */
+        	var expectedBorderRadius = "20%";
+
+        	var testResult = check_CSS_property("border-top-left-radius", expectedBorderRadius);
+
+        	/* if (testResult.pass)
+        	  // This portion of the code has been removed to ensure that the test case is not automated
+        	else {
+        		// This portion of the code has been removed to ensure that the test case is not automated
+          } */
+
+          if (top.FrameEnabled)	top.fnLog(testResult);
+        /* ]]> */
+        </script>
+-->
+    </body>
 </html>
 
diff --git a/testing/web-platform/tests/css/css-backgrounds/border-top-left-radius-005-ref.xht b/testing/web-platform/tests/css/css-backgrounds/border-top-left-radius-005-ref.xht
deleted file mode 100644
index f1a1935aa503..000000000000
--- a/testing/web-platform/tests/css/css-backgrounds/border-top-left-radius-005-ref.xht
+++ /dev/null
@@ -1,22 +0,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <title>border-top-left-radius: 48px 14px reference</title>
-    <style type="text/css">
-      div
-      {
-          width: 200px;
-          height: 100px;
-
-          background: orange;
-          border: 20px solid teal;
-          border-top-left-radius: 48px 14px;
-      }
-    </style>
-  </head>
-  <body>
-    <p>The box should have a border-top-left-radius of 48px 14px. The
-        horizontal radius should therefore be clearly larger than the
-        vertical radius.</p>
-    <div></div>
-  </body>
-</html>
diff --git a/testing/web-platform/tests/css/css-backgrounds/border-top-left-radius-005.xht b/testing/web-platform/tests/css/css-backgrounds/border-top-left-radius-005.xht
index 37af580e067b..e4044300e665 100644
--- a/testing/web-platform/tests/css/css-backgrounds/border-top-left-radius-005.xht
+++ b/testing/web-platform/tests/css/css-backgrounds/border-top-left-radius-005.xht
@@ -1,24 +1,62 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <title>border-top-left-radius using two percentages</title>
-    <link rel="match" href="border-top-left-radius-005-ref.xht" />
-    <link rel="help" href="https://drafts.csswg.org/css-backgrounds/#border-radius" />
-    <style type="text/css">
-      div
-      {
-          width: 200px;
-          height: 100px;
+    <head>
+        <title>CSS Test: Borders. Border-top-left-radius using two percentage values: 20% 30%</title>
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+        <meta http-equiv="Content-Style-Type" content="text/css"/>
+        <meta http-equiv="Content-Script-Type" content="text/javascript"/>
+        <link rel="author" title="Nokia" href="http://www.nokia.com/"/>
+        <link rel="help" href="http://www.w3.org/TR/css3-background/#the-border-radius"/>
+        <link rel="match" href="border-top-left-radius-006.xht" />
+        <meta name="flags" content=""/>
+        <meta name="assert" content="To verify border-top-left-radius property set to two percentage values, works fine"/>
+        <style type="text/css">
+        /* <![CDATA[ */
+        	div
+          {
+        		border:2px solid #a1a1a1;
+        		background:#dddddd;
+        		width:200px;
+        		height: 100px;
+        		border-top-left-radius: 20% 30%;
+        	}
+         /* ]]> */
+        </style>
+<!--
+        <script type="text/javascript" src="js/css3_test_helper.js"></script>
+-->
+    </head>
+    <body>
+		<p>
+			There should be a box with a rounded top left corner.
+		</p>
+		 <!-- PASS AND FAIL CRITERIA ARE IN THE LIST BELOW -->
+        <ul>
+            <li>PASS if only top left corner is rounded.</li>
+            <li>FAIL if the output is not as expected.</li>
+        </ul>
 
-          background: orange;
-          border: 20px solid teal;
-          border-top-left-radius: 20% 10%;
-      }
-    </style>
-  </head>
-  <body>
-    <p>The box should have a border-top-left-radius of 48px 14px. The
-        horizontal radius should therefore be clearly larger than the
-        vertical radius.</p>
-    <div></div>
-  </body>
+         <!-- PLACE TEST CONTENT FROM HERE -->
+
+    	<div id="test"></div>
+    	<p><br/></p>
+<!--
+    	<script type="text/javascript">
+         /* <![CDATA[ */
+        	var expectedBorderRadius = "20% 30%";
+
+        	var testResult = check_CSS_property("border-top-left-radius", expectedBorderRadius);
+
+        	/* if (testResult.pass)
+        	  // This portion of the code has been removed to ensure that the test case is not automated
+        	else {
+        		// This portion of the code has been removed to ensure that the test case is not automated
+          } */
+
+          if (top.FrameEnabled)	top.fnLog(testResult);
+        /* ]]> */
+        </script>
+-->
+    </body>
 </html>
+
diff --git a/testing/web-platform/tests/css/css-backgrounds/border-top-left-radius-006.xht b/testing/web-platform/tests/css/css-backgrounds/border-top-left-radius-006.xht
new file mode 100644
index 000000000000..dc2b9ebfad74
--- /dev/null
+++ b/testing/web-platform/tests/css/css-backgrounds/border-top-left-radius-006.xht
@@ -0,0 +1,62 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <title>CSS Test: Borders. Border-top-left-radius using two values: 40px 30%</title>
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+        <meta http-equiv="Content-Style-Type" content="text/css"/>
+        <meta http-equiv="Content-Script-Type" content="text/javascript"/>
+        <link rel="author" title="Nokia" href="http://www.nokia.com/"/>
+        <link rel="help" href="http://www.w3.org/TR/css3-background/#the-border-radius"/>
+        <link rel="match" href="border-top-left-radius-005.xht" />
+        <meta name="flags" content=""/>
+        <meta name="assert" content="To verify border-top-left-radius property set to two values with different units, works fine"/>
+        <style type="text/css">
+        /* <![CDATA[ */
+        	div
+          {
+        		border:2px solid #a1a1a1;
+        		background:#dddddd;
+        		width:200px;
+        		height: 100px;
+        		border-top-left-radius: 40px 30%;
+        	}
+         /* ]]> */
+        </style>
+<!--
+        <script type="text/javascript" src="js/css3_test_helper.js"></script>
+-->
+    </head>
+    <body>
+		<p>
+			There should be a box with a rounded top left corner.
+		</p>
+		 <!-- PASS AND FAIL CRITERIA ARE IN THE LIST BELOW -->
+        <ul>
+            <li>PASS if only top left corner is rounded.</li>
+            <li>FAIL if the output is not as expected.</li>
+        </ul>
+
+         <!-- PLACE TEST CONTENT FROM HERE -->
+
+    	<div id="test"></div>
+    	<p><br/></p>
+<!--
+    	<script type="text/javascript">
+        /* <![CDATA[ */
+        	var expectedBorderRadius = "40px 30%";
+
+        	var testResult = check_CSS_property("border-top-left-radius", expectedBorderRadius);
+
+        	/* if (testResult.pass)
+        	  // This portion of the code has been removed to ensure that the test case is not automated
+        	else {
+        		// This portion of the code has been removed to ensure that the test case is not automated
+          } */
+
+          if (top.FrameEnabled)	top.fnLog(testResult);
+        /* ]]> */
+        </script>
+-->
+    </body>
+</html>
+
diff --git a/testing/web-platform/tests/css/css-backgrounds/border-top-left-radius-007.xht b/testing/web-platform/tests/css/css-backgrounds/border-top-left-radius-007.xht
new file mode 100644
index 000000000000..7111e538fe2d
--- /dev/null
+++ b/testing/web-platform/tests/css/css-backgrounds/border-top-left-radius-007.xht
@@ -0,0 +1,62 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <title>CSS Test: Borders. Border-top-left-radius using two values: 20% 25px</title>
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+        <meta http-equiv="Content-Style-Type" content="text/css"/>
+        <meta http-equiv="Content-Script-Type" content="text/javascript"/>
+        <link rel="author" title="Nokia" href="http://www.nokia.com/"/>
+        <link rel="help" href="http://www.w3.org/TR/css3-background/#the-border-radius"/>
+        <link rel="match" href="border-top-left-radius-009.xht" />
+        <meta name="flags" content=""/>
+        <meta name="assert" content="To verify border-top-left-radius property set to two values with different units, works fine"/>
+        <style type="text/css">
+        /* <![CDATA[ */
+        	div
+          {
+        		border:2px solid #a1a1a1;
+        		background:#dddddd;
+        		width:200px;
+        		height: 100px;
+        		border-top-left-radius: 20% 25px;
+        	}
+         /* ]]> */
+        </style>
+<!--
+        <script type="text/javascript" src="js/css3_test_helper.js"></script>
+-->
+    </head>
+    <body>
+		<p>
+			There should be a box with a rounded top left corner.
+		</p>
+		 <!-- PASS AND FAIL CRITERIA ARE IN THE LIST BELOW -->
+        <ul>
+            <li>PASS if only top left corner is rounded.</li>
+            <li>FAIL if the output is not as expected.</li>
+        </ul>
+
+         <!-- PLACE TEST CONTENT FROM HERE -->
+
+    	<div id="test"></div>
+    	<p><br/></p>
+<!--
+    	<script type="text/javascript">
+        /* <![CDATA[ */
+        	var expectedBorderRadius = "20% 25px";
+
+        	var testResult = check_CSS_property("border-top-left-radius", expectedBorderRadius);
+
+        	/* if (testResult.pass)
+        	  // This portion of the code has been removed to ensure that the test case is not automated
+        	else {
+        		// This portion of the code has been removed to ensure that the test case is not automated
+          } */
+
+          if (top.FrameEnabled)	top.fnLog(testResult);
+         /* ]]> */
+        </script>
+-->
+    </body>
+</html>
+
diff --git a/testing/web-platform/tests/css/css-backgrounds/border-top-left-radius-008.xht b/testing/web-platform/tests/css/css-backgrounds/border-top-left-radius-008.xht
new file mode 100644
index 000000000000..724075cae187
--- /dev/null
+++ b/testing/web-platform/tests/css/css-backgrounds/border-top-left-radius-008.xht
@@ -0,0 +1,59 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <title>CSS Test: Borders. Border-top-left-radius using two values: 4em 30%</title>
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+        <meta http-equiv="Content-Style-Type" content="text/css"/>
+        <meta http-equiv="Content-Script-Type" content="text/javascript"/>
+        <link rel="author" title="Nokia" href="http://www.nokia.com/"/>
+        <link rel="help" href="http://www.w3.org/TR/css3-background/#the-border-radius"/>
+        <meta name="flags" content=""/>
+        <meta name="assert" content="To verify border-top-left-radius property set to two values with different units, works fine"/>
+        <style type="text/css">
+        /* <![CDATA[ */
+        	div
+          {
+        		border:2px solid #a1a1a1;
+        		background:#dddddd;
+        		width:200px;
+        		height: 100px;
+        		border-top-left-radius: 4em 30%;
+        	}
+         /* ]]> */
+        </style>
+<!--
+        <script type="text/javascript" src="js/css3_test_helper.js"></script>
+-->
+    </head>
+    <body>
+        <p id="testdetails">
+        </p>
+        <p>
+            There should be a box with a rounded top left corner.</p>
+        <ul>
+            <li>PASS if only top left corner is rounded.</li>
+            <li>FAIL if the output is not as expected.</li>
+        </ul>
+
+
+    	<div id="test"></div>
+<!--
+    	<script type="text/javascript">
+         /* <![CDATA[ */
+        	var expectedBorderRadius = "64px 30%";
+
+        	var testResult = check_CSS_property("border-top-left-radius", expectedBorderRadius);
+
+        	/* if (testResult.pass)
+        	  // This portion of the code has been removed to ensure that the test case is not automated
+        	else {
+        		// This portion of the code has been removed to ensure that the test case is not automated
+          } */
+
+          if (top.FrameEnabled)	top.fnLog(testResult);
+         /* ]]> */
+        </script>
+-->
+    </body>
+</html>
+
diff --git a/testing/web-platform/tests/css/css-backgrounds/border-top-left-radius-009.xht b/testing/web-platform/tests/css/css-backgrounds/border-top-left-radius-009.xht
new file mode 100644
index 000000000000..a5589fa9cc47
--- /dev/null
+++ b/testing/web-platform/tests/css/css-backgrounds/border-top-left-radius-009.xht
@@ -0,0 +1,66 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <title>CSS Test: Borders. Border-top-left-radius using &quot;inherit&quot;</title>
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+        <meta http-equiv="Content-Style-Type" content="text/css"/>
+        <meta http-equiv="Content-Script-Type" content="text/javascript"/>
+        <link rel="author" title="Nokia" href="http://www.nokia.com/"/>
+        <link rel="help" href="http://www.w3.org/TR/css3-background/#the-border-radius"/>
+        <link rel="match" href="border-top-left-radius-007.xht" />
+        <meta name="flags" content=""/>
+        <meta name="assert" content="To verify inherit feature works, when it is assigned to border-top-left-radius."/>
+        <style type="text/css">
+        /* <![CDATA[ */
+        	body
+        	{
+        		border-top-left-radius: 20% 25px;
+        	}
+        	div
+          {
+        		border:2px solid #a1a1a1;
+        		background:#dddddd;
+        		width:200px;
+        		height: 100px;
+        		border-top-left-radius: inherit;
+        	}
+        /* ]]> */
+        </style>
+<!--
+        <script type="text/javascript" src="js/css3_test_helper.js"></script>
+-->
+    </head>
+    <body>
+		<p>
+			There should be a box with a rounded top left corner.
+		</p>
+		 <!-- PASS AND FAIL CRITERIA ARE IN THE LIST BELOW -->
+        <ul>
+            <li>PASS if only top left corner is rounded.</li>
+            <li>FAIL if the output is not as expected.</li>
+        </ul>
+
+         <!-- PLACE TEST CONTENT FROM HERE -->
+
+    	<div id="test"></div>
+    	<p><br/></p>
+<!--
+    	<script type="text/javascript">
+        /* <![CDATA[ */
+        	var expectedBorderRadius = "20% 25px";
+
+        	var testResult = check_CSS_property("border-top-left-radius", expectedBorderRadius);
+
+        	/* if (testResult.pass)
+        	  // This portion of the code has been removed to ensure that the test case is not automated
+        	else {
+        		// This portion of the code has been removed to ensure that the test case is not automated
+          } */
+
+          if (top.FrameEnabled)	top.fnLog(testResult);
+         /* ]]> */
+        </script>
+-->
+    </body>
+</html>
+
diff --git a/testing/web-platform/tests/css/css-backgrounds/border-top-right-radius-003.xht b/testing/web-platform/tests/css/css-backgrounds/border-top-right-radius-003.xht
new file mode 100644
index 000000000000..66ac6caf432c
--- /dev/null
+++ b/testing/web-platform/tests/css/css-backgrounds/border-top-right-radius-003.xht
@@ -0,0 +1,62 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <title>CSS Test: Borders. Border-top-right-radius using two length values: 40px 20px</title>
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+        <meta http-equiv="Content-Style-Type" content="text/css"/>
+        <meta http-equiv="Content-Script-Type" content="text/javascript"/>
+        <link rel="author" title="Nokia" href="http://www.nokia.com/"/>
+        <link rel="help" href="http://www.w3.org/TR/css3-background/#the-border-radius"/>
+        <link rel="match" href="border-top-right-radius-004.xht" />
+        <meta name="flags" content=""/>
+        <meta name="assert" content="To verify border-top-right-radius property set to two length values, works fine"/>
+        <style type="text/css">
+        /* <![CDATA[ */
+        	div
+          {
+        		border:2px solid #a1a1a1;
+        		background:#dddddd;
+        		width:200px;
+        		height: 100px;
+        		border-top-right-radius: 40px 20px;
+        	}
+         /* ]]> */
+        </style>
+<!--
+        <script type="text/javascript" src="js/css3_test_helper.js"></script>
+-->
+    </head>
+    <body>
+		<p>
+			There should be a box with a rounded top right corner.
+		</p>
+		 <!-- PASS AND FAIL CRITERIA ARE IN THE LIST BELOW -->
+        <ul>
+            <li>PASS if only top left corner is rounded.</li>
+            <li>FAIL if the output is not as expected.</li>
+        </ul>
+
+         <!-- PLACE TEST CONTENT FROM HERE -->
+
+    	<div id="test"></div>
+    	<p><br/></p>
+<!--
+    	<script type="text/javascript">
+         /* <![CDATA[ */
+        	var expectedBorderRadius = "40px 20px";
+
+        	var testResult = check_CSS_property("border-top-right-radius", expectedBorderRadius);
+
+        	/* if (testResult.pass)
+        	  // This portion of the code has been removed to ensure that the test case is not automated
+        	else {
+        		// This portion of the code has been removed to ensure that the test case is not automated
+          } */
+
+          if (top.FrameEnabled)	top.fnLog(testResult);
+        /* ]]> */
+        </script>
+-->
+    </body>
+</html>
+
diff --git a/testing/web-platform/tests/css/css-backgrounds/border-top-right-radius-004-ref.xht b/testing/web-platform/tests/css/css-backgrounds/border-top-right-radius-004-ref.xht
deleted file mode 100644
index ae031513ae2b..000000000000
--- a/testing/web-platform/tests/css/css-backgrounds/border-top-right-radius-004-ref.xht
+++ /dev/null
@@ -1,22 +0,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <title>border-top-right-radius: 48px 28px reference</title>
-    <style type="text/css">
-      div
-      {
-          width: 200px;
-          height: 100px;
-
-          background: orange;
-          border: 20px solid teal;
-          border-top-right-radius: 48px 28px;
-      }
-    </style>
-  </head>
-  <body>
-    <p>The box should have a border-top-right-radius of 48px 28px. The
-        horizontal radius should therefore be clearly larger than the
-        vertical radius.</p>
-    <div></div>
-  </body>
-</html>
diff --git a/testing/web-platform/tests/css/css-backgrounds/border-top-right-radius-004.xht b/testing/web-platform/tests/css/css-backgrounds/border-top-right-radius-004.xht
index cbedad809bad..35bd61934129 100644
--- a/testing/web-platform/tests/css/css-backgrounds/border-top-right-radius-004.xht
+++ b/testing/web-platform/tests/css/css-backgrounds/border-top-right-radius-004.xht
@@ -1,24 +1,62 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <title>border-top-right-radius using one percentage</title>
-    <link rel="match" href="border-top-right-radius-004-ref.xht" />
-    <link rel="help" href="https://drafts.csswg.org/css-backgrounds/#border-radius" />
-    <style type="text/css">
-      div
-      {
-          width: 200px;
-          height: 100px;
+    <head>
+        <title>CSS Test: Borders. Border-top-right-radius using one percentage value: 20%</title>
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+        <meta http-equiv="Content-Style-Type" content="text/css"/>
+        <meta http-equiv="Content-Script-Type" content="text/javascript"/>
+        <link rel="author" title="Nokia" href="http://www.nokia.com/"/>
+        <link rel="help" href="http://www.w3.org/TR/css3-background/#the-border-radius"/>
+        <link rel="match" href="border-top-right-radius-003.xht" />
+        <meta name="flags" content=""/>
+        <meta name="assert" content="To verify border-top-right-radius property set to one percentage value, works fine"/>
+        <style type="text/css">
+        /* <![CDATA[ */
+        	div
+          {
+        		border:2px solid #a1a1a1;
+        		background:#dddddd;
+        		width:200px;
+        		height: 100px;
+        		border-top-right-radius: 20%;
+        	}
+         /* ]]> */
+        </style>
+<!--
+        <script type="text/javascript" src="js/css3_test_helper.js"></script>
+-->
+    </head>
+    <body>
+		<p>
+			There should be a box with a rounded top right corner.
+		</p>
+		 <!-- PASS AND FAIL CRITERIA ARE IN THE LIST BELOW -->
+        <ul>
+            <li>PASS if only top left corner is rounded.</li>
+            <li>FAIL if the output is not as expected.</li>
+        </ul>
 
-          background: orange;
-          border: 20px solid teal;
-          border-top-right-radius: 20%;
-      }
-    </style>
-  </head>
-  <body>
-    <p>The box should have a border-top-right-radius of 48px 28px. The
-        horizontal radius should therefore be clearly larger than the
-        vertical radius.</p>
-    <div></div>
-  </body>
+         <!-- PLACE TEST CONTENT FROM HERE -->
+
+    	<div id="test"></div>
+    	<p><br/></p>
+<!--
+    	<script type="text/javascript">
+        /* <![CDATA[ */
+        	var expectedBorderRadius = "20%";
+
+        	var testResult = check_CSS_property("border-top-right-radius", expectedBorderRadius);
+
+        	/* if (testResult.pass)
+        	  // This portion of the code has been removed to ensure that the test case is not automated
+        	else {
+        		// This portion of the code has been removed to ensure that the test case is not automated
+          } */
+
+          if (top.FrameEnabled)	top.fnLog(testResult);
+         /* ]]> */
+        </script>
+-->
+    </body>
 </html>
+
diff --git a/testing/web-platform/tests/css/css-backgrounds/border-top-right-radius-005-ref.xht b/testing/web-platform/tests/css/css-backgrounds/border-top-right-radius-005-ref.xht
deleted file mode 100644
index a3303b72c778..000000000000
--- a/testing/web-platform/tests/css/css-backgrounds/border-top-right-radius-005-ref.xht
+++ /dev/null
@@ -1,22 +0,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <title>border-top-right-radius: 48px 14px reference</title>
-    <style type="text/css">
-      div
-      {
-          width: 200px;
-          height: 100px;
-
-          background: orange;
-          border: 20px solid teal;
-          border-top-right-radius: 48px 14px;
-      }
-    </style>
-  </head>
-  <body>
-    <p>The box should have a border-top-right-radius of 48px 14px. The
-        horizontal radius should therefore be clearly larger than the
-        vertical radius.</p>
-    <div></div>
-  </body>
-</html>
diff --git a/testing/web-platform/tests/css/css-backgrounds/border-top-right-radius-005.xht b/testing/web-platform/tests/css/css-backgrounds/border-top-right-radius-005.xht
index 8bd3965de5a3..f44587cef469 100644
--- a/testing/web-platform/tests/css/css-backgrounds/border-top-right-radius-005.xht
+++ b/testing/web-platform/tests/css/css-backgrounds/border-top-right-radius-005.xht
@@ -1,24 +1,62 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <title>border-top-right-radius using two percentages</title>
-    <link rel="match" href="border-top-right-radius-005-ref.xht" />
-    <link rel="help" href="https://drafts.csswg.org/css-backgrounds/#border-radius" />
-    <style type="text/css">
-      div
-      {
-          width: 200px;
-          height: 100px;
+    <head>
+        <title>CSS Test: Borders. Border-top-right-radius using two percentage values: 20% 30%</title>
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+        <meta http-equiv="Content-Style-Type" content="text/css"/>
+        <meta http-equiv="Content-Script-Type" content="text/javascript"/>
+        <link rel="author" title="Nokia" href="http://www.nokia.com/"/>
+        <link rel="help" href="http://www.w3.org/TR/css3-background/#the-border-radius"/>
+        <link rel="match" href="border-top-right-radius-006.xht" />
+        <meta name="flags" content=""/>
+        <meta name="assert" content="To verify border-top-right-radius property set to two percentage values, works fine"/>
+        <style type="text/css">
+        /* <![CDATA[ */
+        	div
+          {
+        		border:2px solid #a1a1a1;
+        		background:#dddddd;
+        		width:200px;
+        		height: 100px;
+        		border-top-right-radius: 20% 30%;
+        	}
+        /* ]]> */
+        </style>
+<!--
+        <script type="text/javascript" src="js/css3_test_helper.js"></script>
+-->
+    </head>
+    <body>
+		<p>
+			There should be a box with a rounded top right corner.
+		</p>
+		 <!-- PASS AND FAIL CRITERIA ARE IN THE LIST BELOW -->
+        <ul>
+            <li>PASS if only top left corner is rounded.</li>
+            <li>FAIL if the output is not as expected.</li>
+        </ul>
 
-          background: orange;
-          border: 20px solid teal;
-          border-top-right-radius: 20% 10%;
-      }
-    </style>
-  </head>
-  <body>
-    <p>The box should have a border-top-right-radius of 48px 14px. The
-        horizontal radius should therefore be clearly larger than the
-        vertical radius.</p>
-    <div></div>
-  </body>
+         <!-- PLACE TEST CONTENT FROM HERE -->
+
+    	<div id="test"></div>
+    	<p><br/></p>
+<!--
+    	<script type="text/javascript">
+        /* <![CDATA[ */
+        	var expectedBorderRadius = "20% 30%";
+
+        	var testResult = check_CSS_property("border-top-right-radius", expectedBorderRadius);
+
+        	/* if (testResult.pass)
+        	  // This portion of the code has been removed to ensure that the test case is not automated
+        	else {
+        		// This portion of the code has been removed to ensure that the test case is not automated
+          } */
+
+          if (top.FrameEnabled)	top.fnLog(testResult);
+        /* ]]> */
+        </script>
+-->
+    </body>
 </html>
+
diff --git a/testing/web-platform/tests/css/css-backgrounds/border-top-right-radius-006.xht b/testing/web-platform/tests/css/css-backgrounds/border-top-right-radius-006.xht
new file mode 100644
index 000000000000..be52dadfc55c
--- /dev/null
+++ b/testing/web-platform/tests/css/css-backgrounds/border-top-right-radius-006.xht
@@ -0,0 +1,62 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <title>CSS Test: Borders. Border-top-right-radius using two values: 40px 30%</title>
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+        <meta http-equiv="Content-Style-Type" content="text/css"/>
+        <meta http-equiv="Content-Script-Type" content="text/javascript"/>
+        <link rel="author" title="Nokia" href="http://www.nokia.com/"/>
+        <link rel="help" href="http://www.w3.org/TR/css3-background/#the-border-radius"/>
+        <link rel="match" href="border-top-right-radius-005.xht" />
+        <meta name="flags" content=""/>
+        <meta name="assert" content="To verify border-top-right-radius property set to two values with different units, works fine"/>
+        <style type="text/css">
+        /* <![CDATA[ */
+        	div
+          {
+        		border:2px solid #a1a1a1;
+        		background:#dddddd;
+        		width:200px;
+        		height: 100px;
+        		border-top-right-radius: 40px 30%;
+        	}
+        /* ]]> */
+        </style>
+<!--
+        <script type="text/javascript" src="js/css3_test_helper.js"></script>
+-->
+    </head>
+    <body>
+		<p>
+			There should be a box with a rounded top right corner.
+		</p>
+		 <!-- PASS AND FAIL CRITERIA ARE IN THE LIST BELOW -->
+        <ul>
+            <li>PASS if only top left corner is rounded.</li>
+            <li>FAIL if the output is not as expected.</li>
+        </ul>
+
+         <!-- PLACE TEST CONTENT FROM HERE -->
+
+    	<div id="test"></div>
+    	<p><br/></p>
+<!--
+    	<script type="text/javascript">
+        /* <![CDATA[ */
+        	var expectedBorderRadius = "40px 30%";
+
+        	var testResult = check_CSS_property("border-top-right-radius", expectedBorderRadius);
+
+        	/* if (testResult.pass)
+        	  // This portion of the code has been removed to ensure that the test case is not automated
+        	else {
+        		// This portion of the code has been removed to ensure that the test case is not automated
+          } */
+
+          if (top.FrameEnabled)	top.fnLog(testResult);
+         /* ]]> */
+        </script>
+-->
+    </body>
+</html>
+
diff --git a/testing/web-platform/tests/css/css-backgrounds/border-top-right-radius-007.xht b/testing/web-platform/tests/css/css-backgrounds/border-top-right-radius-007.xht
new file mode 100644
index 000000000000..5a00a05da794
--- /dev/null
+++ b/testing/web-platform/tests/css/css-backgrounds/border-top-right-radius-007.xht
@@ -0,0 +1,62 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <title>CSS Test: Borders. Border-top-right-radius using two values: 20% 25px</title>
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+        <meta http-equiv="Content-Style-Type" content="text/css"/>
+        <meta http-equiv="Content-Script-Type" content="text/javascript"/>
+        <link rel="author" title="Nokia" href="http://www.nokia.com/"/>
+        <link rel="help" href="http://www.w3.org/TR/css3-background/#the-border-radius"/>
+        <link rel="match" href="border-top-right-radius-009.xht" />
+        <meta name="flags" content=""/>
+        <meta name="assert" content="To verify border-top-right-radius property set to two values with different units, works fine"/>
+        <style type="text/css">
+        /* <![CDATA[ */
+        	div
+          {
+        		border:2px solid #a1a1a1;
+        		background:#dddddd;
+        		width:200px;
+        		height: 100px;
+        		border-top-right-radius: 20% 25px;
+        	}
+        /* ]]> */
+        </style>
+<!--
+        <script type="text/javascript" src="js/css3_test_helper.js"></script>
+-->
+    </head>
+    <body>
+		<p>
+			There should be a box with a rounded top right corner.
+		</p>
+		 <!-- PASS AND FAIL CRITERIA ARE IN THE LIST BELOW -->
+        <ul>
+            <li>PASS if only top left corner is rounded.</li>
+            <li>FAIL if the output is not as expected.</li>
+        </ul>
+
+         <!-- PLACE TEST CONTENT FROM HERE -->
+
+    	<div id="test"></div>
+    	<p><br/></p>
+<!--
+    	<script type="text/javascript">
+        /* <![CDATA[ */
+        	var expectedBorderRadius = "20% 25px";
+
+        	var testResult = check_CSS_property("border-top-right-radius", expectedBorderRadius);
+
+        	/* if (testResult.pass)
+        	  // This portion of the code has been removed to ensure that the test case is not automated
+        	else {
+        		// This portion of the code has been removed to ensure that the test case is not automated
+          } */
+
+          if (top.FrameEnabled)	top.fnLog(testResult);
+         /* ]]> */
+        </script>
+-->
+    </body>
+</html>
+
diff --git a/testing/web-platform/tests/css/css-backgrounds/border-top-right-radius-008.xht b/testing/web-platform/tests/css/css-backgrounds/border-top-right-radius-008.xht
new file mode 100644
index 000000000000..0fa67dbc92d2
--- /dev/null
+++ b/testing/web-platform/tests/css/css-backgrounds/border-top-right-radius-008.xht
@@ -0,0 +1,59 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <title>CSS Test: Borders. Border-top-right-radius using two values: 4em 30%</title>
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+        <meta http-equiv="Content-Style-Type" content="text/css"/>
+        <meta http-equiv="Content-Script-Type" content="text/javascript"/>
+        <link rel="author" title="Nokia" href="http://www.nokia.com/"/>
+        <link rel="help" href="http://www.w3.org/TR/css3-background/#the-border-radius"/>
+        <meta name="flags" content=""/>
+        <meta name="assert" content="To verify border-top-right-radius property set to two values with different units, works fine"/>
+        <style type="text/css">
+        /* <![CDATA[ */
+        	div
+          {
+        		border:2px solid #a1a1a1;
+        		background:#dddddd;
+        		width:200px;
+        		height: 100px;
+        		border-top-right-radius: 4em 30%;
+        	}
+         /* ]]> */
+        </style>
+<!--
+        <script type="text/javascript" src="js/css3_test_helper.js"></script>
+-->
+    </head>
+    <body>
+         <p id="testdetails">
+        </p>
+        <p>
+            There should be a box with a rounded top right corner.</p>
+        <ul>
+            <li>PASS if only top right corner is rounded.</li>
+            <li>FAIL if the output is not as expected.</li>
+        </ul>
+
+
+    	<div id="test"></div>
+<!--
+    	<script type="text/javascript">
+        /* <![CDATA[ */
+        	var expectedBorderRadius = "64px 30%";
+
+        	var testResult = check_CSS_property("border-top-right-radius", expectedBorderRadius);
+
+        	/* if (testResult.pass)
+        	  // This portion of the code has been removed to ensure that the test case is not automated
+        	else {
+        		// This portion of the code has been removed to ensure that the test case is not automated
+          } */
+
+          if (top.FrameEnabled)	top.fnLog(testResult);
+         /* ]]> */
+        </script>
+-->
+    </body>
+</html>
+
diff --git a/testing/web-platform/tests/css/css-backgrounds/border-top-right-radius-009.xht b/testing/web-platform/tests/css/css-backgrounds/border-top-right-radius-009.xht
new file mode 100644
index 000000000000..ec954d6003df
--- /dev/null
+++ b/testing/web-platform/tests/css/css-backgrounds/border-top-right-radius-009.xht
@@ -0,0 +1,66 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <title>CSS Test: Borders. Border-top-right-radius using &quot;inherit&quot;</title>
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+        <meta http-equiv="Content-Style-Type" content="text/css"/>
+        <meta http-equiv="Content-Script-Type" content="text/javascript"/>
+        <link rel="author" title="Nokia" href="http://www.nokia.com/"/>
+        <link rel="help" href="http://www.w3.org/TR/css3-background/#the-border-radius"/>
+        <link rel="match" href="border-top-right-radius-007.xht" />
+        <meta name="flags" content=""/>
+        <meta name="assert" content="To verify inherit feature works, when it is assigned to border-top-right-radius."/>
+        <style type="text/css">
+        /* <![CDATA[ */
+        	body
+        	{
+        		border-top-right-radius: 20% 25px;
+        	}
+        	div
+          {
+        		border:2px solid #a1a1a1;
+        		background:#dddddd;
+        		width:200px;
+        		height: 100px;
+        		border-top-right-radius: inherit;
+        	}
+         /* ]]> */
+        </style>
+<!--
+        <script type="text/javascript" src="js/css3_test_helper.js"></script>
+-->
+    </head>
+    <body>
+		<p>
+			There should be a box with a rounded top right corner.
+		</p>
+		 <!-- PASS AND FAIL CRITERIA ARE IN THE LIST BELOW -->
+        <ul>
+            <li>PASS if only top left corner is rounded.</li>
+            <li>FAIL if the output is not as expected.</li>
+        </ul>
+
+         <!-- PLACE TEST CONTENT FROM HERE -->
+
+    	<div id="test"></div>
+    	<p><br/></p>
+<!--
+    	<script type="text/javascript">
+         /* <![CDATA[ */
+        	var expectedBorderRadius = "20% 25px";
+
+        	var testResult = check_CSS_property("border-top-right-radius", expectedBorderRadius);
+
+        	/* if (testResult.pass)
+        	  // This portion of the code has been removed to ensure that the test case is not automated
+        	else {
+        		// This portion of the code has been removed to ensure that the test case is not automated
+          } */
+
+          if (top.FrameEnabled)	top.fnLog(testResult);
+        /* ]]> */
+        </script>
+-->
+    </body>
+</html>
+
diff --git a/testing/web-platform/tests/css/css-backgrounds/parsing/border-image-slice-invalid.html b/testing/web-platform/tests/css/css-backgrounds/parsing/border-image-slice-invalid.html
index 6b6e0e9d610b..c62a43d6b374 100644
--- a/testing/web-platform/tests/css/css-backgrounds/parsing/border-image-slice-invalid.html
+++ b/testing/web-platform/tests/css/css-backgrounds/parsing/border-image-slice-invalid.html
@@ -20,8 +20,6 @@ test_invalid_value("border-image-slice", "-1 2% fill");
 test_invalid_value("border-image-slice", "1 2 3 4 5");
 
 test_invalid_value("border-image-slice", "1% fill 2%");
-
-test_invalid_value("border-image-slice", "-10");
 </script>
 </body>
 </html>
diff --git a/testing/web-platform/tests/css/css-backgrounds/support/reftest-border-image-5.png b/testing/web-platform/tests/css/css-backgrounds/support/reftest-border-image-5.png
new file mode 100644
index 000000000000..01087f13dc1c
Binary files /dev/null and b/testing/web-platform/tests/css/css-backgrounds/support/reftest-border-image-5.png differ
diff --git a/testing/web-platform/tests/css/css-flexbox/flex-wrap-003.html b/testing/web-platform/tests/css/css-flexbox/flex-wrap-003.html
index b1a6619363ab..a76e4449fb2e 100644
--- a/testing/web-platform/tests/css/css-flexbox/flex-wrap-003.html
+++ b/testing/web-platform/tests/css/css-flexbox/flex-wrap-003.html
@@ -10,7 +10,7 @@
 <!-- This makes sure that we only see green if the flex items are sized correctly -->
 <div style="position: absolute; width: 100px; height: 100px; background: green;"></div>
 
-<div style="display: flex; flex-direction: column; flex-wrap: wrap; width: 100px; height: 100px; line-height: 20px;">
+<div style="display: flex; flex-direction: column; flex-wrap: wrap; width: 100px; height: 100px; line-height: 20x;">
   <div style="background-color: red; height: 100px;">
     <!-- These zero-height divs give the flex item has a min-content width of
          50px and a max-content width of 250px -->
diff --git a/testing/web-platform/tests/css/css-flexbox/flex-wrap-004.html b/testing/web-platform/tests/css/css-flexbox/flex-wrap-004.html
deleted file mode 100644
index 679f62ae3e66..000000000000
--- a/testing/web-platform/tests/css/css-flexbox/flex-wrap-004.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE html>
-<link rel="author" title="Google LLC" href="http://www.google.com" />
-<link rel="help" href="https://drafts.csswg.org/css-flexbox/#cross-sizing" />
-<title>css-flexbox: Tests that we size items in a wrapping column flexbox as fit-content</title>
-<link rel="match" href="../reference/ref-filled-green-100px-square.xht" />
-<meta name="assert" content="The flexbox here should have one flex line, 100px by 100px. The flex items overflow but are transparent." />
-
-<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
-
-<!-- This makes sure that we only see green if the flex items are sized correctly -->
-<div style="position: absolute; width: 100px; height: 100px; background: green;"></div>
-
-<div style="display: flex; flex-direction: column; flex-wrap: wrap; width: 125px; height: 100px; line-height: 20px;">
-  <!-- The margin-right means that the flex item should be only 100px wide,
-       because it will use the available width of 125px minus the 25px margin. -->
-  <div style="background-color: red; height: 100px; margin-right: 25px;">
-    <!-- These zero-height divs give the flex item has a min-content width of
-         50px and a max-content width of 250px -->
-    <div style="width: 50px; display: inline-block;"></div>
-    <div style="width: 50px; display: inline-block;"></div>
-    <div style="width: 50px; display: inline-block;"></div>
-    <div style="width: 50px; display: inline-block;"></div>
-    <div style="width: 50px; display: inline-block;"></div>
-  </div>
-</div>
diff --git a/testing/web-platform/tests/css/css-images/multiple-position-color-stop-conic.html b/testing/web-platform/tests/css/css-images/multiple-position-color-stop-conic.html
index 8a7331d08ff5..d1608c0cfe8b 100644
--- a/testing/web-platform/tests/css/css-images/multiple-position-color-stop-conic.html
+++ b/testing/web-platform/tests/css/css-images/multiple-position-color-stop-conic.html
@@ -2,7 +2,7 @@
 <title>Conic gradient with a two position color stop</title>
 <link rel="help" href="https://drafts.csswg.org/css-images-4/#color-stop-syntax">
 <meta name="assert" content="A color stop with two positions create a hard transition">
-<link rel="match" href="reference/100x100-blue-green.html">
+<link rel="match" href="support/100x100-blue-green.html">
 <style>
 #target {
   width: 100px;
diff --git a/testing/web-platform/tests/css/css-images/multiple-position-color-stop-linear.html b/testing/web-platform/tests/css/css-images/multiple-position-color-stop-linear.html
index c739a2a71d2d..2e1f9ed7be48 100644
--- a/testing/web-platform/tests/css/css-images/multiple-position-color-stop-linear.html
+++ b/testing/web-platform/tests/css/css-images/multiple-position-color-stop-linear.html
@@ -2,7 +2,7 @@
 <title>Linear gradient with a two position color stop</title>
 <link rel="help" href="https://drafts.csswg.org/css-images-4/#color-stop-syntax">
 <meta name="assert" content="A color stop with two positions create a hard transition">
-<link rel="match" href="reference/100x100-blue-green.html">
+<link rel="match" href="support/100x100-blue-green.html">
 <style>
 #target {
   width: 100px;
diff --git a/testing/web-platform/tests/css/css-images/multiple-position-color-stop-radial.html b/testing/web-platform/tests/css/css-images/multiple-position-color-stop-radial.html
index 4b4fd95c4ec2..74e25df788b0 100644
--- a/testing/web-platform/tests/css/css-images/multiple-position-color-stop-radial.html
+++ b/testing/web-platform/tests/css/css-images/multiple-position-color-stop-radial.html
@@ -2,7 +2,7 @@
 <title>Radial gradient with a two position color stop</title>
 <link rel="help" href="https://drafts.csswg.org/css-images-4/#color-stop-syntax">
 <meta name="assert" content="A color stop with two positions create a hard transition">
-<link rel="match" href="reference/100x100-blue-green.html">
+<link rel="match" href="support/100x100-blue-green.html">
 <style>
 #target {
   width: 100px;
diff --git a/testing/web-platform/tests/css/css-images/reference/100x100-blue-green.html b/testing/web-platform/tests/css/css-images/support/100x100-blue-green.html
similarity index 100%
rename from testing/web-platform/tests/css/css-images/reference/100x100-blue-green.html
rename to testing/web-platform/tests/css/css-images/support/100x100-blue-green.html
diff --git a/testing/web-platform/tests/css/css-namespaces/prefix-001.xml b/testing/web-platform/tests/css/css-namespaces/prefix-001.xml
index eb717139e1df..c40bb7f1132c 100644
--- a/testing/web-platform/tests/css/css-namespaces/prefix-001.xml
+++ b/testing/web-platform/tests/css/css-namespaces/prefix-001.xml
@@ -3,7 +3,7 @@
   <link rel="author" title="Anne van Kesteren" href="http://annevankesteren.nl/"/>
   <link rel="author" title="Opera Software ASA" href="http://opera.com/"/>
   <link rel="help" href="http://www.w3.org/TR/css-namespaces-3/#prefixes"/>
-  <link rel="match" href="reference/ref-lime-1.xml"/>
+  <link rel="match" href="reftest/ref-lime-1.xml"/>
   <title>CSS Namespaces Test Suite: prefix case-sensitivity</title>
   <style>
    @namespace Foo "y";
diff --git a/testing/web-platform/tests/css/css-namespaces/prefix-002.xml b/testing/web-platform/tests/css/css-namespaces/prefix-002.xml
index 49ca7c0a9e11..cc78f3f0aaf1 100644
--- a/testing/web-platform/tests/css/css-namespaces/prefix-002.xml
+++ b/testing/web-platform/tests/css/css-namespaces/prefix-002.xml
@@ -3,7 +3,7 @@
   <link rel="author" title="Anne van Kesteren" href="http://annevankesteren.nl/"/>
   <link rel="author" title="Opera Software ASA" href="http://opera.com/"/>
   <link rel="help" href="http://www.w3.org/TR/css-namespaces-3/#prefixes"/>
-  <link rel="match" href="reference/ref-lime-1.xml"/>
+  <link rel="match" href="reftest/ref-lime-1.xml"/>
   <title>CSS Namespaces Test Suite: empty string prefix (Explicit element namespace)</title>
   <style>
    @namespace foo "";
diff --git a/testing/web-platform/tests/css/css-namespaces/prefix-003.xml b/testing/web-platform/tests/css/css-namespaces/prefix-003.xml
index 2f23ad4c061e..0b6f3293de1f 100644
--- a/testing/web-platform/tests/css/css-namespaces/prefix-003.xml
+++ b/testing/web-platform/tests/css/css-namespaces/prefix-003.xml
@@ -3,7 +3,7 @@
   <link rel="author" title="Anne van Kesteren" href="http://annevankesteren.nl/"/>
   <link rel="author" title="Opera Software ASA" href="http://opera.com/"/>
   <link rel="help" href="http://www.w3.org/TR/css-namespaces-3/#prefixes"/>
-  <link rel="match" href="reference/ref-lime-1-generic.xml"/>
+  <link rel="match" href="reftest/ref-lime-1-generic.xml"/>
   <title>CSS Namespaces Test Suite: empty string prefix (Implied element namespace)</title>
   <style>
    @namespace foo "";
diff --git a/testing/web-platform/tests/css/css-namespaces/prefix-004.xml b/testing/web-platform/tests/css/css-namespaces/prefix-004.xml
index 596d4637f9ba..70c3bd1ed9bc 100644
--- a/testing/web-platform/tests/css/css-namespaces/prefix-004.xml
+++ b/testing/web-platform/tests/css/css-namespaces/prefix-004.xml
@@ -3,7 +3,7 @@
   <link rel="author" title="Anne van Kesteren" href="http://annevankesteren.nl/"/>
   <link rel="author" title="Opera Software ASA" href="http://opera.com/"/>
   <link rel="help" href="http://www.w3.org/TR/css-namespaces-3/#prefixes"/>
-  <link rel="match" href="reference/ref-lime-2-generic.xml"/>
+  <link rel="match" href="reftest/ref-lime-2-generic.xml"/>
   <title>CSS Namespaces Test Suite: empty string default namespace</title>
   <style>
    @namespace "";
diff --git a/testing/web-platform/tests/css/css-namespaces/prefix-005.xml b/testing/web-platform/tests/css/css-namespaces/prefix-005.xml
index 5f7c3cad3d94..458b5aa3ebc4 100644
--- a/testing/web-platform/tests/css/css-namespaces/prefix-005.xml
+++ b/testing/web-platform/tests/css/css-namespaces/prefix-005.xml
@@ -4,7 +4,7 @@
   <link rel="author" title="Opera Software ASA" href="http://opera.com/"/>
   <link rel="author" title="Boris Zbarsky" href="https://bugzilla.mozilla.org/show_bug.cgi?id=458381#c4"/>
   <link rel="help" href="http://www.w3.org/TR/css-namespaces-3/#prefixes"/>
-  <link rel="match" href="reference/ref-lime-2-generic.xml"/>
+  <link rel="match" href="reftest/ref-lime-2-generic.xml"/>
   <title>CSS Namespaces Test Suite: no default namespace</title>
   <style>
    @namespace x "test";
diff --git a/testing/web-platform/tests/css/css-namespaces/prefix-006.xml b/testing/web-platform/tests/css/css-namespaces/prefix-006.xml
index 3cc0ab40f3aa..0bf59915a45b 100644
--- a/testing/web-platform/tests/css/css-namespaces/prefix-006.xml
+++ b/testing/web-platform/tests/css/css-namespaces/prefix-006.xml
@@ -3,7 +3,7 @@
   <link rel="author" title="Anne van Kesteren" href="http://annevankesteren.nl/"/>
   <link rel="author" title="Opera Software ASA" href="http://opera.com/"/>
   <link rel="help" href="http://www.w3.org/TR/css-namespaces-3/#prefixes"/>
-  <link rel="match" href="reference/ref-lime-2.xml"/>
+  <link rel="match" href="reftest/ref-lime-2.xml"/>
   <title>CSS Namespaces Test Suite: no prefix</title>
   <style>
    @namespace "test";
diff --git a/testing/web-platform/tests/css/css-namespaces/reference/ref-lime-1-block.xml b/testing/web-platform/tests/css/css-namespaces/reftest/ref-lime-1-block.xml
similarity index 100%
rename from testing/web-platform/tests/css/css-namespaces/reference/ref-lime-1-block.xml
rename to testing/web-platform/tests/css/css-namespaces/reftest/ref-lime-1-block.xml
diff --git a/testing/web-platform/tests/css/css-namespaces/reference/ref-lime-1-generic.xml b/testing/web-platform/tests/css/css-namespaces/reftest/ref-lime-1-generic.xml
similarity index 100%
rename from testing/web-platform/tests/css/css-namespaces/reference/ref-lime-1-generic.xml
rename to testing/web-platform/tests/css/css-namespaces/reftest/ref-lime-1-generic.xml
diff --git a/testing/web-platform/tests/css/css-namespaces/reference/ref-lime-1.xml b/testing/web-platform/tests/css/css-namespaces/reftest/ref-lime-1.xml
similarity index 100%
rename from testing/web-platform/tests/css/css-namespaces/reference/ref-lime-1.xml
rename to testing/web-platform/tests/css/css-namespaces/reftest/ref-lime-1.xml
diff --git a/testing/web-platform/tests/css/css-namespaces/reference/ref-lime-2-generic.xml b/testing/web-platform/tests/css/css-namespaces/reftest/ref-lime-2-generic.xml
similarity index 100%
rename from testing/web-platform/tests/css/css-namespaces/reference/ref-lime-2-generic.xml
rename to testing/web-platform/tests/css/css-namespaces/reftest/ref-lime-2-generic.xml
diff --git a/testing/web-platform/tests/css/css-namespaces/reference/ref-lime-2.xml b/testing/web-platform/tests/css/css-namespaces/reftest/ref-lime-2.xml
similarity index 100%
rename from testing/web-platform/tests/css/css-namespaces/reference/ref-lime-2.xml
rename to testing/web-platform/tests/css/css-namespaces/reftest/ref-lime-2.xml
diff --git a/testing/web-platform/tests/css/css-namespaces/reference/ref-lime-3.xml b/testing/web-platform/tests/css/css-namespaces/reftest/ref-lime-3.xml
similarity index 100%
rename from testing/web-platform/tests/css/css-namespaces/reference/ref-lime-3.xml
rename to testing/web-platform/tests/css/css-namespaces/reftest/ref-lime-3.xml
diff --git a/testing/web-platform/tests/css/css-namespaces/reference/ref-lime-5.xml b/testing/web-platform/tests/css/css-namespaces/reftest/ref-lime-5.xml
similarity index 100%
rename from testing/web-platform/tests/css/css-namespaces/reference/ref-lime-5.xml
rename to testing/web-platform/tests/css/css-namespaces/reftest/ref-lime-5.xml
diff --git a/testing/web-platform/tests/css/css-namespaces/reference/ref-lime-6.xml b/testing/web-platform/tests/css/css-namespaces/reftest/ref-lime-6.xml
similarity index 100%
rename from testing/web-platform/tests/css/css-namespaces/reference/ref-lime-6.xml
rename to testing/web-platform/tests/css/css-namespaces/reftest/ref-lime-6.xml
diff --git a/testing/web-platform/tests/css/css-namespaces/scope-001.xml b/testing/web-platform/tests/css/css-namespaces/scope-001.xml
index 5271096a9643..bed4171efa1e 100644
--- a/testing/web-platform/tests/css/css-namespaces/scope-001.xml
+++ b/testing/web-platform/tests/css/css-namespaces/scope-001.xml
@@ -3,7 +3,7 @@
   <link rel="author" title="Anne van Kesteren" href="http://annevankesteren.nl/"/>
   <link rel="author" title="Opera Software ASA" href="http://opera.com/"/>
   <link rel="help" href="http://www.w3.org/TR/css-namespaces-3/#scope"/>
-  <link rel="match" href="reference/ref-lime-1.xml"/>
+  <link rel="match" href="reftest/ref-lime-1.xml"/>
   <meta name="flags" content="invalid"/>
   <title>CSS Namespaces Test Suite: scope &lt;style></title>
   <style>
diff --git a/testing/web-platform/tests/css/css-namespaces/scope-002.xml b/testing/web-platform/tests/css/css-namespaces/scope-002.xml
index ff5a2fec1184..d25eb81780c1 100644
--- a/testing/web-platform/tests/css/css-namespaces/scope-002.xml
+++ b/testing/web-platform/tests/css/css-namespaces/scope-002.xml
@@ -3,7 +3,7 @@
   <link rel="author" title="Anne van Kesteren" href="http://annevankesteren.nl/"/>
   <link rel="author" title="Opera Software ASA" href="http://opera.com/"/>
   <link rel="help" href="http://www.w3.org/TR/css-namespaces-3/#scope"/>
-  <link rel="match" href="reference/ref-lime-1.xml"/>
+  <link rel="match" href="reftest/ref-lime-1.xml"/>
   <title>CSS Namespaces Test Suite: scope @import</title>
   <style>
    test { background:lime }
diff --git a/testing/web-platform/tests/css/css-namespaces/syntax-001.xml b/testing/web-platform/tests/css/css-namespaces/syntax-001.xml
index 83efb665b66c..01c57e07c7c1 100644
--- a/testing/web-platform/tests/css/css-namespaces/syntax-001.xml
+++ b/testing/web-platform/tests/css/css-namespaces/syntax-001.xml
@@ -3,7 +3,7 @@
   <link rel="author" title="Anne van Kesteren" href="http://annevankesteren.nl/"/>
   <link rel="author" title="Opera Software ASA" href="http://opera.com/"/>
   <link rel="help" href="http://www.w3.org/TR/css-namespaces-3/#syntax"/>
-  <link rel="match" href="reference/ref-lime-1-block.xml"/>
+  <link rel="match" href="reftest/ref-lime-1-block.xml"/>
   <title>CSS Namespaces Test Suite: @namespace case-insensitivity</title>
   <style>
    @NAmespace x "http://www.w3.org/1999/xhtml";
diff --git a/testing/web-platform/tests/css/css-namespaces/syntax-002.xml b/testing/web-platform/tests/css/css-namespaces/syntax-002.xml
index 30fa8aece35a..cb04b9c8d6b1 100644
--- a/testing/web-platform/tests/css/css-namespaces/syntax-002.xml
+++ b/testing/web-platform/tests/css/css-namespaces/syntax-002.xml
@@ -3,7 +3,7 @@
   <link rel="author" title="Anne van Kesteren" href="http://annevankesteren.nl/"/>
   <link rel="author" title="Opera Software ASA" href="http://opera.com/"/>
   <link rel="help" href="http://www.w3.org/TR/css-namespaces-3/#syntax"/>
-  <link rel="match" href="reference/ref-lime-1-block.xml"/>
+  <link rel="match" href="reftest/ref-lime-1-block.xml"/>
   <title>CSS Namespaces Test Suite: @namespace syntax with escapes</title>
   <style>
    @\N\000041 mes\pac\65  x "http://www.w3.org/1999/xhtml";
diff --git a/testing/web-platform/tests/css/css-namespaces/syntax-003.xml b/testing/web-platform/tests/css/css-namespaces/syntax-003.xml
index 1b2eb5f9c08d..256286eeb125 100644
--- a/testing/web-platform/tests/css/css-namespaces/syntax-003.xml
+++ b/testing/web-platform/tests/css/css-namespaces/syntax-003.xml
@@ -3,7 +3,7 @@
   <link rel="author" title="Anne van Kesteren" href="http://annevankesteren.nl/"/>
   <link rel="author" title="Opera Software ASA" href="http://opera.com/"/>
   <link rel="help" href="http://www.w3.org/TR/css-namespaces-3/#syntax"/>
-  <link rel="match" href="reference/ref-lime-5.xml"/>
+  <link rel="match" href="reftest/ref-lime-5.xml"/>
   <title>CSS Namespaces Test Suite: @namespace default namespace syntax</title>
   <style>
    *|test { background:red }
diff --git a/testing/web-platform/tests/css/css-namespaces/syntax-004.xml b/testing/web-platform/tests/css/css-namespaces/syntax-004.xml
index c4ce372b09c4..335bca98d24a 100644
--- a/testing/web-platform/tests/css/css-namespaces/syntax-004.xml
+++ b/testing/web-platform/tests/css/css-namespaces/syntax-004.xml
@@ -3,7 +3,7 @@
   <link rel="author" title="Anne van Kesteren" href="http://annevankesteren.nl/"/>
   <link rel="author" title="Opera Software ASA" href="http://opera.com/"/>
   <link rel="help" href="http://www.w3.org/TR/css-namespaces-3/#syntax"/>
-  <link rel="match" href="reference/ref-lime-1.xml"/>
+  <link rel="match" href="reftest/ref-lime-1.xml"/>
   <title>CSS Namespaces Test Suite: @namespace url() with escape</title>
   <style>
    @namespace u\00072l("test");
diff --git a/testing/web-platform/tests/css/css-namespaces/syntax-005.xml b/testing/web-platform/tests/css/css-namespaces/syntax-005.xml
index 9d6b0abe945b..164bea1ece48 100644
--- a/testing/web-platform/tests/css/css-namespaces/syntax-005.xml
+++ b/testing/web-platform/tests/css/css-namespaces/syntax-005.xml
@@ -3,7 +3,7 @@
   <link rel="author" title="Anne van Kesteren" href="http://annevankesteren.nl/"/>
   <link rel="author" title="Opera Software ASA" href="http://opera.com/"/>
   <link rel="help" href="http://www.w3.org/TR/css-namespaces-3/#syntax"/>
-  <link rel="match" href="reference/ref-lime-5.xml"/>
+  <link rel="match" href="reftest/ref-lime-5.xml"/>
   <title>CSS Namespaces Test Suite: @namespace string and url() syntax</title>
   <style>
    test { background:red }
diff --git a/testing/web-platform/tests/css/css-namespaces/syntax-006.xml b/testing/web-platform/tests/css/css-namespaces/syntax-006.xml
index 09ff0d5916ec..1c5975a852a2 100644
--- a/testing/web-platform/tests/css/css-namespaces/syntax-006.xml
+++ b/testing/web-platform/tests/css/css-namespaces/syntax-006.xml
@@ -3,7 +3,7 @@
   <link rel="author" title="Anne van Kesteren" href="http://annevankesteren.nl/"/>
   <link rel="author" title="Opera Software ASA" href="http://opera.com/"/>
   <link rel="help" href="http://www.w3.org/TR/css-namespaces-3/#syntax"/>
-  <link rel="match" href="reference/ref-lime-1.xml"/>
+  <link rel="match" href="reftest/ref-lime-1.xml"/>
   <meta name="flags" content="invalid"/>
   <title>CSS Namespaces Test Suite: invalid ordering of @namespace and @import</title>
   <style>
diff --git a/testing/web-platform/tests/css/css-namespaces/syntax-007.xml b/testing/web-platform/tests/css/css-namespaces/syntax-007.xml
index 0c651f17d789..6022d1c7e1c3 100644
--- a/testing/web-platform/tests/css/css-namespaces/syntax-007.xml
+++ b/testing/web-platform/tests/css/css-namespaces/syntax-007.xml
@@ -3,7 +3,7 @@
   <link rel="author" title="Anne van Kesteren" href="http://annevankesteren.nl/"/>
   <link rel="author" title="Opera Software ASA" href="http://opera.com/"/>
   <link rel="help" href="http://www.w3.org/TR/css-namespaces-3/#syntax"/>
-  <link rel="match" href="reference/ref-lime-1.xml"/>
+  <link rel="match" href="reftest/ref-lime-1.xml"/>
   <title>CSS Namespaces Test Suite: @namespace and @charset</title>
   <link rel="stylesheet" href="support/syntax-007.css"/>
  </head>
diff --git a/testing/web-platform/tests/css/css-namespaces/syntax-008.xml b/testing/web-platform/tests/css/css-namespaces/syntax-008.xml
index 20284e2247c1..4cb4e233979e 100644
--- a/testing/web-platform/tests/css/css-namespaces/syntax-008.xml
+++ b/testing/web-platform/tests/css/css-namespaces/syntax-008.xml
@@ -3,7 +3,7 @@
   <link rel="author" title="Anne van Kesteren" href="http://annevankesteren.nl/"/>
   <link rel="author" title="Opera Software ASA" href="http://opera.com/"/>
   <link rel="help" href="http://www.w3.org/TR/css-namespaces-3/#syntax"/>
-  <link rel="match" href="reference/ref-lime-2.xml"/>
+  <link rel="match" href="reftest/ref-lime-2.xml"/>
   <title>CSS Namespaces Test Suite: escapes in prefix</title>
   <style>
    @namespace \72x url("test");
diff --git a/testing/web-platform/tests/css/css-namespaces/syntax-009.xml b/testing/web-platform/tests/css/css-namespaces/syntax-009.xml
index edf2f4c9b489..9f69fec67e0b 100644
--- a/testing/web-platform/tests/css/css-namespaces/syntax-009.xml
+++ b/testing/web-platform/tests/css/css-namespaces/syntax-009.xml
@@ -3,7 +3,7 @@
   <link rel="author" title="Anne van Kesteren" href="http://annevankesteren.nl/"/>
   <link rel="author" title="Opera Software ASA" href="http://opera.com/"/>
   <link rel="help" href="http://www.w3.org/TR/css-namespaces-3/#syntax"/>
-  <link rel="match" href="reference/ref-lime-1.xml"/>
+  <link rel="match" href="reftest/ref-lime-1.xml"/>
   <title>CSS Namespaces Test Suite: escaped vertical bar in qualified name</title>
   <style>
    @namespace x "test";
diff --git a/testing/web-platform/tests/css/css-namespaces/syntax-010.xml b/testing/web-platform/tests/css/css-namespaces/syntax-010.xml
index 06b280da792d..e175a7bd3ceb 100644
--- a/testing/web-platform/tests/css/css-namespaces/syntax-010.xml
+++ b/testing/web-platform/tests/css/css-namespaces/syntax-010.xml
@@ -3,7 +3,7 @@
   <link rel="author" title="Anne van Kesteren" href="http://annevankesteren.nl/"/>
   <link rel="author" title="Opera Software ASA" href="http://opera.com/"/>
   <link rel="help" href="http://www.w3.org/TR/css-namespaces-3/#syntax"/>
-  <link rel="match" href="reference/ref-lime-3.xml"/>
+  <link rel="match" href="reftest/ref-lime-3.xml"/>
   <meta name="flags" content="invalid"/>
   <title>CSS Namespaces Test Suite: duplicate @namespace declarations</title>
   <style>
diff --git a/testing/web-platform/tests/css/css-namespaces/syntax-011.xml b/testing/web-platform/tests/css/css-namespaces/syntax-011.xml
index 7d137fc7a546..e60cbe115ea1 100644
--- a/testing/web-platform/tests/css/css-namespaces/syntax-011.xml
+++ b/testing/web-platform/tests/css/css-namespaces/syntax-011.xml
@@ -3,7 +3,7 @@
   <link rel="author" title="Anne van Kesteren" href="http://annevankesteren.nl/"/>
   <link rel="author" title="Opera Software ASA" href="http://opera.com/"/>
   <link rel="help" href="http://www.w3.org/TR/css-namespaces-3/#syntax"/>
-  <link rel="match" href="reference/ref-lime-6.xml"/>
+  <link rel="match" href="reftest/ref-lime-6.xml"/>
   <title>CSS Namespaces Test Suite: string comparison (no URI resolving)</title>
   <style>
    @namespace url("http://example.com/");
diff --git a/testing/web-platform/tests/css/css-namespaces/syntax-012.xml b/testing/web-platform/tests/css/css-namespaces/syntax-012.xml
index 43f211b4dd20..557ba5065ba8 100644
--- a/testing/web-platform/tests/css/css-namespaces/syntax-012.xml
+++ b/testing/web-platform/tests/css/css-namespaces/syntax-012.xml
@@ -3,7 +3,7 @@
   <link rel="author" title="Anne van Kesteren" href="http://annevankesteren.nl/"/>
   <link rel="author" title="Opera Software ASA" href="http://opera.com/"/>
   <link rel="help" href="http://www.w3.org/TR/css-namespaces-3/#syntax"/>
-  <link rel="match" href="reference/ref-lime-3.xml"/>
+  <link rel="match" href="reftest/ref-lime-3.xml"/>
   <title>CSS Namespaces Test Suite: whitespace and comment handling</title>
   <style>
    test { background:red }
diff --git a/testing/web-platform/tests/css/css-namespaces/syntax-013.xml b/testing/web-platform/tests/css/css-namespaces/syntax-013.xml
index a7c63e43e092..983e2e62d92b 100644
--- a/testing/web-platform/tests/css/css-namespaces/syntax-013.xml
+++ b/testing/web-platform/tests/css/css-namespaces/syntax-013.xml
@@ -4,7 +4,7 @@
   <link rel="author" title="Opera Software ASA" href="http://opera.com/"/>
   <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact"/>
   <link rel="help" href="http://www.w3.org/TR/css-namespaces-3/#syntax"/>
-  <link rel="match" href="reference/ref-lime-5.xml"/>
+  <link rel="match" href="reftest/ref-lime-5.xml"/>
   <meta name="flags" content="invalid"/>
   <title>CSS Namespaces Test Suite: @namespace error handling</title>
   <style>
diff --git a/testing/web-platform/tests/css/css-namespaces/syntax-014.xml b/testing/web-platform/tests/css/css-namespaces/syntax-014.xml
index 1bdfc265ef60..d57d8991cc82 100644
--- a/testing/web-platform/tests/css/css-namespaces/syntax-014.xml
+++ b/testing/web-platform/tests/css/css-namespaces/syntax-014.xml
@@ -3,7 +3,7 @@
   <link rel="author" title="Anne van Kesteren" href="http://annevankesteren.nl/"/>
   <link rel="author" title="Opera Software ASA" href="http://opera.com/"/>
   <link rel="help" href="http://www.w3.org/TR/css-namespaces-3/#syntax"/>
-  <link rel="match" href="reference/ref-lime-3.xml"/>
+  <link rel="match" href="reftest/ref-lime-3.xml"/>
   <meta name="flags" content="invalid"/>
   <title>CSS Namespaces Test Suite: @namespace and invalid at-rules</title>
   <style>
diff --git a/testing/web-platform/tests/css/css-namespaces/syntax-015.xml b/testing/web-platform/tests/css/css-namespaces/syntax-015.xml
index d39eb8b3a48d..4460ddf559b1 100644
--- a/testing/web-platform/tests/css/css-namespaces/syntax-015.xml
+++ b/testing/web-platform/tests/css/css-namespaces/syntax-015.xml
@@ -3,7 +3,7 @@
   <link rel="author" title="Anne van Kesteren" href="http://annevankesteren.nl/"/>
   <link rel="author" title="Opera Software ASA" href="http://opera.com/"/>
   <link rel="help" href="http://www.w3.org/TR/css-namespaces-3/#syntax"/>
-  <link rel="match" href="reference/ref-lime-1.xml"/>
+  <link rel="match" href="reftest/ref-lime-1.xml"/>
   <title>CSS Namespaces Test Suite: invalid URI</title>
   <style>
    @namespace x url("test");
diff --git a/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-002.https.html b/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-002.https.html
index b1b50e04045f..6fc16c74701f 100644
--- a/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-002.https.html
+++ b/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-002.https.html
@@ -25,8 +25,7 @@ try {
         }
     });
 } catch(ex) {
-    // 'inputArguments' property is a string, not a sequence.
-    if (ex.name == 'TypeError')
+    if (ex.name == "TypeError" && ex.message == "Failed to execute 'registerPaint' on 'PaintWorkletGlobalScope': The provided value cannot be converted to a sequence.")
         testsPassed = true;
 }
 
diff --git a/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-003.https.html b/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-003.https.html
index 3b1b0014f78a..44fd850f9ab8 100644
--- a/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-003.https.html
+++ b/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-003.https.html
@@ -25,8 +25,7 @@ try {
         }
     });
 } catch(ex) {
-    // 'non-sense-type' is not a proper name of CSS properties.
-    if (ex.name == 'TypeError')
+    if (ex.name == "TypeError" && ex.message == "Failed to execute 'registerPaint' on 'PaintWorkletGlobalScope': Invalid argument types.")
         testsPassed = true;
 }
 
diff --git a/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-005.https.html b/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-005.https.html
index 0c5e539381bd..c12e00c92f5b 100644
--- a/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-005.https.html
+++ b/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-005.https.html
@@ -22,8 +22,7 @@ try {
     registerPaint('foo', class { paint() { } });
     registerPaint('foo', class { paint() { } });
 } catch(ex) {
-    // 'foo' gets registered twice.
-    if (ex.name == 'InvalidModificationError')
+    if (ex.name == "NotSupportedError" && ex.message == "Failed to execute 'registerPaint' on 'PaintWorkletGlobalScope': A class with name:'foo' is already registered.")
         testsPassed = true;
 }
 
diff --git a/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-006.https.html b/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-006.https.html
index e99ab05a88d9..664b7a8c1a0d 100644
--- a/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-006.https.html
+++ b/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-006.https.html
@@ -21,8 +21,7 @@ var testsPassed = false;
 try {
     registerPaint('', class { });
 } catch(ex) {
-    // The empty string is not a valid name.
-    if (ex.name == 'TypeError')
+    if (ex.name == 'TypeError' && ex.message == "Failed to execute 'registerPaint' on 'PaintWorkletGlobalScope': The empty string is not a valid name.")
         testsPassed = true;
 }
 
diff --git a/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-008.https.html b/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-008.https.html
index e6b863c641c0..1914e3cf044e 100644
--- a/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-008.https.html
+++ b/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-008.https.html
@@ -25,8 +25,7 @@ try {
         }
     });
 } catch(ex) {
-    // 'inputProperties' property is 42, not a sequence<DOMString>.
-    if (ex.name == 'TypeError')
+    if (ex.name == 'TypeError' && ex.message == "Failed to execute 'registerPaint' on 'PaintWorkletGlobalScope': The provided value cannot be converted to a sequence.")
         testsPassed = true;
 }
 
diff --git a/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-009.https.html b/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-009.https.html
index b23191ae3401..21d004df0eee 100644
--- a/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-009.https.html
+++ b/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-009.https.html
@@ -23,8 +23,7 @@ try {
     a.prototype = undefined;
     registerPaint('foo5', a);
 } catch(ex) {
-    // The prototype object is undefined, not an object.
-    if (ex.name == 'TypeError')
+    if (ex.name == 'TypeError' && ex.message == "Failed to execute 'registerPaint' on 'PaintWorkletGlobalScope': The 'prototype' object on the class does not exist.")
         testsPassed = true;
 }
 
diff --git a/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-010.https.html b/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-010.https.html
index e98b43164893..d923479ea81a 100644
--- a/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-010.https.html
+++ b/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-010.https.html
@@ -23,8 +23,7 @@ try {
     b.prototype = 42;
     registerPaint('foo6', b);
 } catch(ex) {
-    // The prototype object is 42, not an object.
-    if (ex.name == 'TypeError')
+    if (ex.name == 'TypeError' && ex.message == "Failed to execute 'registerPaint' on 'PaintWorkletGlobalScope': The 'prototype' property on the class is not an object.")
         testsPassed = true;
 }
 
diff --git a/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-011.https.html b/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-011.https.html
index b9d54bf413d7..6cea438fce21 100644
--- a/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-011.https.html
+++ b/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-011.https.html
@@ -21,8 +21,7 @@ var testsPassed = false;
 try {
     registerPaint('foo7', class { });
 } catch(ex) {
-    // 'paint' property doesn't exist on the prototype chain.
-    if (ex.name == 'TypeError')
+    if (ex.name == 'TypeError' && ex.message == "Failed to execute 'registerPaint' on 'PaintWorkletGlobalScope': The 'paint' property on the prototype does not exist.")
         testsPassed = true;
 }
 
diff --git a/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-012.https.html b/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-012.https.html
index 14eebeb635a7..938150aa9aaf 100644
--- a/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-012.https.html
+++ b/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-012.https.html
@@ -25,8 +25,7 @@ try {
         }
     });
 } catch(ex) {
-    // 'paint' property's value is 42, not a function.
-    if (ex.name == 'TypeError')
+    if (ex.name == 'TypeError' && ex.message == "Failed to execute 'registerPaint' on 'PaintWorkletGlobalScope': The 'paint' property on the prototype is not a function.")
         testsPassed = true;
 }
 
diff --git a/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-016.https.html b/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-016.https.html
index 31cca45facab..8c9d05dcd1ae 100644
--- a/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-016.https.html
+++ b/testing/web-platform/tests/css/css-paint-api/parse-input-arguments-016.https.html
@@ -25,8 +25,7 @@ try {
         }
     });
 } catch(ex) {
-    // 'contextOptions' property is 42, not a dictionary.
-    if (ex.name == 'TypeError')
+    if (ex.name == "TypeError" && ex.message == "Failed to execute 'registerPaint' on 'PaintWorkletGlobalScope': cannot convert to dictionary.")
         testsPassed = true;
 }
 
diff --git a/testing/web-platform/tests/css/css-position/parsing/z-index-invalid.html b/testing/web-platform/tests/css/css-position/parsing/z-index-invalid.html
index d89720ab1460..ceb7448dd0b8 100644
--- a/testing/web-platform/tests/css/css-position/parsing/z-index-invalid.html
+++ b/testing/web-platform/tests/css/css-position/parsing/z-index-invalid.html
@@ -14,6 +14,8 @@
 test_invalid_value("z-index", "none");
 test_invalid_value("z-index", "10px");
 test_invalid_value("z-index", "0.5");
+test_invalid_value("z-index", "calc(0.5)");
+
 test_invalid_value("z-index", "auto 123");
 </script>
 </body>
diff --git a/testing/web-platform/tests/css/css-position/position-absolute-container-dynamic.html b/testing/web-platform/tests/css/css-position/position-absolute-container-dynamic.html
deleted file mode 100644
index 711d31766da2..000000000000
--- a/testing/web-platform/tests/css/css-position/position-absolute-container-dynamic.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html>
-<title>CSS Position Absolute: dynamic changes to containing block width</title>
-<link rel="author" href="mailto:atotic@google.com">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<link rel="help" href="https://www.w3.org/TR/css-position-3/#abs-non-replaced-width">
-<meta name="assert" content="abspos descendant responds to containing block size change">
-<style>
-
-#container {
-  position: relative;
-  width: 50px;
-  height: 100px;
-  background: red;
-}
-#target {
-  position: absolute;
-  left: 0;
-  width: 100%;
-  height: 100%;
-  background: green;
-}
-</style>
-<div id="container">
-  <div style="display:flex;">
-    <div id="target"></div>
-  </div>
-</div>
-<script>
-document.body.offsetTop;
-test(() => {
-  document.getElementById("container").style.width = "100px";
-  assert_equals(document.querySelector("#target").offsetWidth, 100);
-}, '#target used container width when computing size');
-</script>
diff --git a/testing/web-platform/tests/css/css-position/position-absolute-dynamic-containing-block.html b/testing/web-platform/tests/css/css-position/position-absolute-dynamic-containing-block.html
deleted file mode 100644
index 3968f6858496..000000000000
--- a/testing/web-platform/tests/css/css-position/position-absolute-dynamic-containing-block.html
+++ /dev/null
@@ -1,140 +0,0 @@
-<!DOCTYPE html>
-<title>CSS Position: position:absolute dynamic containing block</title>
-<link rel="author" title="mailto:atotic@google.com">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<link rel="help" href="https://drafts.csswg.org/css-position-3/#def-cb">
-<meta name="assert" content="Tests changes in containing block for out-of-flow positioned descendants.">
-<style>
-
-#outer {
-  width: 400px;
-  height: 300px;
-  outline: black solid 1px;
-}
-#intermediate {
-  width: 300px;
-  height: 200px;
-  outline: gray solid 1px;
-}
-#target {
-  background: green;
-}
-.abs {
-  position: absolute;
-  top: 0;
-  left: 0;
-  bottom: 0;
-  right: 0;
-}
-.fixed {
-  position: fixed;
-  top: 0;
-  left: 0;
-  bottom: 0;
-  right: 0;
-}
-.abs-container {
-  position: relative;
-}
-.fixed-container {
-  will-change: transform;
-}
-div {
-  padding: 5px;
-}
-</style>
-<!-- This tests potential caching of out-of-flow positioned descendants. -->
-<div id="outer">
-  <div>
-    <div id="intermediate">
-      <div>
-        <div id="target">TTT</div>
-        <div id="noLayout1"></div>
-      </div>
-      <div id="noLayout2"></div>
-    </div>
-  </div>
-</div>
-<script>
-  let outer = document.querySelector("#outer");
-  let intermediate = document.querySelector("#intermediate");
-  let target = document.querySelector("#target");
-  let padding = 5;
-
-  function cleanup() {
-    outer.className = "";
-    intermediate.className = "";
-    target.className = "";
-    document.body.offsetTop;
-  }
-
-  test( t => {
-    t.add_cleanup(cleanup);
-    outer.classList.add("abs-container");
-    target.classList.add("abs");
-    assert_equals(target.offsetHeight, outer.offsetHeight);
-    intermediate.classList.add("abs-container");
-    assert_equals(target.offsetHeight, intermediate.offsetHeight);
-  }, "abs containing block moves from outer to intermediate" );
-  test( t => {
-    t.add_cleanup(cleanup);
-    target.classList.add("abs");
-    intermediate.classList.add("abs-container");
-    assert_equals(target.offsetHeight, intermediate.offsetHeight);
-    outer.classList.add("abs-container");
-    assert_equals(target.offsetHeight, intermediate.offsetHeight);
-    intermediate.classList.remove("abs-container");
-    assert_equals(target.offsetHeight, outer.offsetHeight);
-  }, "abs containing block moves from intermediate to outer" );
-  test( t => {
-    t.add_cleanup(cleanup);
-    target.classList.add("abs");
-    outer.classList.add("abs-container");
-    assert_equals(target.offsetHeight, outer.offsetHeight);
-    target.classList.remove("abs");
-    assert_equals(target.offsetWidth, intermediate.offsetWidth - 4 * padding);
-  }, "target is no longer absolute");
-  test( t => {
-    t.add_cleanup(cleanup);
-    outer.classList.add("abs-container");
-    assert_equals(target.offsetWidth, intermediate.offsetWidth - 4 * padding);
-    target.classList.add("abs");
-    assert_equals(target.offsetHeight, outer.offsetHeight);
-  }, "target becomes absolute");
-
- // Repeat same tests with fixed
-  test( t => {
-    t.add_cleanup(cleanup);
-    outer.classList.add("fixed-container");
-    target.classList.add("fixed");
-    assert_equals(target.offsetHeight, outer.offsetHeight);
-    intermediate.classList.add("fixed-container");
-    assert_equals(target.offsetHeight, intermediate.offsetHeight);
-  }, "fixed containing block moves from outer to intermediate" );
-  test( t => {
-    t.add_cleanup(cleanup);
-    target.classList.add("fixed");
-    intermediate.classList.add("fixed-container");
-    assert_equals(target.offsetHeight, intermediate.offsetHeight);
-    outer.classList.add("fixed-container");
-    assert_equals(target.offsetHeight, intermediate.offsetHeight);
-    intermediate.classList.remove("fixed-container");
-    assert_equals(target.offsetHeight, outer.offsetHeight);
-  }, "fixed containing block moves from intermediate to outer" );
-  test( t => {
-    t.add_cleanup(cleanup);
-    target.classList.add("fixed");
-    outer.classList.add("fixed-container");
-    assert_equals(target.offsetHeight, outer.offsetHeight);
-    target.classList.remove("fixed");
-    assert_equals(target.offsetWidth, intermediate.offsetWidth - 4 * padding);
-  }, "target is no longer fixed");
-  test( t => {
-    t.add_cleanup(cleanup);
-    outer.classList.add("fixed-container");
-    assert_equals(target.offsetWidth, intermediate.offsetWidth - 4 * padding);
-    target.classList.add("fixed");
-    assert_equals(target.offsetHeight, outer.offsetHeight);
-  }, "target becomes fixed");
-</script>
diff --git a/testing/web-platform/tests/css/css-position/position-absolute-percentage-height.html b/testing/web-platform/tests/css/css-position/position-absolute-percentage-height.html
deleted file mode 100644
index 8b2e5c0f720d..000000000000
--- a/testing/web-platform/tests/css/css-position/position-absolute-percentage-height.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<!DOCTYPE html>
-<title>CSS Position Absolute: css-position-3</title>
-<link rel="author" href="mailto:atotic@google.com">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<link rel="help" href="https://www.w3.org/TR/css-position-3/">
-<meta name="assert" content="abspos resolves %-ge sizes correctly.">
-<style>
-
-#container {
-  position: relative;
-}
-
-#image-wrapper {
-  display: flex;
-  position: absolute;
-  height: 100%;
-  background: green;
-}
-
-#content-wrapper {
-  margin-left: 30%;
-}
-
-#target {
-  display: block;
-  min-height: 100%;
-  opacity: 0.5;
-}
-</style>
-<!-- IMG height is 100% of image wrapper height.
-  IMG width is 100% of image wrapper width.
-  IMG width equals IMG height -->
-<div id="container">
-  <div id="image-wrapper">
-    <!-- 1x1 green pixel -->
-    <img id="target" src="data:image/gif;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNk+M/wHwAEBgIApD5fRAAAAABJRU5ErkJggg==">
-  </div>
-  <div id="content-wrapper">
-    Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
-  </div>
-</div>
-<script>
-document.body.offsetTop;
-test(() => {
-  let target = document.querySelector("#target");
-  assert_equals(target.offsetWidth, target.offsetHeight);
-  assert_equals(target.offsetWidth, document.querySelector("#image-wrapper").offsetWidth);
-  assert_equals(target.offsetHeight, document.querySelector("#content-wrapper").offsetHeight);
-}, '#target height matches containing block height, and target parent width matches #target width' );
-
-test(() => {
-  document.body.style.marginLeft = "300px";
-  let target = document.querySelector("#target");
-  assert_equals(target.offsetWidth, target.offsetHeight);
-  assert_equals(target.offsetWidth, document.querySelector("#image-wrapper").offsetWidth);
-  assert_equals(target.offsetHeight, document.querySelector("#content-wrapper").offsetHeight);
-}, '#target height matches containing block height, and target parent width matches #target width after resize');
-</script>
diff --git a/testing/web-platform/tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-001.html b/testing/web-platform/tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-001.html
deleted file mode 100644
index d6f8ed4e39ae..000000000000
--- a/testing/web-platform/tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-001.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<link rel="help" href="https://drafts.csswg.org/css2/visudet.html#abs-non-replaced-width" />
-<link rel="match" href="../../reference/ref-filled-green-100px-square-only.html">
-<meta name="assert" content="Tests the static position of inline-level absolute-positioned elements, with combinations of float, direction, and text-align." />
-<style>
-#container { position: relative; background: red; width: 100px; height: 100px; }
-#container > div { background: green; }
-#inflow { height: 50px; }
-#float { float: left; width: 50px; height: 50px; }
-#abs { display: inline; position: absolute; width: 50px; height: 50px; }
-</style>
-<p>Test passes if there is a filled green square.</p>
-<div id=container style="direction: ltr; text-align: left;">
-  <div id=inflow></div>
-  <div id=float style="float: left;"></div>
-  <div id=abs style="transform: translateX(0%);"></div>
-</div>
diff --git a/testing/web-platform/tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-002.html b/testing/web-platform/tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-002.html
deleted file mode 100644
index 9b0f5c2beaf4..000000000000
--- a/testing/web-platform/tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-002.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<link rel="help" href="https://drafts.csswg.org/css2/visudet.html#abs-non-replaced-width" />
-<link rel="match" href="../../reference/ref-filled-green-100px-square-only.html">
-<meta name="assert" content="Tests the static position of inline-level absolute-positioned elements, with combinations of float, direction, and text-align." />
-<style>
-#container { position: relative; background: red; width: 100px; height: 100px; }
-#container > div { background: green; }
-#inflow { height: 50px; }
-#float { float: left; width: 50px; height: 50px; }
-#abs { display: inline; position: absolute; width: 50px; height: 50px; }
-</style>
-<p>Test passes if there is a filled green square.</p>
-<div id=container style="direction: ltr; text-align: center;">
-  <div id=inflow></div>
-  <div id=float style="float: left;"></div>
-  <div id=abs style="transform: translateX(-50%);"></div>
-</div>
diff --git a/testing/web-platform/tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-003.html b/testing/web-platform/tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-003.html
deleted file mode 100644
index 90db2d4f80d0..000000000000
--- a/testing/web-platform/tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-003.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<link rel="help" href="https://drafts.csswg.org/css2/visudet.html#abs-non-replaced-width" />
-<link rel="match" href="../../reference/ref-filled-green-100px-square-only.html">
-<meta name="assert" content="Tests the static position of inline-level absolute-positioned elements, with combinations of float, direction, and text-align." />
-<style>
-#container { position: relative; background: red; width: 100px; height: 100px; }
-#container > div { background: green; }
-#inflow { height: 50px; }
-#float { float: left; width: 50px; height: 50px; }
-#abs { display: inline; position: absolute; width: 50px; height: 50px; }
-</style>
-<p>Test passes if there is a filled green square.</p>
-<div id=container style="direction: ltr; text-align: right;">
-  <div id=inflow></div>
-  <div id=float style="float: left;"></div>
-  <div id=abs style="transform: translateX(-100%);"></div>
-</div>
diff --git a/testing/web-platform/tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-004.html b/testing/web-platform/tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-004.html
deleted file mode 100644
index a6b13b26c8f4..000000000000
--- a/testing/web-platform/tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-004.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<link rel="help" href="https://drafts.csswg.org/css2/visudet.html#abs-non-replaced-width" />
-<link rel="match" href="../../reference/ref-filled-green-100px-square-only.html">
-<meta name="assert" content="Tests the static position of inline-level absolute-positioned elements, with combinations of float, direction, and text-align." />
-<style>
-#container { position: relative; background: red; width: 100px; height: 100px; }
-#container > div { background: green; }
-#inflow { height: 50px; }
-#float { float: left; width: 50px; height: 50px; }
-#abs { display: inline; position: absolute; width: 50px; height: 50px; }
-</style>
-<p>Test passes if there is a filled green square.</p>
-<div id=container style="direction: ltr; text-align: left;">
-  <div id=inflow></div>
-  <div id=float style="float: right;"></div>
-  <div id=abs style="transform: translateX(0%);"></div>
-</div>
diff --git a/testing/web-platform/tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-005.html b/testing/web-platform/tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-005.html
deleted file mode 100644
index 481c83a757d4..000000000000
--- a/testing/web-platform/tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-005.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<link rel="help" href="https://drafts.csswg.org/css2/visudet.html#abs-non-replaced-width" />
-<link rel="match" href="../../reference/ref-filled-green-100px-square-only.html">
-<meta name="assert" content="Tests the static position of inline-level absolute-positioned elements, with combinations of float, direction, and text-align." />
-<style>
-#container { position: relative; background: red; width: 100px; height: 100px; }
-#container > div { background: green; }
-#inflow { height: 50px; }
-#float { float: left; width: 50px; height: 50px; }
-#abs { display: inline; position: absolute; width: 50px; height: 50px; }
-</style>
-<p>Test passes if there is a filled green square.</p>
-<div id=container style="direction: ltr; text-align: center;">
-  <div id=inflow></div>
-  <div id=float style="float: right;"></div>
-  <div id=abs style="transform: translateX(-50%);"></div>
-</div>
diff --git a/testing/web-platform/tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-006.html b/testing/web-platform/tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-006.html
deleted file mode 100644
index de5322f81998..000000000000
--- a/testing/web-platform/tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-006.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<link rel="help" href="https://drafts.csswg.org/css2/visudet.html#abs-non-replaced-width" />
-<link rel="match" href="../../reference/ref-filled-green-100px-square-only.html">
-<meta name="assert" content="Tests the static position of inline-level absolute-positioned elements, with combinations of float, direction, and text-align." />
-<style>
-#container { position: relative; background: red; width: 100px; height: 100px; }
-#container > div { background: green; }
-#inflow { height: 50px; }
-#float { float: left; width: 50px; height: 50px; }
-#abs { display: inline; position: absolute; width: 50px; height: 50px; }
-</style>
-<p>Test passes if there is a filled green square.</p>
-<div id=container style="direction: ltr; text-align: right;">
-  <div id=inflow></div>
-  <div id=float style="float: right;"></div>
-  <div id=abs style="transform: translateX(-100%);"></div>
-</div>
diff --git a/testing/web-platform/tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-007.html b/testing/web-platform/tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-007.html
deleted file mode 100644
index 1168b1d2287c..000000000000
--- a/testing/web-platform/tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-007.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<link rel="help" href="https://drafts.csswg.org/css2/visudet.html#abs-non-replaced-width" />
-<link rel="match" href="../../reference/ref-filled-green-100px-square-only.html">
-<meta name="assert" content="Tests the static position of inline-level absolute-positioned elements, with combinations of float, direction, and text-align." />
-<style>
-#container { position: relative; background: red; width: 100px; height: 100px; }
-#container > div { background: green; }
-#inflow { height: 50px; }
-#float { float: left; width: 50px; height: 50px; }
-#abs { display: inline; position: absolute; width: 50px; height: 50px; }
-</style>
-<p>Test passes if there is a filled green square.</p>
-<div id=container style="direction: rtl; text-align: right;">
-  <div id=inflow></div>
-  <div id=float style="float: left;"></div>
-  <div id=abs style="transform: translateX(0%);"></div>
-</div>
diff --git a/testing/web-platform/tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-008.html b/testing/web-platform/tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-008.html
deleted file mode 100644
index e10a7e191d35..000000000000
--- a/testing/web-platform/tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-008.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<link rel="help" href="https://drafts.csswg.org/css2/visudet.html#abs-non-replaced-width" />
-<link rel="match" href="../../reference/ref-filled-green-100px-square-only.html">
-<meta name="assert" content="Tests the static position of inline-level absolute-positioned elements, with combinations of float, direction, and text-align." />
-<style>
-#container { position: relative; background: red; width: 100px; height: 100px; }
-#container > div { background: green; }
-#inflow { height: 50px; }
-#float { float: left; width: 50px; height: 50px; }
-#abs { display: inline; position: absolute; width: 50px; height: 50px; }
-</style>
-<p>Test passes if there is a filled green square.</p>
-<div id=container style="direction: rtl; text-align: center;">
-  <div id=inflow></div>
-  <div id=float style="float: left;"></div>
-  <div id=abs style="transform: translateX(50%);"></div>
-</div>
diff --git a/testing/web-platform/tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-009.html b/testing/web-platform/tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-009.html
deleted file mode 100644
index 86102fa1d995..000000000000
--- a/testing/web-platform/tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-009.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<link rel="help" href="https://drafts.csswg.org/css2/visudet.html#abs-non-replaced-width" />
-<link rel="match" href="../../reference/ref-filled-green-100px-square-only.html">
-<meta name="assert" content="Tests the static position of inline-level absolute-positioned elements, with combinations of float, direction, and text-align." />
-<style>
-#container { position: relative; background: red; width: 100px; height: 100px; }
-#container > div { background: green; }
-#inflow { height: 50px; }
-#float { float: left; width: 50px; height: 50px; }
-#abs { display: inline; position: absolute; width: 50px; height: 50px; }
-</style>
-<p>Test passes if there is a filled green square.</p>
-<div id=container style="direction: rtl; text-align: left;">
-  <div id=inflow></div>
-  <div id=float style="float: left;"></div>
-  <div id=abs style="transform: translateX(100%);"></div>
-</div>
diff --git a/testing/web-platform/tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-010.html b/testing/web-platform/tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-010.html
deleted file mode 100644
index 95d43b9cfb2b..000000000000
--- a/testing/web-platform/tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-010.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<link rel="help" href="https://drafts.csswg.org/css2/visudet.html#abs-non-replaced-width" />
-<link rel="match" href="../../reference/ref-filled-green-100px-square-only.html">
-<meta name="assert" content="Tests the static position of inline-level absolute-positioned elements, with combinations of float, direction, and text-align." />
-<style>
-#container { position: relative; background: red; width: 100px; height: 100px; }
-#container > div { background: green; }
-#inflow { height: 50px; }
-#float { float: left; width: 50px; height: 50px; }
-#abs { display: inline; position: absolute; width: 50px; height: 50px; }
-</style>
-<p>Test passes if there is a filled green square.</p>
-<div id=container style="direction: rtl; text-align: right;">
-  <div id=inflow></div>
-  <div id=float style="float: right;"></div>
-  <div id=abs style="transform: translateX(0%);"></div>
-</div>
diff --git a/testing/web-platform/tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-011.html b/testing/web-platform/tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-011.html
deleted file mode 100644
index 375566388ef6..000000000000
--- a/testing/web-platform/tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-011.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<link rel="help" href="https://drafts.csswg.org/css2/visudet.html#abs-non-replaced-width" />
-<link rel="match" href="../../reference/ref-filled-green-100px-square-only.html">
-<meta name="assert" content="Tests the static position of inline-level absolute-positioned elements, with combinations of float, direction, and text-align." />
-<style>
-#container { position: relative; background: red; width: 100px; height: 100px; }
-#container > div { background: green; }
-#inflow { height: 50px; }
-#float { float: left; width: 50px; height: 50px; }
-#abs { display: inline; position: absolute; width: 50px; height: 50px; }
-</style>
-<p>Test passes if there is a filled green square.</p>
-<div id=container style="direction: rtl; text-align: center;">
-  <div id=inflow></div>
-  <div id=float style="float: right;"></div>
-  <div id=abs style="transform: translateX(50%);"></div>
-</div>
diff --git a/testing/web-platform/tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-012.html b/testing/web-platform/tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-012.html
deleted file mode 100644
index 1972317822b9..000000000000
--- a/testing/web-platform/tests/css/css-position/static-position/inline-level-absolute-in-block-level-context-012.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<link rel="help" href="https://drafts.csswg.org/css2/visudet.html#abs-non-replaced-width" />
-<link rel="match" href="../../reference/ref-filled-green-100px-square-only.html">
-<meta name="assert" content="Tests the static position of inline-level absolute-positioned elements, with combinations of float, direction, and text-align." />
-<style>
-#container { position: relative; background: red; width: 100px; height: 100px; }
-#container > div { background: green; }
-#inflow { height: 50px; }
-#float { float: left; width: 50px; height: 50px; }
-#abs { display: inline; position: absolute; width: 50px; height: 50px; }
-</style>
-<p>Test passes if there is a filled green square.</p>
-<div id=container style="direction: rtl; text-align: left;">
-  <div id=inflow></div>
-  <div id=float style="float: right;"></div>
-  <div id=abs style="transform: translateX(100%);"></div>
-</div>
diff --git a/testing/web-platform/tests/css/css-scroll-snap/scroll-snap-stop-always.html b/testing/web-platform/tests/css/css-scroll-snap/scroll-snap-stop-always.html
deleted file mode 100644
index 62446f54632f..000000000000
--- a/testing/web-platform/tests/css/css-scroll-snap/scroll-snap-stop-always.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<!DOCTYPE html>
-<link rel="help" href="https://drafts.csswg.org/css-scroll-snap/#scroll-snap-stop" />
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<style>
-div {
-  position: absolute;
-}
-#scroller {
-  width: 400px;
-  height: 400px;
-  overflow: scroll;
-  scroll-snap-type: both mandatory;
-}
-#space {
-  left: 0px;
-  top: 0px;
-  width: 2100px;
-  height: 2100px;
-}
-.target {
-  width: 50px;
-  height: 50px;
-  scroll-snap-align: start;
-}
-.origin {
-  left: 0px;
-  top: 0px;
-}
-.always-stop {
-  left: 100px;
-  top: 0px;
-  scroll-snap-stop: always;
-}
-.closer {
-  left: 200px;
-  top: 0px;
-}
-</style>
-
-<div id="scroller">
-  <div id="space"></div>
-  <div class="target origin"></div>
-  <div class="target always-stop"></div>
-  <div class="target closer"></div>
-</div>
-
-<script>
-var scroller = document.getElementById("scroller");
-test(() => {
-  scroller.scrollTo(0, 0);
-  assert_equals(scroller.scrollLeft, 0);
-  assert_equals(scroller.scrollTop, 0);
-
-  scroller.scrollBy(300, 0);
-  assert_equals(scroller.scrollLeft, 100);
-  assert_equals(scroller.scrollTop, 0);
-}, "A scroll with intended direction and end position should not pass a snap " +
-   "area with scroll-snap-stop: always.")
-
-test(() => {
-  scroller.scrollTo(0, 0);
-  assert_equals(scroller.scrollLeft, 0);
-  assert_equals(scroller.scrollTop, 0);
-
-  scroller.scrollTo(300, 0);
-  assert_equals(scroller.scrollLeft, 200);
-  assert_equals(scroller.scrollTop, 0);
-}, "A scroll with intended end position should always choose the closest snap " +
-   "position regardless of the scroll-snap-stop value.")
-</script>
diff --git a/testing/web-platform/tests/css/css-sizing/intrinsic-percent-replaced-001.html b/testing/web-platform/tests/css/css-sizing/intrinsic-percent-replaced-001.html
deleted file mode 100644
index ebb93a225a7c..000000000000
--- a/testing/web-platform/tests/css/css-sizing/intrinsic-percent-replaced-001.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<!DOCTYPE html>
-<link rel="help" href="https://drafts.csswg.org/css-sizing-3/#intrinsic-sizes">
-<meta name="assert" content="Checks that a replaced element, with an aspect ratio, converts a percent height into an intrinsic width." />
-<link rel="match" href="../reference/ref-filled-green-100px-square-only.html">
-<style>
-#float { float: left; height: 100px; background: green; }
-canvas { height: 100%; }
-</style>
-<p>Test passes if there is a filled green square.</p>
-<div id=float>
-  <canvas width=10 height=10></canvas>
-</div>
diff --git a/testing/web-platform/tests/css/css-sizing/intrinsic-percent-replaced-002.html b/testing/web-platform/tests/css/css-sizing/intrinsic-percent-replaced-002.html
deleted file mode 100644
index 05051e63d8ce..000000000000
--- a/testing/web-platform/tests/css/css-sizing/intrinsic-percent-replaced-002.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!-- quirks mode -->
-<link rel="help" href="https://drafts.csswg.org/css-sizing-3/#intrinsic-sizes">
-<meta name="assert" content="Checks that a replaced element, with an aspect ratio, converts a percent height into an intrinsic width." />
-<link rel="match" href="../reference/ref-filled-green-100px-square-only.html">
-<style>
-#float { float: left; height: 100px; background: green; }
-canvas { height: 100%; }
-</style>
-<p style="margin-top: 1em;">Test passes if there is a filled green square.</p>
-<div id=float>
-  <div>
-    <canvas width=10 height=10></canvas>
-  </div>
-</div>
diff --git a/testing/web-platform/tests/css/css-sizing/intrinsic-percent-replaced-003.html b/testing/web-platform/tests/css/css-sizing/intrinsic-percent-replaced-003.html
deleted file mode 100644
index 0f130b82db58..000000000000
--- a/testing/web-platform/tests/css/css-sizing/intrinsic-percent-replaced-003.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- quirks mode -->
-<link rel="help" href="https://drafts.csswg.org/css-sizing-3/#intrinsic-sizes">
-<meta name="assert" content="Checks that a replaced element, with an aspect ratio, converts a percent height into an intrinsic width." />
-<link rel="match" href="../reference/ref-filled-green-100px-square-only.html">
-<style>
-#container { height: 200px; }
-#float { float: left; height: 50%; background: green; }
-canvas { height: 100%; }
-</style>
-<p style="margin-top: 1em;">Test passes if there is a filled green square.</p>
-<div id=container>
-  <div id=float>
-    <div>
-      <canvas width=10 height=10></canvas>
-    </div>
-  </div>
-</div>
diff --git a/testing/web-platform/tests/css/css-sizing/intrinsic-percent-replaced-004.html b/testing/web-platform/tests/css/css-sizing/intrinsic-percent-replaced-004.html
deleted file mode 100644
index 1c4002b0f8fc..000000000000
--- a/testing/web-platform/tests/css/css-sizing/intrinsic-percent-replaced-004.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- quirks mode -->
-<link rel="help" href="https://drafts.csswg.org/css-sizing-3/#intrinsic-sizes">
-<meta name="assert" content="Checks that a replaced element, with an aspect ratio, converts a percent height into an intrinsic width." />
-<link rel="match" href="../reference/ref-filled-green-100px-square-only.html">
-<style>
-#container { display: flex; height: 200px; }
-#float { float: left; height: 50%; background: green; }
-canvas { height: 100%; }
-</style>
-<p style="margin-top: 1em;">Test passes if there is a filled green square.</p>
-<div id=container>
-  <div id=float>
-    <div>
-      <canvas width=10 height=10></canvas>
-    </div>
-  </div>
-</div>
diff --git a/testing/web-platform/tests/css/css-sizing/intrinsic-percent-replaced-005.html b/testing/web-platform/tests/css/css-sizing/intrinsic-percent-replaced-005.html
deleted file mode 100644
index 84e945c83397..000000000000
--- a/testing/web-platform/tests/css/css-sizing/intrinsic-percent-replaced-005.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE html>
-<link rel="help" href="https://drafts.csswg.org/css-sizing-3/#intrinsic-sizes">
-<meta name="assert" content="Checks that a replaced element, with an aspect ratio, converts a percent height into an intrinsic width." />
-<link rel="match" href="../reference/ref-filled-green-100px-square-only.html">
-<style>
-#container { position: relative; height: 100px; }
-#abs { position: absolute; top: 0; bottom: 0; background: green; }
-canvas { height: 100%; }
-</style>
-<p>Test passes if there is a filled green square.</p>
-<div id=container>
-  <div id=abs>
-    <canvas width=10 height=10></canvas>
-  </div>
-</div>
diff --git a/testing/web-platform/tests/css/css-sizing/intrinsic-percent-replaced-006.html b/testing/web-platform/tests/css/css-sizing/intrinsic-percent-replaced-006.html
deleted file mode 100644
index bce0a18be6f6..000000000000
--- a/testing/web-platform/tests/css/css-sizing/intrinsic-percent-replaced-006.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- quirks mode -->
-<link rel="help" href="https://drafts.csswg.org/css-sizing-3/#intrinsic-sizes">
-<meta name="assert" content="Checks that a replaced element, with an aspect ratio, converts a percent height into an intrinsic width." />
-<link rel="match" href="../reference/ref-filled-green-100px-square-only.html">
-<style>
-#container { height: 100px; }
-#float { float: left; background: green; }
-canvas { height: 100%; }
-</style>
-<p style="margin-top: 1em;">Test passes if there is a filled green square.</p>
-<div id=container>
-  <div id=float>
-    <div>
-      <canvas width=10 height=10></canvas>
-    </div>
-  </div>
-</div>
diff --git a/testing/web-platform/tests/css/css-syntax/cdc-vs-ident-tokens.html b/testing/web-platform/tests/css/css-syntax/cdc-vs-ident-tokens.html
deleted file mode 100644
index 02cfbe11ae90..000000000000
--- a/testing/web-platform/tests/css/css-syntax/cdc-vs-ident-tokens.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!doctype html>
-<title>CDC versus Ident Token</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<style>
-
--->
-
---foo { color: blue; }
-
-</style>
-
-<meta name=author content="Tab Atkins-Bittner">
-<link rel=help href="https://drafts.csswg.org/css-syntax/#consume-token">
-
-<!--
-The ordering of the checks in the HYPHEN-MINUS step is important;
-if you get it wrong, ident-token can swallow cdc-token.
--->
-
-<script>
-
-test(()=>{
-    const rule = document.styleSheets[0].cssRules[0];
-    assert_equals(rule.selectorText, "--foo");
-}, "CDC-token is properly emitted, and not parsed as an ident.");
-
-</script>
diff --git a/testing/web-platform/tests/css/css-syntax/unclosed-url-at-eof.html b/testing/web-platform/tests/css/css-syntax/unclosed-url-at-eof.html
deleted file mode 100644
index 7157896d9785..000000000000
--- a/testing/web-platform/tests/css/css-syntax/unclosed-url-at-eof.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!doctype html>
-<title>Unclosed URL At EOF</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-
-<meta name=author title="Tab Atkins-Bittner">
-<link rel=help href="https://drafts.csswg.org/css-syntax/#consume-url-token">
-
-<div id=test1-control style="background-image:url(foo)"></div>
-<div id=test1-experiment style="background-image:url(foo"></div>
-
-<div id=test2-control style="background-image:url()"></div>
-<div id=test2-experiment style="background-image:url("></div>
-
-<script>
-
-test(()=>{
-    const control = document.querySelector("#test1-control");
-    const experiment = document.querySelector("#test1-experiment");
-    assert_equals(control.style.backgroundImage, experiment.style.backgroundImage);
-}, "Unclosed url token at EOF is valid.");
-
-test(()=>{
-    const control = document.querySelector("#test2-control");
-    const experiment = document.querySelector("#test2-experiment");
-    assert_equals(control.style.backgroundImage, experiment.style.backgroundImage);
-}, "Unclosed empty url token at EOF is valid.");
-
-</script>
diff --git a/testing/web-platform/tests/css/css-tables/subpixel-collapsed-borders-001.html b/testing/web-platform/tests/css/css-tables/subpixel-collapsed-borders-001.html
deleted file mode 100644
index a71f5cc698b7..000000000000
--- a/testing/web-platform/tests/css/css-tables/subpixel-collapsed-borders-001.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE html>
-<link rel="author" title="David Grogan" href="mailto:dgrogan@chromium.org">
-<link rel="help" href="https://www.w3.org/TR/CSS22/tables.html#collapsing-borders">
-<link rel="help" href="https://drafts.csswg.org/css-tables-3/#border-conflict-resolution-algorithm">
-<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/606">
-<link rel="match" href="subpixel-collapsed-borders-ref.html">
-<meta name="flags" content="" />
-<meta name="assert" content="When collapsed border tables have border widths larger than cells', the table border wins." />
-
-<style>
-table {
-  border: 5px solid green;
-  border-collapse: collapse;
-}
-
-td {
-  width: 50px;
-  height: 50px;
-  border: 4.95px solid red;
-}
-</style>
-
-<p>There should be a square with a green border, not a red border.
-</p>
-
-<table>
-  <tr>
-    <td></td>
-  </tr>
-</table>
diff --git a/testing/web-platform/tests/css/css-tables/subpixel-collapsed-borders-002.html b/testing/web-platform/tests/css/css-tables/subpixel-collapsed-borders-002.html
deleted file mode 100644
index 8f8292cd22be..000000000000
--- a/testing/web-platform/tests/css/css-tables/subpixel-collapsed-borders-002.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE html>
-<link rel="author" title="David Grogan" href="mailto:dgrogan@chromium.org">
-<link rel="help" href="https://www.w3.org/TR/CSS22/tables.html#collapsing-borders">
-<link rel="help" href="https://drafts.csswg.org/css-tables-3/#border-conflict-resolution-algorithm">
-<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/606">
-<link rel="match" href="subpixel-collapsed-borders-ref.html">
-<meta name="flags" content="" />
-<meta name="assert" content="When collapsed border tables have border widths larger than cells', the table border wins even when the cell border is merely 0.01 pixels narrower" />
-
-<style>
-table {
-  border: 5px solid green;
-  border-collapse: collapse;
-}
-
-td {
-  width: 50px;
-  height: 50px;
-  border: 4.99px solid red;
-}
-</style>
-
-<p>There should be a square with a green border, not a red border.
-</p>
-
-<table>
-  <tr>
-    <td></td>
-  </tr>
-</table>
diff --git a/testing/web-platform/tests/css/css-tables/subpixel-collapsed-borders-003-ref.html b/testing/web-platform/tests/css/css-tables/subpixel-collapsed-borders-003-ref.html
deleted file mode 100644
index 78e0be389393..000000000000
--- a/testing/web-platform/tests/css/css-tables/subpixel-collapsed-borders-003-ref.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<style>
-table {
-  border: 5.95px solid green;
-  border-collapse: collapse;
-}
-
-td {
-  width: 50px;
-  height: 50px;
-  border: 1px solid red;
-}
-</style>
-
-<p>There should be a square with a green border, not a red border.
-</p>
-
-<table>
-  <tr>
-    <td></td>
-  </tr>
-</table>
diff --git a/testing/web-platform/tests/css/css-tables/subpixel-collapsed-borders-003.html b/testing/web-platform/tests/css/css-tables/subpixel-collapsed-borders-003.html
deleted file mode 100644
index 358562cbd7ff..000000000000
--- a/testing/web-platform/tests/css/css-tables/subpixel-collapsed-borders-003.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE html>
-<link rel="author" title="David Grogan" href="mailto:dgrogan@chromium.org">
-<link rel="help" href="https://www.w3.org/TR/CSS22/tables.html#collapsing-borders">
-<link rel="help" href="https://drafts.csswg.org/css-tables-3/#border-conflict-resolution-algorithm">
-<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/606">
-<link rel="match" href="subpixel-collapsed-borders-003-ref.html">
-<meta name="flags" content="" />
-<meta name="assert" content="When collapsed border tables have border widths larger than cells', the table border wins even when the floored table border is the same size as the cell's." />
-
-<style>
-table {
-  border: 5.95px solid green;
-  border-collapse: collapse;
-}
-
-td {
-  width: 50px;
-  height: 50px;
-  border: 5px solid red;
-}
-</style>
-
-<p>There should be a square with a green border, not a red border.
-</p>
-
-<table>
-  <tr>
-    <td></td>
-  </tr>
-</table>
diff --git a/testing/web-platform/tests/css/css-tables/subpixel-collapsed-borders-ref.html b/testing/web-platform/tests/css/css-tables/subpixel-collapsed-borders-ref.html
deleted file mode 100644
index 0a2e7a8d95b9..000000000000
--- a/testing/web-platform/tests/css/css-tables/subpixel-collapsed-borders-ref.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<style>
-table {
-  border: 5px solid green;
-  border-collapse: collapse;
-}
-
-td {
-  width: 50px;
-  height: 50px;
-  border: 1px solid red;
-}
-</style>
-
-<p>There should be a square with a green border, not a red border.
-</p>
-
-<table>
-  <tr>
-    <td></td>
-  </tr>
-</table>
diff --git a/testing/web-platform/tests/css/css-text/white-space/reference/white-space-wrap-after-nowrap-001-ref.html b/testing/web-platform/tests/css/css-text/white-space/reference/white-space-wrap-after-nowrap-001-ref.html
deleted file mode 100644
index 80b2260cbbe6..000000000000
--- a/testing/web-platform/tests/css/css-text/white-space/reference/white-space-wrap-after-nowrap-001-ref.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<style>
-div {
-  width: 10ch;
-  border: 2px solid blue;
-  line-height: 1;
-}
-.ideo > div {
-  width: 1em;
-}
-</style>
-<body>
-  <section>
-    <div>12345<br>67890</div>
-    <div>12345<br>67890</div>
-    <div>12345<br>67890</div>
-    <div>12345<br>67890</div>
-
-    <div>12345<br>67890</div>
-    <div>12345<br>67890</div>
-  </section>
-
-  <section class="ideo">
-    <div>国<br>国</div>
-    <div>国<br>国</div>
-    <div>国<br>国</div>
-    <div>国<br>国</div>
-  </section>
-</body>
diff --git a/testing/web-platform/tests/css/css-text/white-space/white-space-wrap-after-nowrap-001.html b/testing/web-platform/tests/css/css-text/white-space/white-space-wrap-after-nowrap-001.html
deleted file mode 100644
index a484f1cf9167..000000000000
--- a/testing/web-platform/tests/css/css-text/white-space/white-space-wrap-after-nowrap-001.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>Break opportunities after nowrap</title>
-<link rel="author" title="Koji Ishii" href="mailto:kojii@chromium.org">
-<link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-property">
-<link rel="match" href="reference/white-space-wrap-after-nowrap-001-ref.html">
-<meta name="assert" content="This test ensures that break opportunities after nowrap can break lines.">
-<style>
-div {
-  width: 10ch;
-  border: 2px solid blue;
-  line-height: 1;
-}
-.ideo > div {
-  width: 1em;
-}
-.normal {
-  white-space: normal;
-}
-.nowrap {
-  white-space: nowrap;
-}
-</style>
-<body>
-  <section>
-    <div><span class="nowrap">12345</span> 67890</div>
-    <div><span class="nowrap">12345</span><span class="normal"> 67890</span></div>
-    <div><span class="nowrap">12345<span class="normal"> 67890</span></span></div>
-    <div class="nowrap">12345<span class="normal"> 67890</span></div>
-
-    <div class="nowrap"><span class="normal"><span class="nowrap">12345</span> </span>67890</div>
-    <div class="nowrap"><span class="normal"><span class="nowrap">12345 </span> </span>67890</div>
-  </section>
-
-  <section class="ideo">
-    <div><span class="nowrap">国</span>国</div>
-    <div><span class="nowrap">国</span><span class="normal">国</span></div>
-    <div><span class="nowrap">国<span class="normal">国</span></span></div>
-    <div class="nowrap">国<span class="normal">国</span></div>
-  </section>
-</body>
diff --git a/testing/web-platform/tests/css/css-transforms/composited-under-rotateY-180deg-clip-perspective-ref.html b/testing/web-platform/tests/css/css-transforms/composited-under-rotateY-180deg-clip-perspective-ref.html
deleted file mode 100644
index ebd2d860cec7..000000000000
--- a/testing/web-platform/tests/css/css-transforms/composited-under-rotateY-180deg-clip-perspective-ref.html
+++ /dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE html>
-<div style="width: 100px; height: 100px; background: green"></div>
diff --git a/testing/web-platform/tests/css/css-transforms/composited-under-rotateY-180deg-clip-perspective.html b/testing/web-platform/tests/css/css-transforms/composited-under-rotateY-180deg-clip-perspective.html
deleted file mode 100644
index 6381ee7fa780..000000000000
--- a/testing/web-platform/tests/css/css-transforms/composited-under-rotateY-180deg-clip-perspective.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE html>
-<title>CSS Test (Transforms): composited under rotateY(180deg) with overflow clip under perspective</title>
-<link rel="help" href="http://www.w3.org/TR/css-transforms-2">
-<meta name="assert" content="This tests that a composited element with default
-  backface-visibility is visible under rotateY(180deg) with overflow clip under
-  perspective.">
-<link rel="match" href="composited-under-rotateY-180deg-clip-perspective-ref.html">
-<div style="perspective: 1px">
-  <div style="transform: rotateY(180deg); overflow: hidden; width: 100px">
-    <div style="width: 100px; height: 100px; background: green; will-change: transform"></div>
-  </div>
-  <div style="transform: rotateY(180deg); overflow: hidden; width: 100px; backface-visibility: hidden">
-    <div style="width: 100px; height: 100px; background: green; will-change: transform"></div>
-  </div>
-</div>
diff --git a/testing/web-platform/tests/css/css-transforms/reference/transform-3d-rotateY-stair-above-ref-001.xht b/testing/web-platform/tests/css/css-transforms/reftest/transform-3d-rotateY-stair-above-ref-001.xht
similarity index 100%
rename from testing/web-platform/tests/css/css-transforms/reference/transform-3d-rotateY-stair-above-ref-001.xht
rename to testing/web-platform/tests/css/css-transforms/reftest/transform-3d-rotateY-stair-above-ref-001.xht
diff --git a/testing/web-platform/tests/css/css-transforms/reference/transform-applies-to-001-ref.xht b/testing/web-platform/tests/css/css-transforms/reftest/transform-applies-to-001-ref.xht
similarity index 100%
rename from testing/web-platform/tests/css/css-transforms/reference/transform-applies-to-001-ref.xht
rename to testing/web-platform/tests/css/css-transforms/reftest/transform-applies-to-001-ref.xht
diff --git a/testing/web-platform/tests/css/css-transforms/reference/transform-applies-to-002-ref.xht b/testing/web-platform/tests/css/css-transforms/reftest/transform-applies-to-002-ref.xht
similarity index 100%
rename from testing/web-platform/tests/css/css-transforms/reference/transform-applies-to-002-ref.xht
rename to testing/web-platform/tests/css/css-transforms/reftest/transform-applies-to-002-ref.xht
diff --git a/testing/web-platform/tests/css/css-transforms/reference/transform-origin-01-ref.html b/testing/web-platform/tests/css/css-transforms/reftest/transform-origin-01-ref.html
similarity index 100%
rename from testing/web-platform/tests/css/css-transforms/reference/transform-origin-01-ref.html
rename to testing/web-platform/tests/css/css-transforms/reftest/transform-origin-01-ref.html
diff --git a/testing/web-platform/tests/css/css-transforms/transform-3d-rotateY-stair-above-001.xht b/testing/web-platform/tests/css/css-transforms/transform-3d-rotateY-stair-above-001.xht
index 9a3aac888fee..41d8979c4551 100644
--- a/testing/web-platform/tests/css/css-transforms/transform-3d-rotateY-stair-above-001.xht
+++ b/testing/web-platform/tests/css/css-transforms/transform-3d-rotateY-stair-above-001.xht
@@ -4,7 +4,7 @@
   <title>CSS Test: rotateY with perspective produces a trapezoid</title>
   <link rel="author" title="Apple Inc." href="http://www.apple.com/"/>
   <link rel="help" href="http://www.w3.org/TR/css-transforms-2/#3d-transform-rendering"/>
-  <link rel="match" href="reference/transform-3d-rotateY-stair-above-ref-001.xht"/>
+  <link rel="match" href="reftest/transform-3d-rotateY-stair-above-ref-001.xht"/>
   <meta name="flags" content="" />
   <meta name="assert" content="A rotateY transform with perspective
   should result in a trapezoid."/>
diff --git a/testing/web-platform/tests/css/css-transforms/transform-3d-rotateY-stair-below-001.xht b/testing/web-platform/tests/css/css-transforms/transform-3d-rotateY-stair-below-001.xht
index 5224da27fd4a..5a1c1d469989 100644
--- a/testing/web-platform/tests/css/css-transforms/transform-3d-rotateY-stair-below-001.xht
+++ b/testing/web-platform/tests/css/css-transforms/transform-3d-rotateY-stair-below-001.xht
@@ -4,7 +4,7 @@
   <title>CSS Test: rotateY with perspective produces a trapezoid</title>
   <link rel="author" title="Apple Inc." href="http://www.apple.com/"/>
   <link rel="help" href="http://www.w3.org/TR/css-transforms-2/#3d-transform-rendering"/>
-  <link rel="match" href="reference/transform-3d-rotateY-stair-above-ref-001.xht"/>
+  <link rel="match" href="reftest/transform-3d-rotateY-stair-above-ref-001.xht"/>
   <meta name="flags" content="" />
   <meta name="assert" content="A rotateY transform with perspective
   should result in a trapezoid."/>
diff --git a/testing/web-platform/tests/css/css-transforms/transform-applies-to-001.xht b/testing/web-platform/tests/css/css-transforms/transform-applies-to-001.xht
index 09bb196d5332..0036e8e1acf2 100644
--- a/testing/web-platform/tests/css/css-transforms/transform-applies-to-001.xht
+++ b/testing/web-platform/tests/css/css-transforms/transform-applies-to-001.xht
@@ -4,7 +4,7 @@
   <title>CSS Test: transform applied to elements with 'display' set to 'block'</title>
   <link rel="author" title="Apple Inc." href="http://www.apple.com/"/>
   <link rel="help" href="http://www.w3.org/TR/css-transforms-1/#transform-property"/>
-  <link rel="match" href="reference/transform-applies-to-001-ref.xht"/>
+  <link rel="match" href="reftest/transform-applies-to-001-ref.xht"/>
   <meta name="flags" content="" />
   <meta name="assert" content="The 'transform' property applies to elements with 'display' set to 'block'."/>
   <style type="text/css"><![CDATA[
diff --git a/testing/web-platform/tests/css/css-transforms/transform-applies-to-002.xht b/testing/web-platform/tests/css/css-transforms/transform-applies-to-002.xht
index 186d0b74a3a5..80715d379d4d 100644
--- a/testing/web-platform/tests/css/css-transforms/transform-applies-to-002.xht
+++ b/testing/web-platform/tests/css/css-transforms/transform-applies-to-002.xht
@@ -4,7 +4,7 @@
   <title>CSS Test: Transform does not apply to non-replaced inline elements</title>
   <link rel="author" title="Apple Inc." href="http://www.apple.com/"/>
   <link rel="help" href="http://www.w3.org/TR/css-transforms-1/#transform-property"/>
-  <link rel="match" href="reference/transform-applies-to-002-ref.xht"/>
+  <link rel="match" href="reftest/transform-applies-to-002-ref.xht"/>
   <meta name="flags" content="ahem" />
   <meta name="assert" content="The 'transform' property does not apply to non-replaced inline elements."/>
   <style type="text/css"><![CDATA[
diff --git a/testing/web-platform/tests/css/css-transforms/transform-box/fill-box-mutation.html b/testing/web-platform/tests/css/css-transforms/transform-box/fill-box-mutation.html
index 1f0dfd01bb9a..ae602e3509d0 100644
--- a/testing/web-platform/tests/css/css-transforms/transform-box/fill-box-mutation.html
+++ b/testing/web-platform/tests/css/css-transforms/transform-box/fill-box-mutation.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html class="reftest-wait">
 <title>transform-box: fill-box, shape mutated</title>
-<link rel="match" href="reference/greensquare200x200.html">
+<link rel="match" href="support/greensquare200x200.html">
 <link rel="help" href="https://drafts.csswg.org/css-transforms/#transform-box">
 <style>
 #target {
diff --git a/testing/web-platform/tests/css/css-transforms/transform-box/fill-box.html b/testing/web-platform/tests/css/css-transforms/transform-box/fill-box.html
index 7e9b133aead4..eaea02a5dfe7 100644
--- a/testing/web-platform/tests/css/css-transforms/transform-box/fill-box.html
+++ b/testing/web-platform/tests/css/css-transforms/transform-box/fill-box.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <title>transform-box: fill-box</title>
-<link rel="match" href="reference/greensquare200x200.html">
+<link rel="match" href="support/greensquare200x200.html">
 <link rel="help" href="https://drafts.csswg.org/css-transforms/#transform-box">
 <style>
 svg {
diff --git a/testing/web-platform/tests/css/css-transforms/transform-box/reference/greensquare200x200.html b/testing/web-platform/tests/css/css-transforms/transform-box/support/greensquare200x200.html
similarity index 100%
rename from testing/web-platform/tests/css/css-transforms/transform-box/reference/greensquare200x200.html
rename to testing/web-platform/tests/css/css-transforms/transform-box/support/greensquare200x200.html
diff --git a/testing/web-platform/tests/css/css-transforms/transform-box/value-changed.html b/testing/web-platform/tests/css/css-transforms/transform-box/value-changed.html
index 4aca90a61c1f..825403ef7b62 100644
--- a/testing/web-platform/tests/css/css-transforms/transform-box/value-changed.html
+++ b/testing/web-platform/tests/css/css-transforms/transform-box/value-changed.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html class="reftest-wait">
 <title>transform-box: value change from 'view-box' to 'fill-box'</title>
-<link rel="match" href="reference/greensquare200x200.html">
+<link rel="match" href="support/greensquare200x200.html">
 <link rel="help" href="https://drafts.csswg.org/css-transforms/#transform-box">
 <p>There should be a green 200x200 rectangle below, and no red.</p>
 <svg width="400" height="200">
diff --git a/testing/web-platform/tests/css/css-transforms/transform-box/view-box-mutation.html b/testing/web-platform/tests/css/css-transforms/transform-box/view-box-mutation.html
index d0c85fd59d36..0d4a0ecdc2f9 100644
--- a/testing/web-platform/tests/css/css-transforms/transform-box/view-box-mutation.html
+++ b/testing/web-platform/tests/css/css-transforms/transform-box/view-box-mutation.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html class="reftest-wait">
 <title>transform-box: view-box, viewport mutated</title>
-<link rel="match" href="reference/greensquare200x200.html">
+<link rel="match" href="support/greensquare200x200.html">
 <link rel="help" href="https://drafts.csswg.org/css-transforms/#transform-box">
 <style>
 #target {
diff --git a/testing/web-platform/tests/css/css-transforms/transform-box/view-box-nested.html b/testing/web-platform/tests/css/css-transforms/transform-box/view-box-nested.html
index 9e7fc17e2a5b..7f59777f15b8 100644
--- a/testing/web-platform/tests/css/css-transforms/transform-box/view-box-nested.html
+++ b/testing/web-platform/tests/css/css-transforms/transform-box/view-box-nested.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <title>transform-box: view-box, relative to nested viewport</title>
-<link rel="match" href="reference/greensquare200x200.html">
+<link rel="match" href="support/greensquare200x200.html">
 <link rel="help" href="https://drafts.csswg.org/css-transforms/#transform-box">
 <style>
 #target {
diff --git a/testing/web-platform/tests/css/css-transforms/transform-box/view-box-viewbox-nested.html b/testing/web-platform/tests/css/css-transforms/transform-box/view-box-viewbox-nested.html
index fc072363e8a3..4f667e20ba81 100644
--- a/testing/web-platform/tests/css/css-transforms/transform-box/view-box-viewbox-nested.html
+++ b/testing/web-platform/tests/css/css-transforms/transform-box/view-box-viewbox-nested.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <title>transform-box: view-box, relative to viewport defined by nested viewBox</title>
-<link rel="match" href="reference/greensquare200x200.html">
+<link rel="match" href="support/greensquare200x200.html">
 <link rel="help" href="https://drafts.csswg.org/css-transforms/#transform-box">
 <style>
 #target {
diff --git a/testing/web-platform/tests/css/css-transforms/transform-box/view-box-viewbox.html b/testing/web-platform/tests/css/css-transforms/transform-box/view-box-viewbox.html
index a69d8092f646..cd040c1ba338 100644
--- a/testing/web-platform/tests/css/css-transforms/transform-box/view-box-viewbox.html
+++ b/testing/web-platform/tests/css/css-transforms/transform-box/view-box-viewbox.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <title>transform-box: view-box, relative to viewport defined by viewBox</title>
-<link rel="match" href="reference/greensquare200x200.html">
+<link rel="match" href="support/greensquare200x200.html">
 <link rel="help" href="https://drafts.csswg.org/css-transforms/#transform-box">
 <style>
 #target {
diff --git a/testing/web-platform/tests/css/css-transforms/transform-box/view-box.html b/testing/web-platform/tests/css/css-transforms/transform-box/view-box.html
index 0b5eeda54382..3345467c904d 100644
--- a/testing/web-platform/tests/css/css-transforms/transform-box/view-box.html
+++ b/testing/web-platform/tests/css/css-transforms/transform-box/view-box.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <title>transform-box: view-box</title>
-<link rel="match" href="reference/greensquare200x200.html">
+<link rel="match" href="support/greensquare200x200.html">
 <link rel="help" href="https://drafts.csswg.org/css-transforms/#transform-box">
 <style>
 svg {
diff --git a/testing/web-platform/tests/css/css-transforms/transform-origin-01.html b/testing/web-platform/tests/css/css-transforms/transform-origin-01.html
index d7e1cd34d455..c1b6f29a52ac 100644
--- a/testing/web-platform/tests/css/css-transforms/transform-origin-01.html
+++ b/testing/web-platform/tests/css/css-transforms/transform-origin-01.html
@@ -4,7 +4,7 @@
     <title>CSS Test: SVG Transform using transform-origin</title>
     <link rel="author" title="CJ Gammon" href="mailto:gammon@adobe.com">
     <link rel="help" href="http://www.w3.org/TR/css-transforms-1/#transform-origin-property">
-    <link rel="match" href="reference/transform-origin-01-ref.html">
+    <link rel="match" href="reftest/transform-origin-01-ref.html">
     <meta name="assert" content="If only one value is specified, the second value is assumed to be 'center'">
     <style type="text/css">
         #container{
diff --git a/testing/web-platform/tests/css/css-transforms/transform3d-perspective-origin-001.html b/testing/web-platform/tests/css/css-transforms/transform3d-perspective-origin-001.html
index 791d4bd136cc..1a81bc1d4dad 100644
--- a/testing/web-platform/tests/css/css-transforms/transform3d-perspective-origin-001.html
+++ b/testing/web-platform/tests/css/css-transforms/transform3d-perspective-origin-001.html
@@ -9,6 +9,9 @@
     the same as 'perspective-origin: top left', different from no
     'perspective-origin', and different from no perspective or no transform.">
     <link rel="match" href="transform3d-perspective-origin-ref.html">
+    <link rel="mismatch" href="transform3d-rotatex-perspective-001.html">
+    <link rel="mismatch" href="transform3d-rotatex-ref.html">
+    <link rel="mismatch" href="transform-lime-square-ref.html">
   </head>
   <body>
     <div style="perspective: 1000px; perspective-origin: 0 0;">
diff --git a/testing/web-platform/tests/css/css-transforms/transform3d-perspective-origin-ref.html b/testing/web-platform/tests/css/css-transforms/transform3d-perspective-origin-ref.html
index e174d7596f7c..dd0026b8fc1c 100644
--- a/testing/web-platform/tests/css/css-transforms/transform3d-perspective-origin-ref.html
+++ b/testing/web-platform/tests/css/css-transforms/transform3d-perspective-origin-ref.html
@@ -4,7 +4,6 @@
     <title>CSS Reftest Reference</title>
     <link rel="author" title="Matt Woodrow" href="mailto:mwoodrow@mozilla.com">
     <link rel="author" title="Aryeh Gregor" href="mailto:ayg@aryeh.name">
-    <link rel="mismatch" href="transform3d-rotatex-ref.html">
   </head>
   <body>
     <div style="perspective: 1000px; perspective-origin: top left;">
diff --git a/testing/web-platform/tests/css/css-transforms/transform3d-rotate3d-001.html b/testing/web-platform/tests/css/css-transforms/transform3d-rotate3d-001.html
index 93a46f1c6ab0..185346c333c1 100644
--- a/testing/web-platform/tests/css/css-transforms/transform3d-rotate3d-001.html
+++ b/testing/web-platform/tests/css/css-transforms/transform3d-rotate3d-001.html
@@ -9,6 +9,7 @@
     <meta name="assert" content="This tests that rotate3d(1, 0, 0, 45deg) is
     the same as rotatex(45deg).">
     <link rel="match" href="transform3d-rotatex-ref.html">
+    <link rel="mismatch" href="transform-lime-square-ref.html">
   </head>
   <body>
     <div style="transform: rotate3d(1, 0, 0, 45deg); width: 100px;
diff --git a/testing/web-platform/tests/css/css-transforms/transform3d-rotatex-001.html b/testing/web-platform/tests/css/css-transforms/transform3d-rotatex-001.html
index 2f75f15cd0d6..47ad10b388ce 100644
--- a/testing/web-platform/tests/css/css-transforms/transform3d-rotatex-001.html
+++ b/testing/web-platform/tests/css/css-transforms/transform3d-rotatex-001.html
@@ -10,6 +10,7 @@
     <meta name="assert" content="This tests that rotatex(45deg) rotatey(360deg)
     rotatex(360deg) is the same as rotatex(45deg).">
     <link rel="match" href="transform3d-rotatex-ref.html">
+    <link rel="mismatch" href="transform-lime-square-ref.html">
   </head>
   <body>
     <div style="transform: rotatex(45deg) rotatey(360deg) rotatex(360deg);
diff --git a/testing/web-platform/tests/css/css-transforms/transform3d-rotatex-perspective-002.html b/testing/web-platform/tests/css/css-transforms/transform3d-rotatex-perspective-002.html
index ecf6a2f8d57e..472d0aa854b6 100644
--- a/testing/web-platform/tests/css/css-transforms/transform3d-rotatex-perspective-002.html
+++ b/testing/web-platform/tests/css/css-transforms/transform3d-rotatex-perspective-002.html
@@ -11,6 +11,7 @@
     when combined with rotatex() (i.e., is not equivalent to simply omitting
     the perspective).">
     <link rel="mismatch" href="transform3d-rotatex-ref.html">
+    <link rel="mismatch" href="transform-lime-square-ref.html">
   </head>
   <body>
     <div style="perspective: 1000px;">
diff --git a/testing/web-platform/tests/css/css-ui/parsing/user-select-computed.html b/testing/web-platform/tests/css/css-ui/parsing/user-select-computed.html
deleted file mode 100644
index d2374dbefa22..000000000000
--- a/testing/web-platform/tests/css/css-ui/parsing/user-select-computed.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="utf-8">
-<title>CSS UI Level 4: getComputedValue().userSelect</title>
-<link rel="help" href="https://drafts.csswg.org/css-ui-4/#content-selection">
-<meta name="assert" content="user-select computed value is as specified.">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/css/support/computed-testcommon.js"></script>
-</head>
-<body>
-<div id="target"></div>
-<script>
-test_computed_value("user-select", "auto");
-test_computed_value("user-select", "text");
-test_computed_value("user-select", "none");
-test_computed_value("user-select", "contain");
-test_computed_value("user-select", "all");
-</script>
-</body>
-</html>
diff --git a/testing/web-platform/tests/css/css-ui/parsing/user-select-invalid.html b/testing/web-platform/tests/css/css-ui/parsing/user-select-invalid.html
deleted file mode 100644
index 7fe7feeca885..000000000000
--- a/testing/web-platform/tests/css/css-ui/parsing/user-select-invalid.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="utf-8">
-<title>CSS UI Level 4: parsing user-select with invalid values</title>
-<link rel="help" href="https://drafts.csswg.org/css-ui-4/#content-selection">
-<meta name="assert" content="user-select supports only the grammar 'auto | text | none | contain | all'.">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/css/support/parsing-testcommon.js"></script>
-</head>
-<body>
-<script>
-test_invalid_value("user-select", "visible");
-test_invalid_value("user-select", "text contain");
-</script>
-</body>
-</html>
diff --git a/testing/web-platform/tests/css/css-ui/parsing/user-select-valid.html b/testing/web-platform/tests/css/css-ui/parsing/user-select-valid.html
deleted file mode 100644
index e78ac7ce2bb1..000000000000
--- a/testing/web-platform/tests/css/css-ui/parsing/user-select-valid.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="utf-8">
-<title>CSS UI Level 4: parsing user-select with valid values</title>
-<link rel="help" href="https://drafts.csswg.org/css-ui-4/#content-selection">
-<meta name="assert" content="user-select supports the full grammar 'auto | text | none | contain | all'.">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/css/support/parsing-testcommon.js"></script>
-</head>
-<body>
-<script>
-test_valid_value("user-select", "auto");
-test_valid_value("user-select", "text");
-test_valid_value("user-select", "none");
-test_valid_value("user-select", "contain");
-test_valid_value("user-select", "all");
-</script>
-</body>
-</html>
diff --git a/testing/web-platform/tests/css/css-values/calc-angle-values.html b/testing/web-platform/tests/css/css-values/calc-angle-values.html
deleted file mode 100644
index e41beaff211b..000000000000
--- a/testing/web-platform/tests/css/css-values/calc-angle-values.html
+++ /dev/null
@@ -1,295 +0,0 @@
-<!DOCTYPE html>
-
-  <meta charset="UTF-8">
-
-  <title>CSS Values and Units Test: calc() function with angle values</title>
-
-  <!--
-
-  Original test is:
-
-  https://chromium.googlesource.com/chromium/src/+/c825d655f6aaf73484f9d56e9012793f5b9668cc/third_party/WebKit/LayoutTests/css3/calc/calc-with-time-angle-and-frequency-values.html
-
-  Issue 917718: [css-values] calc-with-time-angle-and-frequency-values
-  test is highly unreliable, transition-delay testing causes side effects
-  https://bugs.chromium.org/p/chromium/issues/detail?id=917718
-
-  -->
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
-  <link rel="help" href="https://www.w3.org/TR/css-values-3/#calc-computed-value">
-  <link rel="help" href="https://www.w3.org/TR/css-values-3/#angles">
-
-  <meta content="This test checks that additions, substractions, multiplications and divisions in calc() function when applied to angle units." name="assert">
-
-  <script src="/resources/testharness.js"></script>
-
-  <script src="/resources/testharnessreport.js"></script>
-
-  <div id="log"></div>
-
-  <div id="target"></div>
-
-  <script>
-  function startTesting()
-  {
-
-    var targetElement = document.getElementById("target");
-
-    function compareValueCloseTo(property_name, calcValue, epsilon, expectedValue, description)
-    {
-
-    test(function()
-      {
-
-      targetElement.style.setProperty(property_name, "initial");
-
-      /*
-      Since we are running many consecutive tests on the same
-      element, then it is necessary to reset its property
-      to an initial value before actually re-testing it.
-      */
-
-      targetElement.style.setProperty(property_name, calcValue);
-
-      var computedCalcValue = getComputedStyle(targetElement)[property_name];
-
-      /*
-      We first strip out the word "matrix" with the
-      opening parenthesis "(" and the closing
-      parenthesis ")"
-      */
-
-      computedCalcValue = computedCalcValue.replace("matrix(", "").replace(")", "");
-
-      /*
-      Then, we split the string at each comma ","
-      and store the resulting 6 sub-strings into
-      tableSplitComputedCalcValue
-      */
-
-      var tableSplitCalcValue = computedCalcValue.split(",");
-
-      /*
-      We convert the 6 sub-strings into numerical floating values
-      so that mathematical operations (substraction, absolute value,
-      comparison) can be performed.
-      */
-
-      tableSplitCalcValue[0] = parseFloat(tableSplitCalcValue[0]);
-      tableSplitCalcValue[1] = parseFloat(tableSplitCalcValue[1]);
-      tableSplitCalcValue[2] = parseFloat(tableSplitCalcValue[2]);
-      tableSplitCalcValue[3] = parseFloat(tableSplitCalcValue[3]);
-      tableSplitCalcValue[4] = parseFloat(tableSplitCalcValue[4]);
-      tableSplitCalcValue[5] = parseFloat(tableSplitCalcValue[5]);
-
-      /*
-      Now, we execute the same steps with the expectedValue
-      */
-
-      targetElement.style.setProperty(property_name, expectedValue);
-
-      var computedExpectedValue = getComputedStyle(targetElement)[property_name];
-
-      /*
-      We first strip out the word "matrix" with the
-      opening parenthesis "(" and the closing
-      parenthesis ")"
-      */
-
-      computedExpectedValue = computedExpectedValue.replace("matrix(", "").replace(")", "");
-
-      /*
-      Then, we split the string at each comma ","
-      and store the resulting 6 sub-strings into
-      tableSplitComputedCalcValue
-      */
-
-      var tableSplitExpectedValue = computedExpectedValue.split(",");
-
-      /*
-      We convert the 6 sub-strings into numerical floating values
-      so that mathematical operations (substraction, absolute value,
-      comparison) can be performed.
-      */
-
-      tableSplitExpectedValue[0] = parseFloat(tableSplitExpectedValue[0]);
-      tableSplitExpectedValue[1] = parseFloat(tableSplitExpectedValue[1]);
-      tableSplitExpectedValue[2] = parseFloat(tableSplitExpectedValue[2]);
-      tableSplitExpectedValue[3] = parseFloat(tableSplitExpectedValue[3]);
-      tableSplitExpectedValue[4] = parseFloat(tableSplitExpectedValue[4]);
-      tableSplitExpectedValue[5] = parseFloat(tableSplitExpectedValue[5]);
-
-      assert_array_approx_equals(tableSplitCalcValue, tableSplitExpectedValue, epsilon);
-
-      /*
-      In this mega-test of 27 sub-tests, we intentionally
-      set the tolerance precision (epsilon) to a rather big
-      value (0.0001 === 100 millionths). The reason for this
-      is we want to verify if browsers and CSS-capable
-      applications do the right calculations. We do not want
-      to penalize browsers and CSS-capable applications that
-      have modest precision (not capable of a 1 millionth
-      level precision).
-     */
-
-    } , description);
-
-  }
-
-    /*
-
-    deg
-       Degrees. There are 360 degrees in a full circle.
-
-    grad
-       Gradians, also known as "gons" or "grades". There are 400 gradians in a full circle.
-
-    rad
-       Radians. There are 2π radians in a full circle.
-
-    1rad == 57.295779513°
-    https://www.rapidtables.com/convert/number/radians-to-degrees.html
-
-    π == Math.PI == 3.141592653589793
-
-    turn
-       Turns. There is 1 turn in a full circle.
-
-   */
-
-
-   /* Addition of angle units */
-
-
- /* compareValueCloseTo(property_name, calcValue, epsilon, expectedValue, description)  */
-
-    compareValueCloseTo("transform", "rotate(calc(45deg + 45deg))", 0.0001, "rotate(90deg)", "addition of 2 angle units: deg plus deg");
-
-    compareValueCloseTo("transform", "rotate(calc(45deg + 1rad))", 0.0001, "rotate(102.29578deg)", "addition of 2 angle units: deg plus rad");
-    /*
-    1 radian == 57.295779513 degrees
-    The original test was using the slightly imprecise rotate(102.3deg)
-    */
-
-    compareValueCloseTo("transform", "rotate(calc(20deg + 200grad))", 0.0001, "rotate(200deg)", "addition of 2 angle units: deg plus grad");
-
-    compareValueCloseTo("transform", "rotate(calc(200deg + 0.5turn))", 0.0001, "rotate(380deg)", "addition of 2 angle units: deg plus turn");
-
-    compareValueCloseTo("transform", "rotate(calc(45rad + 45rad))", 0.0001, "rotate(90rad)", "addition of 2 angle units: rad plus rad");
-
-    compareValueCloseTo("transform", "rotate(calc(1rad + 40grad))", 0.0001, "rotate(93.29578deg)", "addition of 2 angle units: rad plus grad");
-
-    /*
-    1 radian == 57.295779513 degrees; 40 gradians is 36 degrees.
-    */
-
-    compareValueCloseTo("transform", "rotate(calc(1rad + 0.5turn))", 0.0001, "rotate(237.29578deg)", "addition of 2 angle units: rad plus turn");
-
-    compareValueCloseTo("transform", "rotate(calc(45grad + 45grad))", 0.0001, "rotate(90grad)", "addition of 2 angle units: grad plus grad");
-
-    compareValueCloseTo("transform", "rotate(calc(10grad + 0.5turn))", 0.0001, "rotate(189deg)", "addition of 2 angle units: grad plus turn");
-
-    /*
-    10 gradians is 9 degrees.
-    */
-
- /* compareValueCloseTo(property_name, calcValue, epsilon, expectedValue, description)  */
-
-
-   /* Substraction of angle unit */
-
- /* compareValueCloseTo(property_name, calcValue, epsilon, expectedValue, description)  */
-
-    compareValueCloseTo("transform", "rotate(calc(45deg - 15deg))", 0.0001, "rotate(30deg)", "substraction of angle unit: deg minus deg");
-
-    compareValueCloseTo("transform", "rotate(calc(90deg - 1rad))", 0.0001, "rotate(32.70422deg)", "substraction of angle unit: deg minus rad");
-
-    /*
-    1 radian == 57.295779513 degrees
-    */
-
-    compareValueCloseTo("transform", "rotate(calc(38deg - 20grad))", 0.0001, "rotate(20deg)", "substraction of angle unit: deg minus grad");
-
-    compareValueCloseTo("transform", "rotate(calc(360deg - 0.5turn))", 0.0001, "rotate(180deg)", "substraction of angle unit: deg minus turn");
-
-    compareValueCloseTo("transform", "rotate(calc(45rad - 15rad))", 0.0001, "rotate(30rad)", "substraction of angle unit: rad minus rad");
-
-    compareValueCloseTo("transform", "rotate(calc(30rad - 10grad))", 0.0001, "rotate(1709.87339deg)", "substraction of angle unit: rad minus grad");
-
-    /*
-    30 radians is 1718.8733854 degrees ; 10 gradians is 9 degrees.
-    */
-
-    compareValueCloseTo("transform", "rotate(calc(4rad - 0.1turn))", 0.0001, "rotate(193.18312deg)", "substraction of angle unit: rad minus turn");
-
-    /*
-    4 radians is 229.183118052 degrees ; 0.1 turn is 36 degrees.
-    */
-
-    compareValueCloseTo("transform", "rotate(calc(45grad - 15grad))", 0.0001, "rotate(30grad)", "substraction of angle unit: grad minus grad");
-
-    compareValueCloseTo("transform", "rotate(calc(100grad - 0.25turn))", 0.0001, "rotate(0deg)", "substraction of angle unit: grad minus turn");
-
-
-   /* Multiplication of angle unit */
-
- /* compareValueCloseTo(property_name, calcValue, epsilon, expectedValue, description)  */
-
-    compareValueCloseTo("transform", "rotate(calc(45deg * 2))", 0.0001, "rotate(90deg)", "multiplication of angle unit: deg multiplied by int");
-
-    compareValueCloseTo("transform", "rotate(calc(2 * 45rad))", 0.0001, "rotate(90rad)", "multiplication of angle unit: int multiplied by rad");
-
-    compareValueCloseTo("transform", "rotate(calc(45grad * 2))", 0.0001, "rotate(90grad)", "multiplication of angle unit: grad multiplied by int");
-
-    compareValueCloseTo("transform", "rotate(calc(2 * 45turn))", 0.0001, "rotate(90turn)", "multiplication of angle unit: int multiplied by turn");
-
-
-   /* Division of angle unit */
-
- /* compareValueCloseTo(property_name, calcValue, epsilon, expectedValue, description)  */
-
-    compareValueCloseTo("transform", "rotate(calc(90deg / 2))", 0.0001, "rotate(45deg)", "division of angle unit: deg divided by int");
-
-    compareValueCloseTo("transform", "rotate(calc(90rad / 2))", 0.0001, "rotate(45rad)", "division of angle unit: rad divided by int");
-
-    compareValueCloseTo("transform", "rotate(calc(90grad / 2))", 0.0001, "rotate(45grad)", "division of angle unit: grad divided by int");
-
-    compareValueCloseTo("transform", "rotate(calc(90turn / 2))", 0.0001, "rotate(45turn)", "division of angle unit: turn divided by int");
-
- /* compareValueCloseTo(property_name, calcValue, epsilon, expectedValue, description)  */
-
-    /*
-
-    deg
-       Degrees. There are 360 degrees in a full circle.
-
-    grad
-       Gradians, also known as "gons" or "grades". There are 400 gradians in a full circle.
-
-    rad
-       Radians. There are 2π radians in a full circle.
-
-    1rad == 57.295779513°
-    https://www.rapidtables.com/convert/number/radians-to-degrees.html
-
-    π == Math.PI == 3.141592653589793
-
-    turn
-       Turns. There is 1 turn in a full circle.
-
-   */
-
-
-
-  /* Testing conversion of angle unit  */
-
- /* compareValueCloseTo(property_name, calcValue, epsilon, expectedValue, description)  */
-
-    compareValueCloseTo("transform", "rotate(calc(50grad)", 0.0001, "rotate(45deg)", "conversion of angle unit: grad into deg");
-
-  }
-
-  startTesting();
-
-  </script>
diff --git a/testing/web-platform/tests/css/css-values/calc-background-position-002.html b/testing/web-platform/tests/css/css-values/calc-background-position-002.html
deleted file mode 100644
index c1dad2eb03b4..000000000000
--- a/testing/web-platform/tests/css/css-values/calc-background-position-002.html
+++ /dev/null
@@ -1,78 +0,0 @@
-<!DOCTYPE html>
-
-  <meta charset="UTF-8">
-
-  <title>CSS Values and Units Test: computed value of 'background-position' when specified with calc() function</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
-  <link rel="help" href="https://www.w3.org/TR/css-values-3/#calc-computed-value">
-
-  <meta name="flags" content="">
-  <meta content="This test verifies how 6 calc() functions are computed for 'background-position'." name="assert">
-
-  <script src="/resources/testharness.js"></script>
-
-  <script src="/resources/testharnessreport.js"></script>
-
-  <div id="target"></div>
-
-  <script>
-  function startTesting()
-  {
-
-  var targetElement = document.getElementById("target");
-
-    function verifyComputedStyle(property_name, initial_value, specified_value, expected_value, description)
-    {
-
-    test(function()
-      {
-
-      targetElement.style.setProperty(property_name, initial_value);
-
-      /*
-      The purpose of the initial_value is to act as a fallback
-      value in case the calc() function in the specified value
-      fails or in case it generates an invalid value. Since we
-      are running 6 consecutive tests on the same element,
-      then it is necessary to 'reset' its property to an
-      initial value.
-      */
-
-      targetElement.style.setProperty(property_name, specified_value);
-
-      assert_equals(getComputedStyle(targetElement)[property_name], expected_value);
-
-      }, description);
-    }
-
- /* verifyComputedStyle(property_name, initial_value, specified_value, expected_value, description) */
-
-    verifyComputedStyle("background-position", "initial", "calc(2px + 3px) calc(4px + 5px)", "5px 9px", "testing background-position: calc(2px + 3px) calc(4px + 5px)");
-
-    verifyComputedStyle("background-position", "initial", "calc(18px - 7px) calc(19px - 7px)", "11px 12px", "testing background-position: calc(18px - 7px) calc(19px - 7px)");
-
-    verifyComputedStyle("background-position", "initial", "calc(4 * 5px) calc(6px * 4)", "20px 24px", "testing background-position: calc(4 * 5px) calc(6px * 4)");
-
-    verifyComputedStyle("background-position", "initial", "calc(100px / 4) calc(119px / 7)", "25px 17px", "testing background-position: calc(100px / 4) calc(119px / 7)");
-
-    verifyComputedStyle("background-position", "initial", "calc(6px + 21%) calc(7em + 22%)", "calc(21% + 6px) calc(22% + 112px)", "testing background-position: calc(6px + 21%) calc(7em + 22%)");
-
-  /*
-    "
-    (...) background-position has layout-dependent behavior for
-    percentage values, and thus does not resolve percentages
-    until used-value time. Due to this, background-position
-    computation preserves the percentage in a calc(). (...)
-    "
-    https://www.w3.org/TR/css-values-3/#calc-computed-value
-  */
-
-    verifyComputedStyle("background-position", "initial", "calc(-8px + 23%) calc(-9em + 24%)", "calc(23% - 8px) calc(24% - 144px)", "testing background-position: calc(-8px + 23%) calc(-9em + 24%)");
-
- /* verifyComputedStyle(property_name, initial_value, specified_value, expected_value, description) */
-  }
-
-  startTesting();
-
-  </script>
diff --git a/testing/web-platform/tests/css/css-values/calc-background-position-003.html b/testing/web-platform/tests/css/css-values/calc-background-position-003.html
deleted file mode 100644
index 58e995f01c8b..000000000000
--- a/testing/web-platform/tests/css/css-values/calc-background-position-003.html
+++ /dev/null
@@ -1,77 +0,0 @@
-<!DOCTYPE html>
-
-  <meta charset="UTF-8">
-
-  <title>CSS Values and Units Test: serialization of 'background-position' when specified with calc() function</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
-  <link rel="help" href="https://www.w3.org/TR/css4-values/#calc-serialize">
-
-  <meta name="flags" content="">
-  <meta content="This test verifies how 6 calc() functions are serialized for 'background-position'." name="assert">
-
-  <script src="/resources/testharness.js"></script>
-
-  <script src="/resources/testharnessreport.js"></script>
-
-  <div id="target"></div>
-
-  <script>
-  function startTesting()
-  {
-
-  var targetElement = document.getElementById("target");
-
-    function verifySerialization(specified_value, serialization_expected, description)
-    {
-
-    test(function()
-      {
-
-      targetElement.style.backgroundPosition = specified_value;
-
-      assert_equals(targetElement.style.backgroundPosition, serialization_expected);
-
-      }, description);
-    }
-
-  /*
-    verifySerialization(specified_value, serialization_expected, description)
-  */
-
-    verifySerialization("calc(2px + 3px) calc(4px + 5px)", "calc(5px) calc(9px)", "testing background-position: calc(2px + 3px) calc(4px + 5px)");
-
-    verifySerialization("calc(18px - 7px) calc(19px - 7px)", "calc(11px) calc(12px)", "testing background-position: calc(18px - 7px) calc(19px - 7px)");
-
-    verifySerialization("calc(4 * 5px) calc(6px * 4)", "calc(20px) calc(24px)", "testing background-position: calc(4 * 5px) calc(6px * 4)");
-
-    verifySerialization("calc(100px / 4) calc(119px / 7)", "calc(25px) calc(17px)", "testing background-position: calc(100px / 4) calc(119px / 7)");
-
-  /*
-    verifySerialization(specified_value, serialization_expected, description)
-  */
-
-    verifySerialization("calc(6px + 21%) calc(7em + 22%)", "calc(21% + 6px) calc(22% + 7em)", "testing background-position: calc(6px + 21%) calc(7em + 22%)");
-
-    verifySerialization("calc(-8px + 23%) calc(-9em + 24%)", "calc(23% - 8px) calc(24% - 9em)", "testing background-position: calc(-8px + 23%) calc(-9em + 24%)");
-
-  /*
-
-  "
-  Sort the terms in the following order:
-
-    The number, if present
-
-    The percentage, if present
-
-    The dimensions, ordered by their units ASCII case-insensitive alphabetically
-  "
-  https://www.w3.org/TR/css-values-4/#math-function-serialize-a-summation
-
-  */
-
-  }
-
-  startTesting();
-
-  </script>
diff --git a/testing/web-platform/tests/css/css-values/calc-min-height.html b/testing/web-platform/tests/css/css-values/calc-min-height.html
deleted file mode 100644
index a3cfa47213fd..000000000000
--- a/testing/web-platform/tests/css/css-values/calc-min-height.html
+++ /dev/null
@@ -1,75 +0,0 @@
-<!DOCTYPE html>
-
-  <meta charset="UTF-8">
-
-  <title>CSS Values and Units Test: calc() function in 'min-height' and 'box-sizing: border-box' (complex)</title>
-
-  <!--
-
-  Original test is:
-
-https://chromium.googlesource.com/chromium/src/+/c825d655f6aaf73484f9d56e9012793f5b9668cc/third_party/WebKit/LayoutTests/css3/calc/calc-min-height.html
-
-  The original test is related to:
-
-  Issue 580508: Height of content changes after multiple reloads
-  https://bugs.chromium.org/p/chromium/issues/detail?id=580508
-
-  -->
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
-  <link rel="help" href="https://www.w3.org/TR/css-values-3/#calc-notation">
-  <link rel="match" href="../reference/ref-filled-green-100px-square.xht">
-
-  <meta name="flags" content="">
-  <meta name="assert" content="This test checks how 'min-height' with calc(percentage) and 'box-sizing' are handled. The percentage in the calc() is calculated on the content box height of div#container.">
-
-  <style>
-  div#container
-    {
-      border-bottom: transparent solid 100px;
-      border-right: transparent solid 100px;
-      height: 400px;
-      width: 100px;
-    }
-
-  div#item
-    {
-      background-color: red;
-      box-sizing: border-box;
-      height: 50px;
-      min-height: calc(50% - 100px);
-    }
-
-  div#item > div
-    {
-      background-color: green;
-      border-bottom: green solid 34px; /* arbitrary border-bottom-width value */
-      border-top: green solid 12px; /* arbitrary border-top-width value */
-      box-sizing: border-box;
-      height: 17px;
-      min-height: 100%; /* content height should be 100px - 34px - 12px == 54px */
-      overflow-y: visible;
-      /*
-      If the content height of innermost div is taller
-      than 54px, then a green rectangle (not a square)
-      will be created.
-
-      If the content height of innermost div is less
-      than 54px, then an horizontal stripe of red
-      will become visible.
-      */
-    }
-  </style>
-
-  <p>Test passes if there is a filled green square and <strong>no red</strong>.
-
-  <div id="container">
-
-    <div id="item">
-
-      <div></div>
-
-    </div>
-
-  </div>
diff --git a/testing/web-platform/tests/css/css-values/calc-nesting-002.html b/testing/web-platform/tests/css/css-values/calc-nesting-002.html
deleted file mode 100644
index 269d4e940ac4..000000000000
--- a/testing/web-platform/tests/css/css-values/calc-nesting-002.html
+++ /dev/null
@@ -1,78 +0,0 @@
-<!DOCTYPE html>
-
-  <meta charset="UTF-8">
-
-  <title>CSS Values and Units Test: serialization of summation involving nested calc()</title>
-
-  <!--
-
-  This test is an adapted version of the portion of the original test
-
-  https://chromium.googlesource.com/chromium/src/+/c825d655f6aaf73484f9d56e9012793f5b9668cc/third_party/WebKit/LayoutTests/css3/calc/calc-nesting.html
-
-  which required using property-parsing-test.js
-
-  -->
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
-  <link rel="help" href="https://www.w3.org/TR/css-values-4/#math-function-simplify-an-expression">
-
-  <meta content="This test checks that how a summation involving one or more nested calc() is performed and serialized." name="assert">
-
-  <script src="/resources/testharness.js"></script>
-
-  <script src="/resources/testharnessreport.js"></script>
-
-  <div id="target"></div>
-
-  <script>
-  function startTesting()
-  {
-
-  var targetElement = document.getElementById("target");
-
-    function verifySerialization(specified_value, serialization_expected, description)
-    {
-
-    test(function()
-      {
-
-      targetElement.style.left = specified_value;
-
-      assert_equals(targetElement.style.left, serialization_expected);
-
-      }, description);
-    }
-
-    verifySerialization("calc(20px + calc(80px))", "calc(100px)", "testing calc(20px + calc(80px))");
-
-    verifySerialization("calc(calc(100px))", "calc(100px)", "testing calc(calc(100px))");
-
-    verifySerialization("calc(calc(2) * calc(50px)", "calc(100px)", "testing calc(calc(2) * calc(50px)");
-
-    verifySerialization("calc(calc(150px*2/3)", "calc(100px)", "testing calc(calc(150px*2/3)");
-
-    verifySerialization("calc(calc(2 * calc(calc(3)) + 4) * 10px)", "calc(100px)", "testing calc(calc(2 * calc(calc(3)) + 4) * 10px)");
-
-    verifySerialization("calc(50px + calc(40%))", "calc(40% + 50px)", "testing calc(50px + calc(40%))");
-
-  /*
-
-  "
-  Sort the terms in the following order:
-
-    The number, if present
-
-    The percentage, if present
-
-    The dimensions, ordered by their units ASCII case-insensitive alphabetically
-  "
-  https://www.w3.org/TR/css-values-4/#math-function-serialize-a-summation
-
-  */
-
-  }
-
-  startTesting();
-
-  </script>
diff --git a/testing/web-platform/tests/css/css-values/calc-nesting.html b/testing/web-platform/tests/css/css-values/calc-nesting.html
deleted file mode 100644
index f68d4ae8e98c..000000000000
--- a/testing/web-platform/tests/css/css-values/calc-nesting.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE html>
-
-  <meta charset="UTF-8">
-
-  <title>CSS Values and Units Test: nested calc() functions</title>
-
-  <!--
-
-  This test is the first portion of the original test
-
-  https://chromium.googlesource.com/chromium/src/+/c825d655f6aaf73484f9d56e9012793f5b9668cc/third_party/WebKit/LayoutTests/css3/calc/calc-nesting.html
-
-  -->
-
-  <link rel="help" href="https://www.w3.org/TR/css-values-3/#calc-notation">
-
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-
-<style>
-#parent { width: 200px; }
-#div1 { width: calc(calc(50px)); }
-#div2 { width: calc(calc(60%) - 20px); }
-#div3 { width: calc(calc(3 * 25%)); }
-#div4 {
-    --width: calc(10% + 30px);
-    width: calc(2 * var(--width));
-}
-</style>
-<div id=parent>
-  <div id=div1></div>
-  <div id=div2></div>
-  <div id=div3></div>
-  <div id=div4></div>
-</div>
-<script>
-// Tests that require layout
-test(function(){
-    assert_equals(getComputedStyle(div1).width, "50px");
-    assert_equals(getComputedStyle(div2).width, "100px");
-    assert_equals(getComputedStyle(div3).width, "150px");
-    assert_equals(getComputedStyle(div4).width, "100px");
-}, "Nested calcs should work with layout");
-</script>
diff --git a/testing/web-platform/tests/css/css-values/calc-numbers.html b/testing/web-platform/tests/css/css-values/calc-numbers.html
index e9ade71e22f5..995595b8a3e9 100644
--- a/testing/web-platform/tests/css/css-values/calc-numbers.html
+++ b/testing/web-platform/tests/css/css-values/calc-numbers.html
@@ -71,7 +71,7 @@ https://chromium.googlesource.com/chromium/src/+/c825d655f6aaf73484f9d56e9012793
 
     verifyComputedStyle("opacity", "initial", "calc(2 / 4)", "0.5", "testing opacity: calc(2 / 4)");
 
-    verifyComputedStyle("tab-size", "12345", "calc(2 / 4)", "1", "testing tab-size: calc(2 / 4)");
+    verifyComputedStyle("tab-size", "12345", "calc(2 / 4)", "0.5", "testing tab-size: calc(2 / 4)");
     /*
     'tab-size' accepts <number> values.
     */
diff --git a/testing/web-platform/tests/css/css-values/calc-serialization-002.html b/testing/web-platform/tests/css/css-values/calc-serialization-002.html
deleted file mode 100644
index a06b33e492e3..000000000000
--- a/testing/web-platform/tests/css/css-values/calc-serialization-002.html
+++ /dev/null
@@ -1,95 +0,0 @@
-<!DOCTYPE html>
-
-  <meta charset="UTF-8">
-
-  <title>CSS Values and Units: calc() serialization of a summation (complex)</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
-  <link rel="help" href="https://www.w3.org/TR/css-values-4/#compat">
-  <link rel="help" href="https://www.w3.org/TR/css-values-4/#calc-serialize">
-
-  <meta content="This test verifies how 11 summations of mixed length units are serialized. Absolute length units, relative length units, font-relative length units, viewport-percentage length units and percentage units are tested." name="assert">
-
-  <script src="/resources/testharness.js"></script>
-
-  <script src="/resources/testharnessreport.js"></script>
-
-  <div id="target"></div>
-
-  <script>
-  function startTesting()
-  {
-
-  var targetElement = document.getElementById("target");
-
-    function verifySerialization(specified_value, serialization_expected, description)
-    {
-
-    test(function()
-      {
-
-      targetElement.style.height = specified_value;
-
-      assert_equals(targetElement.style.height, serialization_expected);
-
-      }, description);
-    }
-
-  /*
-
-  "
-  Sort the terms in the following order:
-
-    The number, if present
-
-    The percentage, if present
-
-    The dimensions, ordered by their units ASCII case-insensitive alphabetically
-  "
-  https://www.w3.org/TR/css-values-4/#math-function-serialize-a-summation
-
-  cm  centimeters  1cm = 96px/2.54
-  mm  millimeters  1mm = 1/10th of 1cm
-  Q   quarter-millimeters  1Q = 1/40th of 1cm
-  in  inches  1in = 2.54cm = 96px
-  pc  picas  1pc = 1/6th of 1in
-  pt  points  1pt = 1/72th of 1in
-  px  pixels  1px = 1/96th of 1in
-
-  */
-
-    verifySerialization("calc(1vh + 2px + 3%)", "calc(3% + 2px + 1vh)", "testing calc(1vh + 2px + 3%)");
-
-    verifySerialization("calc(4px + 1vh)", "calc(4px + 1vh)", "testing calc(4px + 1vh)");
-
-    verifySerialization("calc(5px + 6em + 1vh)", "calc(6em + 5px + 1vh)", "testing calc(5px + 6em + 1vh)");
-
-    verifySerialization("calc(1vh - 7px)", "calc(-7px + 1vh)", "testing calc(1vh - 7px)");
-
-    verifySerialization("calc(-8px + 9em + 1vh)", "calc(9em - 8px + 1vh)", "testing calc(-8px + 9em + 1vh)");
-
-    verifySerialization("calc(1pc + 1in + 1vh + 10%)", "calc(10% + 112px + 1vh)", "testing calc(1pc + 1in + 1vh + 10%)");
-
- /* verifySerialization(specified_value, serialization_expected, description)  */
-
-    verifySerialization("calc(25.4q + 1vh + 12%)", "calc(12% + 24px + 1vh)", "testing calc(25.4q + 1vh + 12%)");
-
-    verifySerialization("calc(1em + 1.27cm + 13% + 3em)", "calc(13% + 4em + 48px)", "testing calc(1em + 1.27cm + 13% + 3em)");
-
-    verifySerialization("calc(1vmin - 14%)", "calc(-14% + 1vmin)", "testing calc(1vmin - 14%)");
-
-    verifySerialization("calc(15vw + 16vmin - 17vh)", "calc(-17vh + 16vmin + 15vw)", "testing calc(15vw + 16vmin - 17vh)");
-
-    verifySerialization("calc(-80px + 25.4mm)", "calc(16px)", "testing calc(-80px + 25.4mm)");
-
-    /*
-    This calc(-80px + 25.4mm) test is on purpose last. We want the
-    div#target to occupy 16px and to not cause document box height
-    to be unneedlessly tall.
-    */
-
-  }
-
-  startTesting();
-
-  </script>
diff --git a/testing/web-platform/tests/css/css-values/calc-time-values.html b/testing/web-platform/tests/css/css-values/calc-time-values.html
deleted file mode 100644
index 60bcdcba594d..000000000000
--- a/testing/web-platform/tests/css/css-values/calc-time-values.html
+++ /dev/null
@@ -1,104 +0,0 @@
-<!DOCTYPE html>
-
-  <meta charset="UTF-8">
-
-  <title>CSS Values and Units Test: calc() function with time values</title>
-
-  <!--
-
-  Original test is:
-
-  https://chromium.googlesource.com/chromium/src/+/c825d655f6aaf73484f9d56e9012793f5b9668cc/third_party/WebKit/LayoutTests/css3/calc/calc-with-time-angle-and-frequency-values.html
-
-  Issue 917718: [css-values] calc-with-time-angle-and-frequency-values
-  test is highly unreliable, transition-delay testing causes side effects
-  https://bugs.chromium.org/p/chromium/issues/detail?id=917718
-
-  -->
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
-  <link rel="help" href="https://www.w3.org/TR/css-values-3/#calc-computed-value">
-  <link rel="help" href="https://www.w3.org/TR/css-values-3/#time">
-
-  <meta content="This test checks that additions, substractions, multiplications and divisions in calc() function when applied to time units." name="assert">
-
-  <script src="/resources/testharness.js"></script>
-
-  <script src="/resources/testharnessreport.js"></script>
-
-  <div id="log"></div>
-
-  <div id="target"></div>
-
-  <script>
-  function startTesting()
-  {
-
-    var targetElement = document.getElementById("target");
-
-    function compareValue(property_name, calcValue, expectedValue, description)
-    {
-
-    test(function()
-      {
-
-      targetElement.style.setProperty(property_name, "inherit");
-
-      /*
-      Since we are running many consecutive tests on the same
-      element, then it is necessary to 'reset' its property
-      to an initial value before actually re-testing it.
-      */
-
-      targetElement.style.setProperty(property_name, calcValue);
-
-      var computedCalcValue = getComputedStyle(targetElement)[property_name];
-
-      targetElement.style.setProperty(property_name, expectedValue);
-
-      var computedExpectedValue = getComputedStyle(targetElement)[property_name];
-
-      assert_equals(computedCalcValue, computedExpectedValue);
-
-      }, description);
-
-    }
-
-
-    /* Testing time units  */
-
- /* compareValue(property_name, calcValue, expectedValue, description)  */
-
-    compareValue("transition-delay", "calc(4s + 1s)", "5s", "addition of 2 time units: s plus s");
-
-    compareValue("transition-delay", "calc(4s + 1ms)", "4.001s", "addition of 2 time units: s plus ms");
-
-    compareValue("transition-delay", "calc(4ms + 1ms)", "0.005s", "addition of 2 time units: ms plus ms");
-
-    compareValue("transition-delay", "calc(4s - 1s)", "3s", "substraction of time unit: s minus s");
-
-    compareValue("transition-delay", "calc(4s - 1ms)", "3.999s", "substraction of time unit: s minus ms");
-
-    compareValue("transition-delay", "calc(4 * 1s)", "4s", "multiplication of integer with a time unit: int multiplied by s");
-
-    compareValue("transition-delay", "calc(4 * 1ms)", "0.004s", "multiplication of integer with a time unit: int multiplied by ms");
-
-    compareValue("transition-delay", "calc(4s / 2)", "2s", "division of time unit with integer: s divided by int");
-
-    compareValue("transition-delay", "calc(4ms / 2)", "0.002s", "division of time unit with integer: ms divided by int");
-
- /* compareValue(property_name, calcValue, expectedValue, description)  */
-
-
-
-  /* Testing conversion of time unit  */
-
- /* compareValue(property_name, calcValue, expectedValue, description)  */
-
-    compareValue("transition-delay", "calc(4000ms)", "4s", "conversion of time unit: ms into s");
-
-  }
-
-  startTesting();
-
-  </script>
diff --git a/testing/web-platform/tests/css/css-values/calc-z-index-fractions-001.html b/testing/web-platform/tests/css/css-values/calc-z-index-fractions-001.html
deleted file mode 100644
index 6b8ed24989fc..000000000000
--- a/testing/web-platform/tests/css/css-values/calc-z-index-fractions-001.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<!DOCTYPE html>
-
-  <meta charset="UTF-8">
-
-  <title>CSS Values and Units Test: computed value of 'z-index' when specified with calc() function and fractional values</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
-  <link rel="help" href="https://www.w3.org/TR/css-values-4/#calc-range">
-
-  <meta name="flags" content="">
-  <meta content="This test verifies how 2 calc() functions are computed for 'z-index' when involved expressions end up being numbers halfway between adjacent integers." name="assert">
-
-  <script src="/resources/testharness.js"></script>
-
-  <script src="/resources/testharnessreport.js"></script>
-
-  <div id="target"></div>
-
-  <script>
-  function startTesting()
-  {
-
-  var targetElement = document.getElementById("target");
-
-    function verifyComputedStyle(property_name, initial_value, specified_value, expected_value, description)
-    {
-
-    test(function()
-      {
-
-      targetElement.style.setProperty(property_name, initial_value);
-
-      /*
-      The purpose of the initial_value is to act as a fallback
-      value in case the calc() function in the specified value
-      fails or in case it generates an invalid value. Since we
-      are running 2 consecutive tests on the same element,
-      then it is necessary to reset its property to an initial
-      value.
-      */
-
-      targetElement.style.setProperty(property_name, specified_value);
-
-      assert_equals(getComputedStyle(targetElement)[property_name], expected_value);
-
-      }, description);
-    }
-
- /* verifyComputedStyle(property_name, initial_value, specified_value, expected_value, description) */
-
-    verifyComputedStyle("z-index", "auto", "calc(3 / 2)", "2", "testing z-index: calc(3 / 2)");
-
-    verifyComputedStyle("z-index", "auto", "calc(-3 / 2)", "-1", "testing z-index: calc(-3 / 2)");
-
-  }
-
-  startTesting();
-
-  </script>
diff --git a/testing/web-platform/tests/css/css-values/getComputedStyle-border-radius-002.html b/testing/web-platform/tests/css/css-values/getComputedStyle-border-radius-002.html
deleted file mode 100644
index 8dec53f3f0ef..000000000000
--- a/testing/web-platform/tests/css/css-values/getComputedStyle-border-radius-002.html
+++ /dev/null
@@ -1,80 +0,0 @@
-<!DOCTYPE html>
-
-  <meta charset="UTF-8">
-
-  <title>CSS Values Test: percentages in calc() and computed border-radius values</title>
-
-  <!--
-
-  Bugzilla bug report 1516454: Computed value of border-radius with calc(percentage) is incorrect
-  https://bugzilla.mozilla.org/show_bug.cgi?id=1516454
-
-  -->
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
-  <link rel="help" href="https://www.w3.org/TR/css-values-3/#calc-computed-value">
-
-  <style>
-  div#target
-    {
-      border: black solid 5px;
-      height: 100px;
-      width: 100px;
-    }
-  </style>
-
-  <script src="/resources/testharness.js"></script>
-
-  <script src="/resources/testharnessreport.js"></script>
-
-  <div id="log"></div>
-
-  <div id="target"></div>
-
-  <script>
-  function startTesting()
-  {
-
-    var targetElement = document.getElementById("target");
-
-    function compareValue(property_name, calcValue, expectedValue, description)
-    {
-
-    test(function()
-      {
-
-      targetElement.style.setProperty(property_name, "initial");
-
-      targetElement.style.setProperty(property_name, calcValue);
-
-      var computedCalcValue = getComputedStyle(targetElement)[property_name];
-
-      targetElement.style.setProperty(property_name, expectedValue);
-
-      var computedExpectedValue = getComputedStyle(targetElement)[property_name];
-
-      assert_equals(computedCalcValue, computedExpectedValue);
-
-      }, description);
-    }
-
-    compareValue("border-top-left-radius", "calc(50%)", "50%", "simple percentage conversion test 1");
-
-    compareValue("border-top-right-radius", "calc(50%)", "50%", "simple percentage conversion test 2");
-
-    compareValue("border-bottom-left-radius", "calc(50%)", "50%", "simple percentage conversion test 3");
-
-    compareValue("border-bottom-right-radius", "calc(50%)", "50%", "simple percentage conversion test 4");
-
-    compareValue("border-top-left-radius", "calc(50%) calc(25%)", "50% 25%", "percentage conversion test 5");
-
-    compareValue("border-top-right-radius", "calc(50%) calc(25%)", "50% 25%", "percentage conversion test 6");
-
-    compareValue("border-bottom-left-radius", "calc(50%) calc(25%)", "50% 25%", "percentage conversion test 7");
-
-    compareValue("border-bottom-right-radius", "calc(50%) calc(25%)", "50% 25%", "percentage conversion test 8");
-  }
-
-  startTesting();
-
-  </script>
diff --git a/testing/web-platform/tests/css/css-values/rgba-011.html b/testing/web-platform/tests/css/css-values/rgba-011.html
deleted file mode 100644
index 84c317033063..000000000000
--- a/testing/web-platform/tests/css/css-values/rgba-011.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<!DOCTYPE html>
-
-  <meta charset="UTF-8">
-
-  <title>CSS Values and Units Test: rgba() function syntax (complex)</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
-  <link rel="help" href="https://www.w3.org/TR/css-color-3/#rgba-color">
-  <link rel="help" href="https://www.w3.org/TR/css-color-4/#rgb-functions">
-  <link rel="help" href="https://www.w3.org/TR/css-values-4/#combine-integers">
-
-  <meta name="flags" content="">
-  <meta name="assert" content="This test checks the syntax allowed by rgba() function. White space characters, instead of commas, are allowed between numerical values. <alpha-value> can be omitted for rgba() function, in which case it must defaults to 100%. Finally, rgba() function can take real numbers but their computed values will be rounded to the nearest integer, with values halfway between adjacent integers rounded towards positive infinity.">
-
-  <script src="/resources/testharness.js"></script>
-
-  <script src="/resources/testharnessreport.js"></script>
-
-  <div id="log"></div>
-
-  <div id="target"></div>
-
-  <script>
-  function startTesting()
-  {
-
-    var targetElement = document.getElementById("target");
-
-    function compareValue(property_name, calcValue, expectedValue, description)
-    {
-
-    test(function()
-      {
-
-      targetElement.style.setProperty(property_name, calcValue);
-
-      var computedCalcValue = getComputedStyle(targetElement)[property_name];
-
-      targetElement.style.setProperty(property_name, expectedValue);
-
-      var computedExpectedValue = getComputedStyle(targetElement)[property_name];
-
-      assert_equals(computedCalcValue, computedExpectedValue);
-
-      }, description);
-    }
-
-    compareValue("background-color", "rgba(0.4 127.5 0.3)", "rgb(0, 128, 0)", "testing background-color: rgba(0.4 127.5 0.3)");
-
-  }
-
-  startTesting();
-
-  </script>
diff --git a/testing/web-platform/tests/css/css-writing-modes/reference/writing-mode-vertical-lr-002-ref.xht b/testing/web-platform/tests/css/css-writing-modes/reftest/writing-mode-vertical-lr-002-ref.xht
similarity index 100%
rename from testing/web-platform/tests/css/css-writing-modes/reference/writing-mode-vertical-lr-002-ref.xht
rename to testing/web-platform/tests/css/css-writing-modes/reftest/writing-mode-vertical-lr-002-ref.xht
diff --git a/testing/web-platform/tests/css/css-writing-modes/reference/writing-mode-vertical-rl-001-ref.xht b/testing/web-platform/tests/css/css-writing-modes/reftest/writing-mode-vertical-rl-001-ref.xht
similarity index 100%
rename from testing/web-platform/tests/css/css-writing-modes/reference/writing-mode-vertical-rl-001-ref.xht
rename to testing/web-platform/tests/css/css-writing-modes/reftest/writing-mode-vertical-rl-001-ref.xht
diff --git a/testing/web-platform/tests/css/css-writing-modes/reference/writing-mode-vertical-rl-002-ref.xht b/testing/web-platform/tests/css/css-writing-modes/reftest/writing-mode-vertical-rl-002-ref.xht
similarity index 100%
rename from testing/web-platform/tests/css/css-writing-modes/reference/writing-mode-vertical-rl-002-ref.xht
rename to testing/web-platform/tests/css/css-writing-modes/reftest/writing-mode-vertical-rl-002-ref.xht
diff --git a/testing/web-platform/tests/css/css-writing-modes/writing-mode-vertical-lr-002.xht b/testing/web-platform/tests/css/css-writing-modes/writing-mode-vertical-lr-002.xht
index 291dff96d39c..8086296174cb 100644
--- a/testing/web-platform/tests/css/css-writing-modes/writing-mode-vertical-lr-002.xht
+++ b/testing/web-platform/tests/css/css-writing-modes/writing-mode-vertical-lr-002.xht
@@ -6,7 +6,7 @@
     <link rel="author" title="Yoshifumi Kawai" href="mailto:kawai@est.co.jp" />
     <link rel="reviewer" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact"/>
     <link rel="help" title="CSS3 Writing modes: 3.1. Block Flow Direction: the 'writing-mode' property" href="http://www.w3.org/TR/css-writing-modes-3/#propdef-writing-mode" />
-    <link rel="match" href="reference/writing-mode-vertical-lr-002-ref.xht"/>
+    <link rel="match" href="reftest/writing-mode-vertical-lr-002-ref.xht"/>
     <meta name="flags" content="ahem" />
     <meta content="This tests the block flow direction. The writing mode is vertical, and the block flow is left to right." />
     <style type="text/css"><![CDATA[
diff --git a/testing/web-platform/tests/css/css-writing-modes/writing-mode-vertical-rl-001.xht b/testing/web-platform/tests/css/css-writing-modes/writing-mode-vertical-rl-001.xht
index 5a5c7bf2a4eb..0a7839cba0c8 100644
--- a/testing/web-platform/tests/css/css-writing-modes/writing-mode-vertical-rl-001.xht
+++ b/testing/web-platform/tests/css/css-writing-modes/writing-mode-vertical-rl-001.xht
@@ -6,7 +6,7 @@
     <link rel="author" title="Yoshifumi Kawai" href="mailto:kawai@est.co.jp" />
     <link rel="reviewer" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact"/>
     <link rel="help" title="CSS3 Writing modes: 3.1. Block Flow Direction: the 'writing-mode' property" href="http://www.w3.org/TR/css-writing-modes-3/#propdef-writing-mode" />
-    <link rel="match" href="reference/writing-mode-vertical-rl-001-ref.xht"/>
+    <link rel="match" href="reftest/writing-mode-vertical-rl-001-ref.xht"/>
     <meta name="flags" content="ahem" />
     <meta content="This tests the block flow direction. The writing mode is vertical, and the block flow is right to left." />
     <style type="text/css"><![CDATA[
diff --git a/testing/web-platform/tests/css/css-writing-modes/writing-mode-vertical-rl-002.xht b/testing/web-platform/tests/css/css-writing-modes/writing-mode-vertical-rl-002.xht
index ac77d439d75d..f2d3ab078f9c 100644
--- a/testing/web-platform/tests/css/css-writing-modes/writing-mode-vertical-rl-002.xht
+++ b/testing/web-platform/tests/css/css-writing-modes/writing-mode-vertical-rl-002.xht
@@ -6,7 +6,7 @@
     <link rel="author" title="Yoshifumi Kawai" href="mailto:kawai@est.co.jp" />
     <link rel="reviewer" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact"/>
     <link rel="help" title="CSS3 Writing modes: 3.1. Block Flow Direction: the 'writing-mode' property" href="http://www.w3.org/TR/css-writing-modes-3/#propdef-writing-mode" />
-    <link rel="match" href="reference/writing-mode-vertical-rl-002-ref.xht"/>
+    <link rel="match" href="reftest/writing-mode-vertical-rl-002-ref.xht"/>
     <meta name="flags" content="ahem" />
     <meta content="This tests the block flow direction. The writing mode is vertical, and the block flow is right to left." />
     <style type="text/css"><![CDATA[
diff --git a/testing/web-platform/tests/css/cssom/CSSStyleSheet-constructable.html b/testing/web-platform/tests/css/cssom/CSSStyleSheet-constructable.html
index 5ee86ae4a677..e3083d283f35 100644
--- a/testing/web-platform/tests/css/cssom/CSSStyleSheet-constructable.html
+++ b/testing/web-platform/tests/css/cssom/CSSStyleSheet-constructable.html
@@ -14,7 +14,7 @@
     <span class="yellow"></span>
   </div>
 </section>
-<section id="shadowHost"></section>
+<section id="secondSection"></section>
 <section id="thirdSection"></section>
 
 <script>
@@ -27,8 +27,7 @@ const yellowStyleText = ".yellow { color: yellow; }";
 
 const firstDiv = document.querySelector('#firstSection > div');
 const secondDiv = firstDiv.cloneNode(true);
-const shadowHost = document.querySelector('#shadowHost');
-const shadowRoot = shadowHost.attachShadow({mode: 'open'});
+const shadowRoot = document.querySelector('#secondSection').attachShadow({mode: 'open'});
 shadowRoot.appendChild(secondDiv);
 
 const greenSpan = firstDiv.children[0];
@@ -210,59 +209,6 @@ promise_test(() => {
   });
 }, 'Constructed style sheets can be applied on shadow root');
 
-promise_test(() => {
-  return Promise.all(createAllSheetsPromise()).then(values => {
-    const greenStyleSheet = values[0];
-    const redStyleSheet = values[1];
-    shadowRoot.adoptedStyleSheets = [greenStyleSheet];
-    assert_equals(getComputedStyle(greenShadowSpan).color, "rgb(0, 128, 0)", "Style applies connected");
-    assert_equals(getComputedStyle(redShadowSpan).color, "rgb(0, 0, 0)", "Style applies when connected");
-    let hostParent = shadowHost.parentNode;
-    hostParent.removeChild(shadowHost);
-    assert_equals(getComputedStyle(greenShadowSpan).color, "", "Style doesn't apply when detached");
-    assert_equals(getComputedStyle(redShadowSpan).color, "", "Style doesn't apply when detached");
-    shadowRoot.adoptedStyleSheets = [redStyleSheet, greenStyleSheet];
-    hostParent.appendChild(shadowHost);
-    assert_equals(getComputedStyle(greenShadowSpan).color, "rgb(0, 128, 0)", "Style applies after reattach");
-    assert_equals(getComputedStyle(redShadowSpan).color, "rgb(255, 0, 0)", "Style applies after reattach");
-  });
-}, 'Re-attaching shadow host with adopted stylesheets work');
-
-test(() => {
-  const sheet = new CSSStyleSheet();
-  sheet.replaceSync(":host { color: red; }");
-  const host = document.createElement("div");
-  let sr = host.attachShadow({mode: "open"});
-  sr.adoptedStyleSheets = [sheet];
-  document.body.appendChild(host);
-  assert_equals(getComputedStyle(host).color, "rgb(255, 0, 0)", "Style applies when connected");
-  sheet.replaceSync(":host { color: blue; }");
-  assert_equals(getComputedStyle(host).color, "rgb(0, 0, 255)", "Style update applies when connected");
-}, 'Attaching a shadow root that already has adopted stylesheets work');
-
-test(() => {
-
-  const sheet = new CSSStyleSheet();
-  sheet.replaceSync(":host([red]) { color: red; } :host(.blue) { color: blue; }");
-  const host = document.createElement("div");
-  host.toggleAttribute("red");
-  document.body.appendChild(host);
-  assert_equals(getComputedStyle(host).color, "rgb(0, 0, 0)", "No style applies yet");
-
-  let sr = host.attachShadow({mode: "open"});
-  sr.adoptedStyleSheets = [sheet];
-
-  assert_equals(getComputedStyle(host).color, "rgb(255, 0, 0)", "Style applies after adding style");
-  document.body.removeChild(host);
-  document.body.appendChild(host);
-  assert_equals(getComputedStyle(host).color, "rgb(255, 0, 0)", "Style applies after reattachment");
-  host.toggleAttribute("red");
-  assert_equals(getComputedStyle(host).color, "rgb(0, 0, 0)", "Attribute updates to the element after reattachment apply");
-  host.classList.toggle("blue");
-  assert_equals(getComputedStyle(host).color, "rgb(0, 0, 255)", "Class updates to the element after reattachment apply");
-
-}, "Re-attaching shadow host and updating attributes work");
-
 promise_test(() => {
   const plainSheet = new CSSStyleSheet();
   const redStyleSheetPromise = plainSheet.replace(redStyleTexts[0]);
diff --git a/testing/web-platform/tests/custom-elements/CustomElementRegistry.html b/testing/web-platform/tests/custom-elements/CustomElementRegistry.html
index d6fda892c38b..86337fa87951 100644
--- a/testing/web-platform/tests/custom-elements/CustomElementRegistry.html
+++ b/testing/web-platform/tests/custom-elements/CustomElementRegistry.html
@@ -328,9 +328,7 @@ test(function () {
     });
     customElements.define('element-with-attribute-changed-callback', proxy);
     assert_array_equals(prototypeCalls, [1, 'connectedCallback', 2, 'disconnectedCallback', 3, 'adoptedCallback', 4, 'attributeChangedCallback']);
-    assert_array_equals(constructorCalls, [0, 'prototype',
-                                           5, 'observedAttributes',
-                                           6, 'disabledFeatures']);
+    assert_array_equals(constructorCalls, [0, 'prototype', 5, 'observedAttributes']);
 }, 'customElements.define must get "observedAttributes" property on the constructor prototype when "attributeChangedCallback" is present');
 
 test(function () {
@@ -390,53 +388,6 @@ test(function () {
     customElements.define('element-without-callback-with-invalid-observed-attributes', constructor);
 }, 'customElements.define must not throw even if "observedAttributes" fails to convert if "attributeChangedCallback" is not defined');
 
-test(function () {
-    var constructor = function () {}
-    var calls = [];
-    var proxy = new Proxy(constructor, {
-        get: function (target, name) {
-            calls.push(name);
-            if (name == 'disabledFeatures')
-                throw {name: 'expectedError'};
-            return target[name];
-        }
-    });
-    assert_throws({'name': 'expectedError'}, () => customElements.define('element-with-throwing-disabled-features', proxy));
-    assert_array_equals(calls, ['prototype', 'disabledFeatures'],
-        'customElements.define must get "prototype" and "disabledFeatures" on the constructor');
-}, 'customElements.define must rethrow an exception thrown while getting disabledFeatures on the constructor prototype');
-
-test(function () {
-    var constructor = function () {}
-    var calls = [];
-    var proxy = new Proxy(constructor, {
-        get: function (target, name) {
-            calls.push(name);
-            if (name == 'disabledFeatures')
-                return 1;
-            return target[name];
-        }
-    });
-    assert_throws({'name': 'TypeError'}, () => customElements.define('element-with-invalid-disabled-features', proxy));
-    assert_array_equals(calls, ['prototype', 'disabledFeatures'],
-        'customElements.define must get "prototype" and "disabledFeatures" on the constructor');
-}, 'customElements.define must rethrow an exception thrown while converting the value of disabledFeatures to sequence<DOMString>');
-
-test(function () {
-    var constructor = function () {}
-    constructor.disabledFeatures = {[Symbol.iterator]: function *() {
-        yield 'foo';
-        throw {name: 'SomeError'};
-    }};
-    assert_throws({'name': 'SomeError'}, () => customElements.define('element-with-generator-disabled-features', constructor));
-}, 'customElements.define must rethrow an exception thrown while iterating over disabledFeatures to sequence<DOMString>');
-
-test(function () {
-    var constructor = function () {}
-    constructor.disabledFeatures = {[Symbol.iterator]: 1};
-    assert_throws({'name': 'TypeError'}, () => customElements.define('element-with-disabled-features-with-uncallable-iterator', constructor));
-}, 'customElements.define must rethrow an exception thrown while retrieving Symbol.iterator on disabledFeatures');
-
 test(function () {
     class MyCustomElement extends HTMLElement {};
     customElements.define('my-custom-element', MyCustomElement);
diff --git a/testing/web-platform/tests/custom-elements/HTMLElement-attachInternals.html b/testing/web-platform/tests/custom-elements/HTMLElement-attachInternals.html
deleted file mode 100644
index e53798305905..000000000000
--- a/testing/web-platform/tests/custom-elements/HTMLElement-attachInternals.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<!DOCTYPE html>
-<body>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<link rel="help" content="https://html.spec.whatwg.org/multipage/custom-elements.html#dom-attachinternals">
-<div id="container"></div>
-<script>
-test(() => {
-  class MyElement1 extends HTMLElement {
-  }
-  customElements.define('my-element1', MyElement1);
-  const container = document.querySelector('#container');
-
-  let element = new MyElement1();
-  assert_true(element.attachInternals() instanceof ElementInternals,
-              'New - 1st call');
-  assert_throws('InvalidStateError', () => { element.attachInternals(); },
-                'New - 2nd call');
-
-  element = document.createElement('my-element1');
-  assert_true(element.attachInternals() instanceof ElementInternals,
-              'createElement - 1st call');
-  assert_throws('InvalidStateError', () => { element.attachInternals(); },
-                'createElement - 2nd call');
-
-  container.innerHTML = '<my-element1></my-element1>';
-  assert_true(container.firstChild.attachInternals() instanceof ElementInternals,
-              'Parser - 1st call');
-  assert_throws('InvalidStateError', () => {
-    container.firstChild.attachInternals();
-  }, 'Parser - 2nd call');
-}, 'Successful attachInternals() and the second call.');
-
-test(() => {
-  class MyDiv extends HTMLDivElement {}
-  customElements.define('my-div', MyDiv, { extends: 'div' });
-  const customizedBuiltin = document.createElement('div', { is: 'my-div'});
-  assert_throws('NotSupportedError', () => { customizedBuiltin.attachInternals() });
-}, 'attachInternals() throws a NotSupportedError if it is called for ' +
-     'a customized built-in element');
-
-test(() => {
-  const builtin = document.createElement('div');
-  assert_throws('InvalidStateError', () => { builtin.attachInternals() });
-
-  const doc = document.implementation.createDocument('foo', null);
-  const span = doc.appendChild(doc.createElementNS('http://www.w3.org/1999/xhtml', 'html:span'));
-  assert_true(span instanceof HTMLElement);
-  assert_throws('InvalidStateError', () => { span.attachInternals(); });
-
-  const undefinedCustom = document.createElement('undefined-element');
-  assert_throws('InvalidStateError', () => { undefinedCustom.attachInternals() });
-}, 'If a custom element definition for the local name of the element doesn\'t' +
-     ' exist, throw an InvalidStateError');
-
-test(() => {
-  class MyElement2 extends HTMLElement {
-    static get disabledFeatures() { return ['internals']; }
-  }
-  customElements.define('my-element2', MyElement2);
-  const container = document.querySelector('#container');
-
-  assert_throws('NotSupportedError', () => {
-    (new MyElement2).attachInternals();
-  });
-  assert_throws('NotSupportedError', () => {
-    document.createElement('my-element2').attachInternals();
-  });
-  assert_throws('NotSupportedError', () => {
-    container.innerHTML = '<my-element2></my-element2>';
-    container.firstChild.attachInternals();
-  });
-
-  class MyElement3 extends HTMLElement {
-    static get disabledFeatures() { return ['INTERNALS']; }
-  }
-  customElements.define('my-element3', MyElement3);
-  assert_true((new MyElement3).attachInternals() instanceof ElementInternals);
-}, 'If a custom element definition for the local name of the element has ' +
-     'disable internals flag, throw a NotSupportedError');
-</script>
-</body>
diff --git a/testing/web-platform/tests/custom-elements/reactions/HTMLAreaElement.html b/testing/web-platform/tests/custom-elements/reactions/HTMLAreaElement.html
deleted file mode 100644
index 95059b7c8d08..000000000000
--- a/testing/web-platform/tests/custom-elements/reactions/HTMLAreaElement.html
+++ /dev/null
@@ -1,69 +0,0 @@
-<!DOCTYPE html>
-<title>Custom Elements: CEReactions on HTMLAreaElement interface</title>
-<link rel="author" title="Intel" href="http://www.intel.com">
-<meta name="assert" content="alt, coords, shape, target, download, ping, rel,
-  referrerPolicy of HTMLAreaElement interface must have CEReactions">
-<meta name="help" content="https://html.spec.whatwg.org/#the-area-element">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../resources/custom-elements-helpers.js"></script>
-<script src="./resources/reactions.js"></script>
-
-<map name="yellow" id="map">
-</map>
-<img usemap="#yellow" src="/images/yellow.png" alt="yellow pic">
-
-<script>
-
-function getParentElement() {
-  let map = document.getElementById('map');
-  return map;
-}
-
-function setAttributes(instance) {
-  instance.setAttribute('href', '/images/yellow.png');
-}
-
-testReflectAttributeWithDependentAttributes(
-  'alt', 'alt', 'yellow pic',
-  'yellow pic2', 'alt on HTMLAreaElement', 'area',
-  getParentElement, instance => setAttributes(instance), HTMLAreaElement
-);
-testReflectAttributeWithParentNode(
-  'coords', 'coords', '1, 1, 5, 5',
-  '2, 2, 6, 6', 'coords on HTMLAreaElement', 'area',
-  getParentElement, HTMLAreaElement
-);
-testReflectAttributeWithDependentAttributes(
-  'shape', 'shape', 'rectangle',
-  'default', 'shape on HTMLAreaElement', 'area',
-  getParentElement, instance => instance.setAttribute('coords', '1, 1, 5, 5'),
-  HTMLAreaElement
-);
-testReflectAttributeWithDependentAttributes(
-  'target', 'target', '_blank',
-  '_top', 'target on HTMLAreaElement', 'area',
-  getParentElement, instance => setAttributes(instance), HTMLAreaElement
-);
-testReflectAttributeWithDependentAttributes(
-  'download', 'download', 'pic1',
-  'pic2', 'download on HTMLAreaElement', 'area',
-  getParentElement, instance => setAttributes(instance), HTMLAreaElement
-);
-testReflectAttributeWithDependentAttributes(
-  'ping', 'ping', 'location.href',
-  `${location.protocol}\/\/${location.host}`, 'ping on HTMLAreaElement', 'area',
-  getParentElement, instance => setAttributes(instance), HTMLAreaElement
-);
-testReflectAttributeWithDependentAttributes(
-  'rel', 'rel', 'help',
-  'noreferrer', 'rel on HTMLAreaElement', 'area',
-  getParentElement, instance => setAttributes(instance), HTMLAreaElement
-);
-testReflectAttributeWithDependentAttributes(
-  'referrerPolicy', 'referrerpolicy', 'same-origin',
-  'origin', 'referrerPolicy on HTMLAreaElement', 'area',
-  getParentElement, instance => setAttributes(instance), HTMLAreaElement
-);
-
-</script>
diff --git a/testing/web-platform/tests/custom-elements/reactions/HTMLBaseElement.html b/testing/web-platform/tests/custom-elements/reactions/HTMLBaseElement.html
deleted file mode 100644
index 82ab92280430..000000000000
--- a/testing/web-platform/tests/custom-elements/reactions/HTMLBaseElement.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-<head>
-<title>Custom Elements: CEReactions on HTMLBaseElement interface</title>
-<link rel="author" title="Intel" href="http://www.intel.com">
-<meta name="assert" content="href, target of HTMLBaseElement interface must have CEReactions">
-<meta name="help" content="https://html.spec.whatwg.org/#the-base-element">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../resources/custom-elements-helpers.js"></script>
-<script src="./resources/reactions.js"></script>
-</head>
-<script>
-
-function getParentElement() {
-  return document.head;
-}
-
-testReflectAttributeWithParentNode('href', 'href', '/', 'http://example.com/', 'href on HTMLBaseElement', 'base', getParentElement, HTMLBaseElement);
-testReflectAttributeWithParentNode('target', 'target', '_blank', '_self', 'target on HTMLBaseElement', 'base', getParentElement, HTMLBaseElement);
-
-</script>
diff --git a/testing/web-platform/tests/custom-elements/reactions/HTMLButtonElement.html b/testing/web-platform/tests/custom-elements/reactions/HTMLButtonElement.html
index f97b6daa0b5c..90390108b421 100644
--- a/testing/web-platform/tests/custom-elements/reactions/HTMLButtonElement.html
+++ b/testing/web-platform/tests/custom-elements/reactions/HTMLButtonElement.html
@@ -1,9 +1,7 @@
 <!DOCTYPE html>
 <title>Custom Elements: CEReactions on HTMLButtonElement interface</title>
 <meta name="author" title="Zhang Xiaoyu" href="xiaoyux.zhang@intel.com">
-<meta name="assert" content=" autofocus, disabled, formAction, formEnctype,
-  formMethod, formNoValidate, formTarget, name, type, value
-  of HTMLButtonElement interface must have CEReactions">
+<meta name="assert" content=" autofocus, disabled, formAction, formEnctype, formMethod, formNoValidate, formTarget, name, type, value of HTMLButtonElement interface must have CEReactions">
 <meta name="help" content="https://html.spec.whatwg.org/#htmlbuttonelement">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
@@ -12,69 +10,98 @@
 <body>
 <script>
 
-function getParentElement(parentElementName) {
-  let parentElement = document.createElement(parentElementName);
-  document.body.appendChild(parentElement);
-  return parentElement;
+testReflectAttributeWithContentValues('autofocus', 'autofocus', true, 'true', false, 'false', 'autofocus on HTMLButtonElement', 'button', HTMLButtonElement);
+testReflectAttributeWithContentValues('disabled', 'disabled', true, 'true', false, 'false', 'disabled on HTMLButtonElement', 'button', HTMLButtonElement);
+testReflectAttribute('name', 'name', 'intel', 'intel1', 'name on HTMLButtonElement', 'button', HTMLButtonElement);
+testReflectAttribute('value', 'value', 'HTML', 'CSS', 'value on HTMLButtonElement', 'button', HTMLButtonElement);
+testReflectAttrWithParentNode('type', 'type', 'submit', 'submit', 'reset', 'reset', 'type on HTMLButtonElement', 'button', 'form', HTMLButtonElement);
+testReflectAttrWithDepAttr('formAction', 'formaction', 'type', 'intel.asp', 'intel1.asp', 'submit', 'formAction on HTMLButtonElement', 'button', 'form', HTMLButtonElement);
+testReflectAttrWithDepAttr('formEnctype', 'formenctype', 'type', 'text/plain', 'multipart/form-data', 'submit', 'formEnctype on HTMLButtonElement', 'button', 'form', HTMLButtonElement);
+testReflectAttrWithDepAttr('formMethod', 'formmethod', 'type', 'get', 'post', 'submit', 'formMethod on HTMLButtonElement', 'button', 'form', HTMLButtonElement);
+testReflectAttrWithContentValuesAndDepAttr('formNoValidate', 'formnovalidate', 'type', true, 'true', false, 'false', 'submit', 'formNoValidate on HTMLButtonElement', 'button', 'form', HTMLButtonElement);
+testReflectAttrWithDepAttr('formTarget', 'formtarget', 'type', '_blank', '_self', 'submit', 'formTarget on HTMLButtonElement', 'button', 'form', HTMLButtonElement);
+
+//In parent node, sub node's observeAttribute can enqueue by changing attribute value 
+//Test reflect attribute with content values and parent node
+function testReflectAttrWithParentNode(jsAtName, coAtName, jsAtValue1, coAtValue1, jsAtValue2, coAtValue2, name, elementName, pElementName, interfaceName) {
+    var parentElement = document.createElement(pElementName);
+    document.body.appendChild(parentElement);
+
+    test(() => {
+        var element = define_build_in_custom_element([coAtName], interfaceName, elementName);
+        var instance = document.createElement(elementName, { is: element.name });
+
+        assert_array_equals(element.takeLog().types(), ['constructed']);
+        parentElement.appendChild(instance);
+        assert_array_equals(element.takeLog().types(), ['connected']);
+        instance[jsAtName] = jsAtValue1;
+        var logEntries = element.takeLog();
+        assert_array_equals(logEntries.types(), ['attributeChanged']);
+        assert_attribute_log_entry(logEntries.last(), { name: coAtName, oldValue: null, newValue: coAtValue1, namespace: null });
+
+    }, name + ' must enqueue an attributeChanged reaction when adding a new attribute');
+
+    test(() => {
+        var element = define_build_in_custom_element([coAtName], interfaceName, elementName);
+        var instance = document.createElement(elementName, { is: element.name });
+        parentElement.appendChild(instance);
+
+        assert_array_equals(element.takeLog().types(), ['constructed', 'connected']);
+        instance[jsAtName] = jsAtValue1;
+        assert_array_equals(element.takeLog().types(), ['attributeChanged']);
+        instance[jsAtName] = jsAtValue2;
+        var logEntries = element.takeLog();
+        assert_array_equals(logEntries.types(), ['attributeChanged']);
+        assert_attribute_log_entry(logEntries.last(), { name: coAtName, oldValue: coAtValue1, newValue: coAtValue2, namespace: null });
+
+    }, name + ' must enqueue an attributeChanged reaction when replacing an existing attribute');
+
+    parentElement.parentNode.removeChild(parentElement);
 }
 
-function setAttributes(instance) {
-  instance.setAttribute('type', 'submit');
+//In parent node, sub node's observeAttribute which depends another attribute can enqueue by changing attribute value
+//Test reflect attribute with content values and dependent attribute 
+function testReflectAttrWithContentValuesAndDepAttr(jsAtName, coAtName, deAtName, jsAtValue1, coAtValue1, jsAtValue2, coAtValue2, deAtValue, name, elementName, pElementName, interfaceName) {
+    var parentElement = document.createElement(pElementName);
+    document.body.appendChild(parentElement);
+
+    test(() => {
+        var element = define_build_in_custom_element([coAtName], interfaceName, elementName);
+        var instance = document.createElement(elementName, { is: element.name });
+
+        assert_array_equals(element.takeLog().types(), ['constructed']);
+        parentElement.appendChild(instance);
+        assert_array_equals(element.takeLog().types(), ['connected']);
+        instance.setAttribute(deAtName, deAtValue);
+        instance[jsAtName] = jsAtValue1;
+        var logEntries = element.takeLog();
+        assert_array_equals(logEntries.types(), ['attributeChanged']);
+        assert_attribute_log_entry(logEntries.last(), { name: coAtName, oldValue: null, newValue: coAtValue1, namespace: null });
+
+    }, name + ' must enqueue an attributeChanged reaction when adding a new attribute');
+
+    test(() => {
+        var element = define_build_in_custom_element([coAtName], interfaceName, elementName);
+        var instance = document.createElement(elementName, { is: element.name });
+        parentElement.appendChild(instance);
+        instance.setAttribute(deAtName, deAtValue);
+        instance[jsAtName] = jsAtValue1;
+
+        assert_array_equals(element.takeLog().types(), ['constructed', 'connected', 'attributeChanged']);
+        instance[jsAtName] = jsAtValue2;
+        var logEntries = element.takeLog();
+        assert_array_equals(logEntries.types(), ['attributeChanged']);
+        assert_attribute_log_entry(logEntries.last(), { name: coAtName, oldValue: coAtValue1, newValue: coAtValue2, namespace: null });
+
+    }, name + ' must enqueue an attributeChanged reaction when replacing an existing attribute');
+
+    parentElement.parentNode.removeChild(parentElement);
 }
 
-testReflectBooleanAttribute(
-  'autofocus', 'autofocus', 'autofocus on HTMLButtonElement',
-  'button', HTMLButtonElement
-);
-testReflectBooleanAttribute(
-  'disabled', 'disabled','disabled on HTMLButtonElement',
-  'button', HTMLButtonElement
-);
-testReflectAttribute(
-  'name', 'name', 'intel',
-  'intel1', 'name on HTMLButtonElement', 'button',
-  HTMLButtonElement
-);
-testReflectAttribute(
-  'value', 'value', 'HTML',
-  'CSS', 'value on HTMLButtonElement', 'button',
-  HTMLButtonElement
-);
-testReflectAttributeWithParentNode(
-  'type', 'type', 'submit',
-  'reset',  'type on HTMLButtonElement', 'button',
-  () => getParentElement('form'), HTMLButtonElement
-);
-testReflectAttributeWithDependentAttributes(
-  'formAction', 'formaction', 'intel.asp',
-  'intel1.asp', 'formAction on HTMLButtonElement', 'button',
-  () => getParentElement('form'), instance => setAttributes(instance),
-  HTMLButtonElement
-);
-testReflectAttributeWithDependentAttributes(
-  'formEnctype', 'formenctype', 'text/plain', 'multipart/form-data',
-  'formEnctype on HTMLButtonElement', 'button', () => getParentElement('form'),
-  instance => setAttributes(instance),
-  HTMLButtonElement
-);
-testReflectAttributeWithDependentAttributes(
-  'formMethod', 'formmethod', 'get',
-  'post', 'formMethod on HTMLButtonElement', 'button',
-  () => getParentElement('form'), instance => setAttributes(instance),
-  HTMLButtonElement
-);
-testReflectBooleanAttributeWithDependentAttributes(
-  'formNoValidate', 'formnovalidate', 'formNoValidate on HTMLButtonElement',
-  'button', () => getParentElement('form'),
-  instance => setAttributes(instance),
-  HTMLButtonElement
-);
-testReflectAttributeWithDependentAttributes(
-  'formTarget', 'formtarget', '_blank',
-  '_self', 'formTarget on HTMLButtonElement', 'button',
-  () => getParentElement('form'), instance => setAttributes(instance),
-  HTMLButtonElement
-);
+//Package reflect attribute with dependent attribute
+function testReflectAttrWithDepAttr(jsAtName, coAtName, deAtName, jsAtValue1, jsAtValue2, deAtValue, name, elementName, pElementName, interfaceName) {
+    testReflectAttrWithContentValuesAndDepAttr(jsAtName, coAtName, deAtName, jsAtValue1, jsAtValue1, jsAtValue2, jsAtValue2, deAtValue, name, elementName, pElementName, interfaceName);
+}
 
 </script>
 </body>
diff --git a/testing/web-platform/tests/custom-elements/reactions/HTMLEmbedElement.html b/testing/web-platform/tests/custom-elements/reactions/HTMLEmbedElement.html
deleted file mode 100644
index 505d9e3215b1..000000000000
--- a/testing/web-platform/tests/custom-elements/reactions/HTMLEmbedElement.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html>
-<title>Custom Elements: CEReactions on HTMLEmbedElement interface</title>
-<link rel="author" title="Intel" href="http://www.intel.com">
-<meta name="assert" content="src, type, width, height of
-  HTMLEmbedElement interface must have CEReactions">
-<meta name="help" content="https://html.spec.whatwg.org/#the-embed-element">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../resources/custom-elements-helpers.js"></script>
-<script src="./resources/reactions.js"></script>
-
-<script>
-
-testReflectAttribute(
-  'src', 'src', '/media/movie_5.mp4',
-  '/media/sound_5.mp3', 'src on HTMLEmbedElement', 'embed',
-  HTMLEmbedElement
-);
-testReflectAttribute(
-  'type', 'type', 'video/webm',
-  'video/mp4', 'type on HTMLEmbedElement', 'embed',
-  HTMLEmbedElement
-);
-testReflectAttribute(
-  'width', 'width', '100',
-  '120', 'width on HTMLEmbedElement', 'embed',
-  HTMLEmbedElement
-);
-testReflectAttribute(
-  'height', 'height', '100',
-  '120', 'height on HTMLEmbedElement', 'embed',
-  HTMLEmbedElement
-);
-
-</script>
diff --git a/testing/web-platform/tests/custom-elements/reactions/HTMLFieldSetElement.html b/testing/web-platform/tests/custom-elements/reactions/HTMLFieldSetElement.html
deleted file mode 100644
index 4aea2780ba5d..000000000000
--- a/testing/web-platform/tests/custom-elements/reactions/HTMLFieldSetElement.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html>
-<title>Custom Elements: CEReactions on HTMLFieldSetElement interface</title>
-<link rel="author" title="Intel" href="http://www.intel.com">
-<meta name="assert" content="disabled, name of
-  HTMLFieldSetElement interface must have CEReactions">
-<meta name="help" content="https://html.spec.whatwg.org/#the-fieldset-element">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../resources/custom-elements-helpers.js"></script>
-<script src="./resources/reactions.js"></script>
-
-<body>
-<script>
-
-function getParentElement() {
-  let form = document.createElement("form");
-  document.body.appendChild(form);
-  return form;
-}
-
-testReflectBooleanAttributeWithParentNode(
-  'disabled', 'disabled', 'disabled on HTMLFieldSetElement',
-  'fieldset', getParentElement, HTMLFieldSetElement
-);
-testReflectAttributeWithParentNode(
-  'name', 'name', 'fieldset1',
-  'fieldset2', 'name on HTMLFieldSetElement', 'fieldset',
-  getParentElement, HTMLFieldSetElement
-);
-
-</script>
-</body>
diff --git a/testing/web-platform/tests/custom-elements/reactions/HTMLImageElement.html b/testing/web-platform/tests/custom-elements/reactions/HTMLImageElement.html
deleted file mode 100644
index b483c3664051..000000000000
--- a/testing/web-platform/tests/custom-elements/reactions/HTMLImageElement.html
+++ /dev/null
@@ -1,89 +0,0 @@
-<!DOCTYPE html>
-<title>Custom Elements: CEReactions on HTMLImageElement interface</title>
-<link rel="author" title="Intel" href="http://www.intel.com">
-<meta name="assert" content="alt, src, srcset, sizes, crossOrigin, useMap,
-  isMap, width, height, referrerPolicy, decoding of
-  HTMLImageElement interface must have CEReactions">
-<meta name="help" content="https://html.spec.whatwg.org/#the-img-element">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../resources/custom-elements-helpers.js"></script>
-<script src="./resources/reactions.js"></script>
-
-<map name="yellow"></map>
-<map name="green"></map>
-<a href="/" id="a">
-</a>
-<body>
-<script>
-
-function getParentElement() {
-  return document.body;
-}
-
-function setAttributes(instance) {
-  instance.setAttribute('src', '/images/green-1x1.png');
-}
-
-testReflectAttributeWithDependentAttributes(
-  'alt', 'alt', 'image1',
-  'image2', 'alt on HTMLImageElement', 'img',
-  getParentElement, instance => setAttributes(instance), HTMLImageElement
-);
-testReflectAttributeWithParentNode(
-  'src', 'src', '/images/green-1x1.png',
-  '/images/green-2x2.png', 'src on HTMLImageElement', 'img',
-  getParentElement, HTMLImageElement
-);
-testReflectAttributeWithDependentAttributes(
-  'srcset', 'srcset', '/images/green.png',
-  '/images/green-2x2.png', 'srcset on HTMLImageElement', 'img',
-  getParentElement, instance => setAttributes(instance), HTMLImageElement
-);
-testReflectAttributeWithDependentAttributes(
-  'sizes', 'sizes', '(max-width: 32px) 28px',
-  '(max-width: 48px) 44px', 'sizes on HTMLImageElement', 'img',
-  getParentElement, instance => {
-    instance.setAttribute('src', '/images/green-1x1.png');
-    instance.setAttribute('srcset', '/images/green-2x2.png 1x');
-  }, HTMLImageElement
-);
-testReflectAttributeWithDependentAttributes(
-  'crossOrigin', 'crossorigin', 'use-credentials',
-  'anonymous', 'crossOrigin on HTMLImageElement', 'img',
-  getParentElement, instance => setAttributes(instance), HTMLImageElement
-);
-testReflectAttributeWithDependentAttributes(
-  'useMap', 'usemap', '#yellow',
-  '#green', 'useMap on HTMLImageElement', 'img',
-  getParentElement, instance => setAttributes(instance), HTMLImageElement
-);
-testReflectBooleanAttributeWithDependentAttributes(
-  'isMap', 'ismap', 'isMap on HTMLImageElement',
-  'img', () => { return document.getElementById('a') },
-  instance => setAttributes(instance),
-  HTMLImageElement
-);
-testReflectAttributeWithDependentAttributes(
-  'width', 'width', '1',
-  '2', 'width on HTMLImageElement', 'img',
-  getParentElement, instance => setAttributes(instance), HTMLImageElement
-);
-testReflectAttributeWithDependentAttributes(
-  'height', 'height', '1',
-  '2', 'height on HTMLImageElement', 'img',
-  getParentElement, instance => setAttributes(instance), HTMLImageElement
-);
-testReflectAttributeWithDependentAttributes(
-  'referrerPolicy', 'referrerpolicy', 'same-origin',
-  'origin', 'referrerPolicy on HTMLImageElement', 'img',
-  getParentElement, instance => setAttributes(instance), HTMLImageElement
-);
-testReflectAttributeWithDependentAttributes(
-  'decoding', 'decoding', 'async',
-  'sync', 'decoding on HTMLImageElement', 'img',
-  getParentElement, instance => setAttributes(instance), HTMLImageElement
-);
-
-</script>
-</body>
diff --git a/testing/web-platform/tests/custom-elements/reactions/resources/reactions.js b/testing/web-platform/tests/custom-elements/reactions/resources/reactions.js
index 87510ceee164..c7b1851c7bf2 100644
--- a/testing/web-platform/tests/custom-elements/reactions/resources/reactions.js
+++ b/testing/web-platform/tests/custom-elements/reactions/resources/reactions.js
@@ -168,87 +168,6 @@ function testReflectBooleanAttribute(jsAttributeName, contentAttributeName, name
     testReflectAttributeWithContentValues(jsAttributeName, contentAttributeName, true, '', false, null, name, elementName, interfaceName);
 }
 
-function testReflectAttributeWithContentValuesAndDependentAttributes(jsAttributeName, contentAttributeName, validValue1, contentValue1, validValue2, contentValue2, name, elementName, getParentElement, setAttributes, interfaceName) {
-    let parentElement = getParentElement();
-
-    test(() => {
-        let element = define_build_in_custom_element([contentAttributeName], interfaceName, elementName);
-        let instance = document.createElement(elementName, { is: element.name });
-
-        assert_array_equals(element.takeLog().types(), ['constructed']);
-        parentElement.appendChild(instance);
-        assert_array_equals(element.takeLog().types(), ['connected']);
-        setAttributes(instance);
-        instance[jsAttributeName] = validValue1;
-        let logEntries = element.takeLog();
-        assert_array_equals(logEntries.types(), ['attributeChanged']);
-        assert_attribute_log_entry(logEntries.last(), { name: contentAttributeName, oldValue: null, newValue: contentValue1, namespace: null });
-
-    }, name + ' must enqueue an attributeChanged reaction when adding a new attribute');
-
-    test(() => {
-        let element = define_build_in_custom_element([contentAttributeName], interfaceName, elementName);
-        let instance = document.createElement(elementName, { is: element.name });
-        parentElement.appendChild(instance);
-        setAttributes(instance);
-        instance[jsAttributeName] = validValue1;
-
-        assert_array_equals(element.takeLog().types(), ['constructed', 'connected', 'attributeChanged']);
-        instance[jsAttributeName] = validValue2;
-        let logEntries = element.takeLog();
-        assert_array_equals(logEntries.types(), ['attributeChanged']);
-        assert_attribute_log_entry(logEntries.last(), { name: contentAttributeName, oldValue: contentValue1, newValue: contentValue2, namespace: null });
-
-    }, name + ' must enqueue an attributeChanged reaction when replacing an existing attribute');
-}
-
-function testReflectAttributeWithDependentAttributes(jsAttributeName, contentAttributeName, validValue1, validValue2, name, elementName, getParentElement, setAttributes, interfaceName) {
-    testReflectAttributeWithContentValuesAndDependentAttributes(jsAttributeName, contentAttributeName, validValue1, validValue1, validValue2, validValue2, name, elementName, getParentElement, setAttributes, interfaceName);
-}
-
-function testReflectBooleanAttributeWithDependentAttributes(jsAttributeName, contentAttributeName, name, elementName, getParentElement, setAttributes, interfaceName) {
-    testReflectAttributeWithContentValuesAndDependentAttributes(jsAttributeName, contentAttributeName, true, '', false, null, name, elementName, getParentElement, setAttributes, interfaceName);
-}
-
-function testReflectAttributeWithContentValuesAndParentNode(jsAttributeName, contentAttributeName, validValue1, contentValue1, validValue2, contentValue2, name, elementName, getParentElement, interfaceName) {
-    let parentElement = getParentElement();
-
-    test(() => {
-        let element = define_build_in_custom_element([contentAttributeName], interfaceName, elementName);
-        let instance = document.createElement(elementName, { is: element.name });
-
-        assert_array_equals(element.takeLog().types(), ['constructed']);
-        parentElement.appendChild(instance);
-        assert_array_equals(element.takeLog().types(), ['connected']);
-        instance[jsAttributeName] = validValue1;
-        let logEntries = element.takeLog();
-        assert_array_equals(logEntries.types(), ['attributeChanged']);
-        assert_attribute_log_entry(logEntries.last(), { name: contentAttributeName, oldValue: null, newValue: contentValue1, namespace: null });
-}, name + ' must enqueue an attributeChanged reaction when adding a new attribute');
-
-    test(() => {
-        let element = define_build_in_custom_element([contentAttributeName], interfaceName, elementName);
-        let instance = document.createElement(elementName, { is: element.name });
-        parentElement.appendChild(instance);
-
-        assert_array_equals(element.takeLog().types(), ['constructed', 'connected']);
-        instance[jsAttributeName] = validValue1;
-        assert_array_equals(element.takeLog().types(), ['attributeChanged']);
-        instance[jsAttributeName] = validValue2;
-        let logEntries = element.takeLog();
-        assert_array_equals(logEntries.types(), ['attributeChanged']);
-        assert_attribute_log_entry(logEntries.last(), { name: contentAttributeName, oldValue: contentValue1, newValue: contentValue2, namespace: null });
-    }, name + ' must enqueue an attributeChanged reaction when replacing an existing attribute');
-}
-
-function testReflectAttributeWithParentNode(jsAttributeName, contentAttributeName, validValue1, validValue2, name, elementName, getParentElement, interfaceName) {
-    testReflectAttributeWithContentValuesAndParentNode(jsAttributeName, contentAttributeName, validValue1, validValue1, validValue2, validValue2, name, elementName, getParentElement, interfaceName);
-}
-
-function testReflectBooleanAttributeWithParentNode(jsAttributeName, contentAttributeName, name, elementName, getParentElement, interfaceName) {
-    testReflectAttributeWithContentValuesAndParentNode(jsAttributeName, contentAttributeName, true, '', false, null, name, elementName, getParentElement, interfaceName);
-}
-
 function testAttributeAdder(testFunction, name) {
     test(function () {
         var element = define_new_custom_element(['id']);
diff --git a/testing/web-platform/tests/docs/_reviewing-tests/checklist.md b/testing/web-platform/tests/docs/_reviewing-tests/checklist.md
index 876b468e5bc9..23b264241807 100644
--- a/testing/web-platform/tests/docs/_reviewing-tests/checklist.md
+++ b/testing/web-platform/tests/docs/_reviewing-tests/checklist.md
@@ -110,7 +110,7 @@ the same way as the test.
 
 <label>
 <input type="checkbox">
-The test and reference render within a 800x600 viewport, only displaying
+The test and reference render within a 600x600 viewport, only displaying
 scrollbars if their presence is being tested.
 </label>
 
@@ -180,7 +180,7 @@ several minutes thinking or asking questions.
 
 <label>
 <input type="checkbox">
-The test renders within a 800x600 viewport, only displaying scrollbars if their
+The test renders within a 600x600 viewport, only displaying scrollbars if their
 presence is being tested.
 </label>
 
diff --git a/testing/web-platform/tests/docs/_running-tests/custom-runner.md b/testing/web-platform/tests/docs/_running-tests/custom-runner.md
deleted file mode 100644
index 6e6c73f79b68..000000000000
--- a/testing/web-platform/tests/docs/_running-tests/custom-runner.md
+++ /dev/null
@@ -1,25 +0,0 @@
----
-layout: page
-title: Writing Your Own Runner
----
-
-Most test runners have two stages: finding all tests, followed by
-executing them (or a subset thereof).
-
-To find all tests in the repository, it is **strongly** recommended to
-use the included `wpt manifest` tool: the required behaviors are more
-complex than what are documented (especially when it comes to
-precedence of the various possibilities and some undocumented legacy
-ways to define test types), and hence its behavior should be
-considered the canonical definition of how to enumerate tests and find
-their type in the repository.
-
-For test execution, please read the documentation for the various test types
-very carefully and then check your understanding on
-the [mailing list][public-test-infra] or [IRC][] ([webclient][web irc], join
-channel `#testing`). It's possible edge-case behavior isn't properly
-documented!
-
-[public-test-infra]: https://lists.w3.org/Archives/Public/public-test-infra/
-[IRC]: irc://irc.w3.org:6667/testing
-[web irc]: http://irc.w3.org
diff --git a/testing/web-platform/tests/docs/_running-tests/from-local-system.md b/testing/web-platform/tests/docs/_running-tests/from-local-system.md
deleted file mode 100644
index 1ee09ca59e76..000000000000
--- a/testing/web-platform/tests/docs/_running-tests/from-local-system.md
+++ /dev/null
@@ -1,114 +0,0 @@
----
-layout: page
-title: Running Tests from the Local System
----
-
-The tests are designed to be run from your local computer.
-
-## System Setup
-
-The test environment requires [Python 2.7+](http://www.python.org/downloads)
-(but not Python 3.x).
-
-On Windows, be sure to add the Python directory (`c:\python2x`, by default) to
-your `%Path%` [Environment Variable](http://www.computerhope.com/issues/ch000549.htm),
-and read the [Windows Notes](#windows-notes) section below.
-
-To get the tests running, you need to set up the test domains in your
-[`hosts` file](http://en.wikipedia.org/wiki/Hosts_%28file%29%23Location_in_the_file_system).
-
-The necessary content can be generated with `./wpt make-hosts-file`; on
-Windows, you will need to preceed the prior command with `python` or
-the path to the Python binary (`python wpt make-hosts-file`).
-
-For example, on most UNIX-like systems, you can setup the hosts file with:
-
-```bash
-./wpt make-hosts-file | sudo tee -a /etc/hosts
-```
-
-And on Windows (this must be run in a PowerShell session with Administrator privileges):
-
-```bash
-python wpt make-hosts-file | Out-File %SystemRoot%\System32\drivers\etc\hosts -Encoding ascii -Append
-```
-
-If you are behind a proxy, you also need to make sure the domains above are
-excluded from your proxy lookups.
-
-### Windows Notes
-
-Generally Windows Subsystem for Linux will provide the smoothest user
-experience for running web-platform-tests on Windows.
-
-The standard Windows shell requires that all `wpt` commands are prefixed
-by the Python binary i.e. assuming `python` is on your path the server is
-started using:
-
-`python wpt serve`
-
-## Via the browser
-
-The test environment can then be started using
-
-    ./wpt serve
-
-This will start HTTP servers on two ports and a websockets server on
-one port. By default the web servers start on ports 8000 and 8443 and the other
-ports are randomly-chosen free ports. Tests must be loaded from the
-*first* HTTP server in the output. To change the ports,
-create a `config.json` file in the wpt root directory, and add
-port definitions of your choice e.g.:
-
-```
-{
-  "ports": {
-    "http": [1234, "auto"],
-    "https":[5678]
-  }
-}
-```
-
-After your `hosts` file is configured, the servers will be locally accessible at:
-
-http://web-platform.test:8000/<br>
-https://web-platform.test:8443/ *
-
-This server has all the capabilities of the publicly-deployed version--see
-[Running the Tests from the Web][from-web].
-
-\**See [Trusting Root CA](https://github.com/web-platform-tests/wpt/blob/master/README.md#trusting-root-ca)*
-
-## Via the command line
-
-Many tests can be automatically executed in a new browser instance using
-
-    ./wpt run [browsername] [tests]
-
-This will automatically load the tests in the chosen browser and extract the
-test results. For example to run the `dom/historical.html` tests in a local
-copy of Chrome:
-
-    ./wpt run chrome dom/historical.html
-
-Or to run in a specified copy of Firefox:
-
-    ./wpt run --binary ~/local/firefox/firefox firefox dom/historical.html
-
-For details on the supported products and a large number of other options for
-customising the test run:
-
-    ./wpt run --help
-
-Additional browser-specific documentation:
-
-  * [Chrome][chrome]
-
-  * [Chrome for Android][chrome android]
-
-  * [Safari][safari]
-
-[from-web]: {{ site.baseurl }}{% link _running-tests/from-web.md %}
-[chrome]: {{ site.baseurl }}{% link _running-tests/chrome.md %}
-[chrome android]: {{ site.baseurl }}{% link _running-tests/chrome_android.md %}
-[safari]: {{ site.baseurl }}{% link _running-tests/safari.md %}
diff --git a/testing/web-platform/tests/docs/_running-tests/from-web.md b/testing/web-platform/tests/docs/_running-tests/from-web.md
deleted file mode 100644
index 686f4e3b66b0..000000000000
--- a/testing/web-platform/tests/docs/_running-tests/from-web.md
+++ /dev/null
@@ -1,26 +0,0 @@
----
-layout: page
-title: Running Tests from the Web
----
-
-Tests that have been merged on GitHub are mirrored at [http://w3c-test.org/][w3c-test].
-[On properly-configured systems](from-local-system), local files may also be
-served from the URL [http://web-platform.test](http://web-platform.test).
-
-For running multiple tests inside a browser, there is a test runner
-located at `/tools/runner/index.html`.
-
-This allows all the tests, or those matching a specific prefix
-(e.g. all tests under `/dom/`) to be run. For testharness.js tests,
-the results will be automatically collected, while the runner
-provides a simple UI for manually comparing reftest rendering and
-running manual tests.
-
-Note, however, it does not currently handle more complex reftests with
-more than one reference involved.
-
-Because it runs entirely in-browser, this runner cannot deal with
-edge-cases like tests that cause the browser to crash or hang.
-
-[w3c-test]: http://w3c-test.org
-[from-local-system]: {{ site.baseurl }}{% link _running-tests/from-local-system.md %}
diff --git a/testing/web-platform/tests/docs/_running-tests/index.md b/testing/web-platform/tests/docs/_running-tests/index.md
index f34c06d6fbaa..48d7f8dad77d 100644
--- a/testing/web-platform/tests/docs/_running-tests/index.md
+++ b/testing/web-platform/tests/docs/_running-tests/index.md
@@ -2,17 +2,79 @@
 layout: page
 title: Running Tests
 ---
+In simple cases individual tests can be run by simply loading the page
+in a browser window. For running larger groups of tests, or running
+tests frequently, this is not a practical approach and several better
+options exist.
 
-The simplest way to run the tests is via the public website. More detail on
-that approach is available in [Running tests from the Web][from-web].
+## From the Command Line
 
-Contributors who are interested in modifying and creating tests should refer to
-[Running Tests from the Local System][from-local-system].
+The simplest way to run tests is to use the `wpt run` command from the
+root of the repository. This will automatically load the tests in the
+chosen browser, and extract the test results. For example to run the
+`dom/historical.html` tests in a local copy of Chrome:
 
-Advanced use cases may call for a customized method of executing the tests.
-Guidelines for writing a custom "runner" are available at [Writing Your Own
-Runner][custom-runner].
+    ./wpt run chrome dom/historical.html
 
-[custom-runner]: {{ site.baseurl }}{% link _running-tests/custom-runner.md %}
-[from-web]: {{ site.baseurl }}{% link _running-tests/from-web.md %}
-[from-local-system]: {{ site.baseurl }}{% link _running-tests/from-local-system.md %}
+Or to run in a specified copy of Firefox:
+
+    ./wpt run --binary ~/local/firefox/firefox firefox dom/historical.html
+
+For details on the supported products and a large number of other options for
+customising the test run:
+
+    ./wpt run --help
+
+Additional browser-specific documentation:
+
+  * [Chrome][chrome]
+
+  * [Chrome for Android][chrome android]
+
+  * [Safari][safari]
+
+## From Inside a Browser
+Tests that have been merged on GitHub are mirrored at [http://w3c-test.org/][w3c-test].
+
+For running multiple tests inside a browser, there is a test runner
+located at `/tools/runner/index.html`.
+
+This allows all the tests, or those matching a specific prefix
+(e.g. all tests under `/dom/`) to be run. For testharness.js tests,
+the results will be automatically collected, while the runner
+provides a simple UI for manually comparing reftest rendering and
+running manual tests.
+
+Note, however, it does not currently handle more complex reftests with
+more than one reference involved.
+
+Because it runs entirely in-browser, this runner cannot deal with
+edge-cases like tests that cause the browser to crash or hang.
+
+## Writing Your Own Runner
+
+Most test runners have two stages: finding all tests, followed by
+executing them (or a subset thereof).
+
+To find all tests in the repository, it is **strongly** recommended to
+use the included `wpt manifest` tool: the required behaviors are more
+complex than what are documented (especially when it comes to
+precedence of the various possibilities and some undocumented legacy
+ways to define test types), and hence its behavior should be
+considered the canonical definition of how to enumerate tests and find
+their type in the repository.
+
+For test execution, please read the documentation for the various test types
+very carefully and then check your understanding on
+the [mailing list][public-test-infra] or [IRC][] ([webclient][web irc], join
+channel `#testing`). It's possible edge-case behavior isn't properly
+documented!
+
+
+[chrome]: {{ site.baseurl }}{% link _running-tests/chrome.md %}
+[chrome android]: {{ site.baseurl }}{% link _running-tests/chrome_android.md %}
+[safari]: {{ site.baseurl }}{% link _running-tests/safari.md %}
+[public-test-infra]: https://lists.w3.org/Archives/Public/public-test-infra/
+[IRC]: irc://irc.w3.org:6667/testing
+[web irc]: http://irc.w3.org
+[w3c-test]: http://w3c-test.org
diff --git a/testing/web-platform/tests/docs/_writing-tests/assumptions.md b/testing/web-platform/tests/docs/_writing-tests/assumptions.md
index d1ab75b0f1d3..28a990a3f719 100644
--- a/testing/web-platform/tests/docs/_writing-tests/assumptions.md
+++ b/testing/web-platform/tests/docs/_writing-tests/assumptions.md
@@ -8,7 +8,7 @@ The tests make a number of assumptions of the user agent, and new
 tests can freely rely on these assumptions being true:
 
  * The device is a full-color device.
- * The device has a viewport width of at least 800px.
+ * The device has a viewport width of at least 600px.
  * The UA imposes no minimum font size.
  * The `medium` `font-size` computes to 16px.
  * The canvas background is `white`.
diff --git a/testing/web-platform/tests/docs/_writing-tests/general-guidelines.md b/testing/web-platform/tests/docs/_writing-tests/general-guidelines.md
index a07d55b9e1ba..ff099ddf0a53 100644
--- a/testing/web-platform/tests/docs/_writing-tests/general-guidelines.md
+++ b/testing/web-platform/tests/docs/_writing-tests/general-guidelines.md
@@ -90,7 +90,7 @@ headers.
 ### Be Short
 
 Tests should be as short as possible. For reftests in particular
-scrollbars at 800&#xD7;600px window size must be avoided unless scrolling
+scrollbars at 600&#xD7;600px window size must be avoided unless scrolling
 behavior is specifically being tested. For all tests extraneous
 elements on the page should be avoided so it is clear what is part of
 the test (for a typical testharness test, the only content on the page
diff --git a/testing/web-platform/tests/docs/_writing-tests/h2tests.md b/testing/web-platform/tests/docs/_writing-tests/h2tests.md
index 3e5a9918c4d2..0d19f7de19ca 100644
--- a/testing/web-platform/tests/docs/_writing-tests/h2tests.md
+++ b/testing/web-platform/tests/docs/_writing-tests/h2tests.md
@@ -1,9 +1,4 @@
----
-layout: page
-title: Writing H2 Tests
-order: 2
----
-
+# Writing H2 Tests
 > <b>Important:</b> The HTTP/2.0 server requires you to have Python 2.7.10+
 and OpenSSL 1.0.2+. This is because HTTP/2.0 is negotiated using the
 [TLS ALPN](https://tools.ietf.org/html/rfc7301) extension, which is only supported in [OpenSSL 1.0.2](https://www.openssl.org/news/openssl-1.0.2-notes.html) and up.
diff --git a/testing/web-platform/tests/docs/_writing-tests/reftests.md b/testing/web-platform/tests/docs/_writing-tests/reftests.md
index f56a84af3a79..f90d66dbd914 100644
--- a/testing/web-platform/tests/docs/_writing-tests/reftests.md
+++ b/testing/web-platform/tests/docs/_writing-tests/reftests.md
@@ -27,7 +27,7 @@ tested. It also contains a `link` element with `rel="match"` or
 `rel="mismatch"` and `href` attribute pointing to the *reference*
 file, e.g. `<link rel=match href=references/green-box-ref.html>`. A
 `match` test only passes if the two files render pixel-for-pixel
-identically within a 800x600 window *including* scroll-bars if
+identically within a 600x600 window *including* scroll-bars if
 present; a `mismatch` test only passes if they *don't* render
 identically.
 
diff --git a/testing/web-platform/tests/docs/_writing-tests/testdriver.md b/testing/web-platform/tests/docs/_writing-tests/testdriver.md
index 2526774a95cf..a53a418fe3e3 100644
--- a/testing/web-platform/tests/docs/_writing-tests/testdriver.md
+++ b/testing/web-platform/tests/docs/_writing-tests/testdriver.md
@@ -5,9 +5,7 @@ order: 8.5
 ---
 
 testdriver.js provides a means to automate tests that cannot be
-written purely using web platform APIs. Outside of automation
-contexts, it allows human operators to provide expected input
-manually (for operations which may be described in simple terms).
+written purely using web platform APIs.
 
 It is currently supported only for [testharness.js][testharness]
 tests.
diff --git a/testing/web-platform/tests/docs/_writing-tests/testharness-api.md b/testing/web-platform/tests/docs/_writing-tests/testharness-api.md
index ab9b398376a9..657d3962c989 100644
--- a/testing/web-platform/tests/docs/_writing-tests/testharness-api.md
+++ b/testing/web-platform/tests/docs/_writing-tests/testharness-api.md
@@ -212,8 +212,6 @@ promise_test(function(t) {
 }, "Another example");
 ```
 
-## `EventWatcher` ##
-
 `EventWatcher` is a constructor function that allows DOM events to be handled
 using Promises, which can make it a lot easier to test a very specific series
 of events, including ensuring that unexpected events are not fired at any point.
diff --git a/testing/web-platform/tests/docs/introduction.md b/testing/web-platform/tests/docs/introduction.md
index 28d8f3ea3659..191e76d39970 100644
--- a/testing/web-platform/tests/docs/introduction.md
+++ b/testing/web-platform/tests/docs/introduction.md
@@ -96,6 +96,92 @@ recursively: `a/META.yml` will get notified for `a/foo.html` and
 If you want to be notified about changes to tests in a directory, feel
 free to add yourself to the META.yml file!
 
+
+## Local Setup
+
+The tests are designed to be run from your local computer. The test
+environment requires [Python 2.7+](http://www.python.org/downloads) (but not Python 3.x).
+
+On Windows, be sure to add the Python directory (`c:\python2x`, by default) to
+your `%Path%` [Environment Variable](http://www.computerhope.com/issues/ch000549.htm),
+and read the [Windows Notes](#windows-notes) section below.
+
+To get the tests running, you need to set up the test domains in your
+[`hosts` file](http://en.wikipedia.org/wiki/Hosts_%28file%29%23Location_in_the_file_system).
+
+The necessary content can be generated with `./wpt make-hosts-file`; on
+Windows, you will need to preceed the prior command with `python` or
+the path to the Python binary (`python wpt make-hosts-file`).
+
+For example, on most UNIX-like systems, you can setup the hosts file with:
+
+```bash
+./wpt make-hosts-file | sudo tee -a /etc/hosts
+```
+
+And on Windows (this must be run in a PowerShell session with Administrator privileges):
+
+```bash
+python wpt make-hosts-file | Out-File %SystemRoot%\System32\drivers\etc\hosts -Encoding ascii -Append
+```
+
+If you are behind a proxy, you also need to make sure the domains above are
+excluded from your proxy lookups.
+
+The test environment can then be started using
+
+    ./wpt serve
+
+This will start HTTP servers on two ports and a websockets server on
+one port. By default the web servers start on ports 8000 and 8443 and the other
+ports are randomly-chosen free ports. Tests must be loaded from the
+*first* HTTP server in the output. To change the ports,
+create a `config.json` file in the wpt root directory, and add
+port definitions of your choice e.g.:
+
+```
+{
+  "ports": {
+    "http": [1234, "auto"],
+    "https":[5678]
+  }
+}
+```
+
+After your `hosts` file is configured, the servers will be locally accessible at:
+
+http://web-platform.test:8000/<br>
+https://web-platform.test:8443/ *
+
+\**See [Trusting Root CA](https://github.com/web-platform-tests/wpt/blob/master/README.md#trusting-root-ca)*
+
+## Running tests automatically
+
+The `wpt run` command provides a frontend for running tests automatically
+in various browsers. The general syntax is:
+
+```
+wpt run [options] <product> [test paths]
+```
+
+e.g. to run `dom/historical.html` in Firefox, the required command is:
+
+```
+wpt run firefox dom/historical.html
+```
+
+### Windows Notes
+
+Generally Windows Subsystem for Linux will provide the smoothest user
+experience for running web-platform-tests on Windows.
+
+The standard Windows shell requires that all `wpt` commands are prefixed
+by the Python binary i.e. assuming `python` is on your path the server is
+started using:
+
+`python wpt serve`
+
+
 [web-platform]: https://platform.html5.org
 [test262]: https://github.com/tc39/test262
 [webgl]: https://github.com/KhronosGroup/WebGL
diff --git a/testing/web-platform/tests/domparsing/DOMParser-parseFromString-html.html b/testing/web-platform/tests/domparsing/DOMParser-parseFromString-html.html
index ad65cc586184..ec424423a1d2 100644
--- a/testing/web-platform/tests/domparsing/DOMParser-parseFromString-html.html
+++ b/testing/web-platform/tests/domparsing/DOMParser-parseFromString-html.html
@@ -66,11 +66,6 @@ test(function() {
     assert_equals(htmldoc.documentElement.namespaceURI, "http://www.w3.org/1999/xhtml");
 }, "DOMParser parses HTML tag soup with no problems");
 
-test(function() {
-   const doc = new DOMParser().parseFromString('<noembed>&lt;a&gt;</noembed>', 'text/html');
-   assert_equals(doc.querySelector('noembed').textContent, '&lt;a&gt;');
-}, 'DOMParser should handle the content of <noembed> as raw text');
-
 test(function() {
     assert_throws(new TypeError(), function() {
         new DOMParser().parseFromString("", "text/foo-this-is-invalid");
diff --git a/testing/web-platform/tests/domparsing/XMLSerializer-serializeToString.html b/testing/web-platform/tests/domparsing/XMLSerializer-serializeToString.html
index 81df61f5bc42..ab373481204e 100644
--- a/testing/web-platform/tests/domparsing/XMLSerializer-serializeToString.html
+++ b/testing/web-platform/tests/domparsing/XMLSerializer-serializeToString.html
@@ -9,194 +9,88 @@
  <body>
     <h1>domparsing_XMLSerializer_serializeToString</h1>
   <script>
-const XMLNS_URI = 'http://www.w3.org/2000/xmlns/';
-
 function createXmlDoc(){
   var input = '<?xml version="1.0" encoding="UTF-8"?><root><child1>value1</child1></root>';
   var parser = new DOMParser();
   return parser.parseFromString(input, 'text/xml');
 }
 
-// Returns the root element.
-function parse(xmlString) {
-  return (new DOMParser()).parseFromString(xmlString, 'text/xml').documentElement;
-}
-
-function serialize(node) {
-  return (new XMLSerializer()).serializeToString(node);
-}
-
 test(function() {
+  var serializer = new XMLSerializer();
   var root = createXmlDoc().documentElement;
-  assert_equals(serialize(root), '<root><child1>value1</child1></root>');
+  var xmlString = serializer.serializeToString(root);
+  assert_equals(xmlString, '<root><child1>value1</child1></root>');
 }, 'check XMLSerializer.serializeToString method could parsing xmldoc to string');
 
 test(function() {
+  var serializer = new XMLSerializer();
   var root = createXmlDoc().documentElement;
   var element = root.ownerDocument.createElementNS('urn:foo', 'another');
   var child1 = root.firstChild;
   root.replaceChild(element, child1);
   element.appendChild(child1);
-  assert_equals(serialize(root), '<root><another xmlns="urn:foo"><child1 xmlns="">value1</child1></another></root>');
+  var xmlString = serializer.serializeToString(root);
+  assert_equals(xmlString, '<root><another xmlns="urn:foo"><child1 xmlns="">value1</child1></another></root>');
 }, 'Check if the default namespace is correctly reset.');
 
 test(function() {
-  var root = parse('<root xmlns="urn:bar"><outer xmlns=""><inner>value1</inner></outer></root>');
-  assert_equals(serialize(root), '<root xmlns="urn:bar"><outer xmlns=""><inner>value1</inner></outer></root>');
+  var input = '<root xmlns="urn:bar"><outer xmlns=""><inner>value1</inner></outer></root>';
+  var root = (new DOMParser()).parseFromString(input, 'text/xml').documentElement;
+  var xmlString = (new XMLSerializer()).serializeToString(root);
+  assert_equals(xmlString, '<root xmlns="urn:bar"><outer xmlns=""><inner>value1</inner></outer></root>');
 }, 'Check if there is no redundant empty namespace declaration.');
 
 test(function() {
-  const root = parse('<root xmlns="uri1"/>');
-  const child = root.ownerDocument.createElement('child');
-  child.setAttributeNS(XMLNS_URI, 'xmlns', 'FAIL1');
-  root.appendChild(child);
-  const child2 = root.ownerDocument.createElementNS('uri2', 'child2');
-  child2.setAttributeNS(XMLNS_URI, 'xmlns', 'FAIL2');
-  root.appendChild(child2);
-  const child3 = root.ownerDocument.createElementNS('uri1', 'child3');
-  child3.setAttributeNS(XMLNS_URI, 'xmlns', 'FAIL3');
-  root.appendChild(child3);
-  const child4 = root.ownerDocument.createElementNS('uri4', 'child4');
-  child4.setAttributeNS(XMLNS_URI, 'xmlns', 'uri4');
-  root.appendChild(child4);
-  const child5 = root.ownerDocument.createElement('child5');
-  child5.setAttributeNS(XMLNS_URI, 'xmlns', '');
-  root.appendChild(child5);
-  assert_equals(serialize(root), '<root xmlns="uri1"><child xmlns=""/><child2 xmlns="uri2"/><child3/><child4 xmlns="uri4"/><child5 xmlns=""/></root>');
-}, 'Check if inconsistent xmlns="..." is dropped.');
-
-test(function() {
-  let root = parse('<r xmlns:xx="uri"></r>');
-  root.setAttributeNS('uri', 'name', 'v');
-  assert_equals(serialize(root), '<r xmlns:xx="uri" xx:name="v"/>');
-
-  let root2 = parse('<r xmlns:xx="uri"><b/></r>');
-  let child = root2.firstChild;
-  child.setAttributeNS('uri', 'name', 'v');
-  assert_equals(serialize(root2), '<r xmlns:xx="uri"><b xx:name="v"/></r>');
-
-  let root3 = parse('<r xmlns:x0="uri" xmlns:x2="uri"><b xmlns:x1="uri"/></r>');
-  let child3 = root3.firstChild;
-  child3.setAttributeNS('uri', 'name', 'v');
-  assert_equals(serialize(root3),
-                '<r xmlns:x0="uri" xmlns:x2="uri"><b xmlns:x1="uri" x1:name="v"/></r>',
-                'Should choose the nearest prefix');
-}, 'Check if an attribute with namespace and no prefix is serialized with the nearest-declared prefix');
-
-test(function() {
-  let root = parse('<el1 xmlns:p="u1" xmlns:q="u1"><el2 xmlns:q="u2"/></el1>');
-  root.firstChild.setAttributeNS('u1', 'name', 'v');
-  assert_equals(serialize(root),
-                '<el1 xmlns:p="u1" xmlns:q="u1"><el2 xmlns:q="u2" q:name="v"/></el1>');
-  // Maybe this is a specification error.
-}, 'Check if an attribute with namespace and no prefix is serialized with the nearest-declared prefix even if the prefix is assigned to another namespace.');
-
-test(function() {
-  let root = parse('<r xmlns:xx="uri"></r>');
-  root.setAttributeNS('uri', 'p:name', 'v');
-  assert_equals(serialize(root), '<r xmlns:xx="uri" xx:name="v"/>');
-
-  let root2 = parse('<r xmlns:xx="uri"><b/></r>');
-  let child = root2.firstChild;
-  child.setAttributeNS('uri', 'p:name', 'value');
-  assert_equals(serialize(root2),
-                '<r xmlns:xx="uri"><b xx:name="value"/></r>');
-}, 'Check if the prefix of an attribute is replaced with another existing prefix mapped to the same namespace URI.');
-
-test(function() {
-  let root = parse('<r xmlns:xx="uri"></r>');
-  root.setAttributeNS('uri2', 'p:name', 'value');
-  assert_equals(serialize(root),
-                '<r xmlns:xx="uri" xmlns:ns1="uri2" ns1:name="value"/>');
-}, 'Check if the prefix of an attribute is NOT preserved in a case where neither its prefix nor its namespace URI is not already used.');
-
-test(function() {
-  let root = parse('<r xmlns:xx="uri"></r>');
-  root.setAttributeNS('uri2', 'xx:name', 'value');
-  assert_equals(serialize(root),
-                '<r xmlns:xx="uri" xmlns:ns1="uri2" ns1:name="value"/>');
-}, 'Check if the prefix of an attribute is replaced with a generated one in a case where the prefix is already mapped to a different namespace URI.');
-
-test(function() {
-  var root = parse('<root />');
+  var serializer = new XMLSerializer();
+  var parser = new DOMParser();
+  var root = parser.parseFromString('<root />', 'text/xml').documentElement;
   root.setAttribute('attr', '\t');
-  assert_in_array(serialize(root), [
+  assert_in_array(serializer.serializeToString(root), [
     '<root attr="&#9;"/>', '<root attr="&#x9;"/>']);
   root.setAttribute('attr', '\n');
-  assert_in_array(serialize(root), [
+  assert_in_array(serializer.serializeToString(root), [
     '<root attr="&#xA;"/>', '<root attr="&#10;"/>']);
   root.setAttribute('attr', '\r');
-  assert_in_array(serialize(root), [
+  assert_in_array(serializer.serializeToString(root), [
     '<root attr="&#xD;"/>', '<root attr="&#13;"/>']);
 }, 'check XMLSerializer.serializeToString escapes attribute values for roundtripping');
 
 test(function() {
   const root = (new Document()).createElement('root');
   root.setAttributeNS('uri1', 'p:foobar', 'value1');
-  root.setAttributeNS(XMLNS_URI, 'xmlns:p', 'uri2');
-  assert_equals(serialize(root), '<root xmlns:ns1="uri1" ns1:foobar="value1" xmlns:p="uri2"/>');
+  root.setAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns:p', 'uri2');
+  const xmlString = (new XMLSerializer()).serializeToString(root);
+  assert_equals(xmlString, '<root xmlns:ns1="uri1" ns1:foobar="value1" xmlns:p="uri2"/>');
 }, 'Check if attribute serialization takes into account of following xmlns:* attributes');
 
 test(function() {
-  const root = parse('<root xmlns:p="uri1"><child/></root>');
+  const input = '<root xmlns:p="uri1"><child/></root>';
+  const root = (new DOMParser()).parseFromString(input, 'text/xml').documentElement;
   root.firstChild.setAttributeNS('uri2', 'p:foobar', 'v');
-  assert_equals(serialize(root), '<root xmlns:p="uri1"><child xmlns:ns1="uri2" ns1:foobar="v"/></root>');
+  const xmlString = (new XMLSerializer()).serializeToString(root);
+  assert_equals(xmlString, '<root xmlns:p="uri1"><child xmlns:ns1="uri2" ns1:foobar="v"/></root>');
 }, 'Check if attribute serialization takes into account of the same prefix declared in an ancestor element');
 
 test(function() {
-  assert_equals(serialize(parse('<root><child/></root>')), '<root><child/></root>');
-  assert_equals(serialize(parse('<root><child xmlns=""/></root>')), '<root><child/></root>');
-  assert_equals(serialize(parse('<root xmlns="u1"><child xmlns="u1"/></root>')), '<root xmlns="u1"><child/></root>');
-  assert_equals(serialize(parse('<root xmlns="u1"><p:child xmlns:p="u1"/></root>')), '<root xmlns="u1"><child xmlns:p="u1"/></root>');
-}, 'Check if start tag serialization drops element prefix if the namespace is same as inherited default namespace.');
-
-test(function() {
-  const root = parse('<root xmlns:p1="u1"><child xmlns:p2="u1"/></root>');
-  const child2 = root.ownerDocument.createElementNS('u1', 'child2');
-  root.firstChild.appendChild(child2);
-  assert_equals(serialize(root), '<root xmlns:p1="u1"><child xmlns:p2="u1"><p2:child2/></child></root>');
-}, 'Check if start tag serialization finds an appropriate prefix.');
-
-test(function() {
-  const root = (new Document()).createElementNS('uri1', 'p:root');
-  root.setAttributeNS(XMLNS_URI, 'xmlns:p', 'uri2');
-  assert_equals(serialize(root), '<ns1:root xmlns:ns1="uri1" xmlns:p="uri2"/>');
-}, 'Check if start tag serialization takes into account of its xmlns:* attributes');
-
-test(function() {
-  const root = (new Document()).createElement('root');
-  root.setAttributeNS(XMLNS_URI, 'xmlns:p', 'uri2');
-  const child = root.ownerDocument.createElementNS('uri1', 'p:child');
-  root.appendChild(child);
-  assert_equals(serialize(root), '<root xmlns:p="uri2"><p:child xmlns:p="uri1"/></root>');
-}, 'Check if start tag serialization applied the original prefix even if it is declared in an ancestor element.');
-
-test(function() {
-  const root = parse('<root><child1/><child2/></root>');
+  const input = '<root><child1/><child2/></root>';
+  const root = (new DOMParser()).parseFromString(input, 'text/xml').documentElement;
   root.firstChild.setAttributeNS('uri1', 'attr1', 'value1');
   root.firstChild.setAttributeNS('uri2', 'attr2', 'value2');
   root.lastChild.setAttributeNS('uri3', 'attr3', 'value3');
-  assert_equals(serialize(root), '<root><child1 xmlns:ns1="uri1" ns1:attr1="value1" xmlns:ns2="uri2" ns2:attr2="value2"/><child2 xmlns:ns3="uri3" ns3:attr3="value3"/></root>');
+  const xmlString = (new XMLSerializer()).serializeToString(root);
+  assert_equals(xmlString, '<root><child1 xmlns:ns1="uri1" ns1:attr1="value1" xmlns:ns2="uri2" ns2:attr2="value2"/><child2 xmlns:ns3="uri3" ns3:attr3="value3"/></root>');
 }, 'Check if generated prefixes match to "ns${index}".');
 
 test(function() {
-  const root = parse('<root xmlns:ns2="uri2"><child xmlns:ns1="uri1"/></root>');
+  const input = '<root xmlns:ns2="uri2"><child xmlns:ns1="uri1"/></root>';
+  const root = (new DOMParser()).parseFromString(input, 'text/xml').documentElement;
   root.firstChild.setAttributeNS('uri3', 'attr1', 'value1');
+  const xmlString = (new XMLSerializer()).serializeToString(root);
   // According to 'DOM Parsing and Serialization' draft as of 2018-12-11,
   // 'generate a prefix' result can conflict with an existing xmlns:ns* declaration.
-  assert_equals(serialize(root), '<root xmlns:ns2="uri2"><child xmlns:ns1="uri1" xmlns:ns1="uri3" ns1:attr1="value1"/></root>');
+  assert_equals(xmlString, '<root xmlns:ns2="uri2"><child xmlns:ns1="uri1" xmlns:ns1="uri3" ns1:attr1="value1"/></root>');
 }, 'Check if "ns1" is generated even if the element already has xmlns:ns1.');
 
-test(function() {
-  const root = (new Document()).createElement('root');
-  root.setAttributeNS('http://www.w3.org/1999/xlink', 'href', 'v');
-  assert_equals(serialize(root), '<root xmlns:ns1="http://www.w3.org/1999/xlink" ns1:href="v"/>');
-
-  const root2 = (new Document()).createElement('root');
-  root2.setAttributeNS('http://www.w3.org/1999/xlink', 'xl:type', 'v');
-  assert_equals(serialize(root2), '<root xmlns:xl="http://www.w3.org/1999/xlink" xl:type="v"/>');
-}, 'Check if no special handling for XLink namespace unlike HTML serializer.');
-
 </script>
  </body>
 </html>
diff --git a/testing/web-platform/tests/element-timing/observe-svg-image.html b/testing/web-platform/tests/element-timing/observe-svg-image.html
deleted file mode 100644
index 327ab69668b2..000000000000
--- a/testing/web-platform/tests/element-timing/observe-svg-image.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE HTML>
-<meta charset=utf-8>
-<title>Element Timing: observe image inside SVG</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="resources/element-timing-helpers.js"></script>
-<script>
-let beforeRender;
-async_test(function (t) {
-  const observer = new PerformanceObserver(
-    t.step_func_done(function(entryList) {
-      assert_equals(entryList.getEntries().length, 1);
-      const entry = entryList.getEntries()[0];
-      checkElement(entry, 'my_svg', beforeRender);
-      // Assume viewport has size at least 200, so the element is fully visible.
-      checkRect(entry, [0, 200, 0, 200]);
-    })
-  );
-  observer.observe({entryTypes: ['element']});
-  beforeRender = performance.now();
-}, "Able to observe svg image.");
-</script>
-<style>
-body {
-  margin: 0;
-}
-</style>
-<svg>
-  <image href='resources/circle.svg' elementtiming='my_svg'/>
-</svg>
diff --git a/testing/web-platform/tests/fetch/sec-metadata/embed.tentative.https.sub.html b/testing/web-platform/tests/fetch/sec-metadata/embed.tentative.https.sub.html
index 6f0c43959504..1c69c021accb 100644
--- a/testing/web-platform/tests/fetch/sec-metadata/embed.tentative.https.sub.html
+++ b/testing/web-platform/tests/fetch/sec-metadata/embed.tentative.https.sub.html
@@ -13,7 +13,7 @@
       let e = document.createElement('embed');
       e.src = "https://{{host}}:{{ports[https][0]}}/fetch/sec-metadata/resources/record-header.py?file=" + key;
       e.onload = e => {
-        let expected = {"dest":"embed", "site":"same-origin", "user":"?F", "mode":"no-cors"};
+        let expected = {"dest":"embed", "site":"same-origin", "user":"?F"};
         fetch("/fetch/sec-metadata/resources/record-header.py?retrieve=true&file=" + key)
           .then(response => response.text())
           .then(text => assert_header_equals(text, expected))
@@ -32,7 +32,7 @@
       let e = document.createElement('embed');
       e.src = "https://{{hosts[][www]}}:{{ports[https][0]}}/fetch/sec-metadata/resources/record-header.py?file=" + key;
       e.onload = e => {
-        let expected = {"dest":"embed", "site":"same-site", "user":"?F", "mode":"no-cors"};
+        let expected = {"dest":"embed", "site":"same-site", "user":"?F"};
         fetch("/fetch/sec-metadata/resources/record-header.py?retrieve=true&file=" + key)
           .then(response => response.text())
           .then(text => assert_header_equals(text, expected))
@@ -51,7 +51,7 @@
       let e = document.createElement('embed');
       e.src = "https://{{hosts[alt][www]}}:{{ports[https][0]}}/fetch/sec-metadata/resources/record-header.py?file=" + key;
       e.onload = e => {
-        let expected = {"dest":"embed", "site":"cross-site", "user":"?F", "mode":"no-cors"};
+        let expected = {"dest":"embed", "site":"cross-site", "user":"?F"};
         fetch("/fetch/sec-metadata/resources/record-header.py?retrieve=true&file=" + key)
           .then(response => response.text())
           .then(text => assert_header_equals(text, expected))
diff --git a/testing/web-platform/tests/fetch/sec-metadata/fetch.tentative.https.sub.html b/testing/web-platform/tests/fetch/sec-metadata/fetch.tentative.https.sub.html
index dc4b977ac6ec..f6460b4efca7 100644
--- a/testing/web-platform/tests/fetch/sec-metadata/fetch.tentative.https.sub.html
+++ b/testing/web-platform/tests/fetch/sec-metadata/fetch.tentative.https.sub.html
@@ -3,7 +3,6 @@
 <script src=/resources/testharnessreport.js></script>
 <script src=/fetch/sec-metadata/resources/helper.js></script>
 <script>
-  // Site
   promise_test(t => {
     return fetch("https://{{host}}:{{ports[https][0]}}/fetch/sec-metadata/resources/echo-as-json.py")
         .then(r => r.json())
@@ -11,8 +10,7 @@
           assert_header_equals(j, {
             "dest": "empty",
             "site": "same-origin",
-            "user": "?F",
-            "mode": "cors",
+            "user":"?F"
           });
         });
   }, "Same-origin fetch");
@@ -24,8 +22,7 @@
           assert_header_equals(j, {
             "dest": "empty",
             "site": "same-site",
-            "user": "?F",
-            "mode": "cors",
+            "user":"?F"
           });
         });
   }, "Same-site fetch");
@@ -37,49 +34,8 @@
           assert_header_equals(j, {
             "dest": "empty",
             "site": "cross-site",
-            "user": "?F",
-            "mode": "cors",
+            "user":"?F"
           });
         });
   }, "Cross-site fetch");
-
-  // Mode
-  promise_test(t => {
-    return fetch("https://{{host}}:{{ports[https][0]}}/fetch/sec-metadata/resources/echo-as-json.py", {mode: "same-origin"})
-        .then(r => r.json())
-        .then(j => {
-          assert_header_equals(j, {
-            "dest": "empty",
-            "site": "same-origin",
-            "user": "?F",
-            "mode": "same-origin",
-          });
-        });
-  }, "Same-origin mode");
-
-  promise_test(t => {
-    return fetch("https://{{host}}:{{ports[https][0]}}/fetch/sec-metadata/resources/echo-as-json.py", {mode: "cors"})
-        .then(r => r.json())
-        .then(j => {
-          assert_header_equals(j, {
-            "dest": "empty",
-            "site": "same-origin",
-            "user": "?F",
-            "mode": "cors",
-          });
-        });
-  }, "CORS mode");
-
-  promise_test(t => {
-    return fetch("https://{{host}}:{{ports[https][0]}}/fetch/sec-metadata/resources/echo-as-json.py", {mode: "no-cors"})
-        .then(r => r.json())
-        .then(j => {
-          assert_header_equals(j, {
-            "dest": "empty",
-            "site": "same-origin",
-            "user": "?F",
-            "mode": "no-cors",
-          });
-        });
-  }, "no-CORS mode");
 </script>
diff --git a/testing/web-platform/tests/fetch/sec-metadata/font.tentative.https.sub.html b/testing/web-platform/tests/fetch/sec-metadata/font.tentative.https.sub.html
index 9792f2dce942..d2bcf6928848 100644
--- a/testing/web-platform/tests/fetch/sec-metadata/font.tentative.https.sub.html
+++ b/testing/web-platform/tests/fetch/sec-metadata/font.tentative.https.sub.html
@@ -46,7 +46,7 @@
     promise_test(t => {
       return new Promise((resolve, reject) => {
         let key = "font-same-origin";
-        let expected = {"dest":"font", "site":"same-origin", "user":"?F", "mode": "cors"};
+        let expected = {"dest":"font", "site":"same-origin", "user":"?F"};
         fetch("/fetch/sec-metadata/resources/record-header.py?retrieve=true&file=" + key)
           .then(response => response.text())
           .then(text => assert_header_equals(text, expected))
@@ -58,7 +58,7 @@
     promise_test(t => {
       return new Promise((resolve, reject) => {
         let key = "font-same-site";
-        let expected = {"dest":"font", "site":"same-site", "user":"?F", "mode": "cors"};
+        let expected = {"dest":"font", "site":"same-site", "user":"?F"};
         fetch("/fetch/sec-metadata/resources/record-header.py?retrieve=true&file=" + key)
           .then(response => response.text())
           .then(text => assert_header_equals(text, expected))
@@ -70,7 +70,7 @@
     promise_test(t => {
       return new Promise((resolve, reject) => {
         let key = "font-cross-site";
-        let expected = {"dest":"font", "site":"cross-site", "user":"?F", "mode": "cors"};
+        let expected = {"dest":"font", "site":"cross-site", "user":"?F"};
         fetch("/fetch/sec-metadata/resources/record-header.py?retrieve=true&file=" + key)
           .then(response => response.text())
           .then(text => assert_header_equals(text, expected))
diff --git a/testing/web-platform/tests/fetch/sec-metadata/iframe.tentative.https.sub.html b/testing/web-platform/tests/fetch/sec-metadata/iframe.tentative.https.sub.html
index 73bd90745d1a..6ee14300296b 100644
--- a/testing/web-platform/tests/fetch/sec-metadata/iframe.tentative.https.sub.html
+++ b/testing/web-platform/tests/fetch/sec-metadata/iframe.tentative.https.sub.html
@@ -14,8 +14,7 @@
       assert_header_equals(e.data, {
         "dest": "nested-document",
         "site": "same-origin",
-        "user": "?F",
-        "mode": "navigate"
+        "user":"?F"
       });
       t.done();
     }));
@@ -33,8 +32,7 @@
       assert_header_equals(e.data, {
         "dest": "nested-document",
         "site": "same-site",
-        "user": "?F",
-        "mode": "navigate"
+        "user": "?F"
       });
       t.done();
     }));
@@ -52,8 +50,7 @@
       assert_header_equals(e.data, {
         "dest": "nested-document",
         "site": "cross-site",
-        "user": "?F",
-        "mode": "navigate"
+        "user": "?F"
       });
       t.done();
     }));
diff --git a/testing/web-platform/tests/fetch/sec-metadata/iframe.tentative.sub.html b/testing/web-platform/tests/fetch/sec-metadata/iframe.tentative.sub.html
index eab2d3f5886e..ce31a8182510 100644
--- a/testing/web-platform/tests/fetch/sec-metadata/iframe.tentative.sub.html
+++ b/testing/web-platform/tests/fetch/sec-metadata/iframe.tentative.sub.html
@@ -14,8 +14,7 @@
       assert_header_equals(e.data, {
         "dest": "",
         "site": "",
-        "user": "",
-        "mode": "",
+        "user": ""
       });
       t.done();
     }));
@@ -33,8 +32,7 @@
       assert_header_equals(e.data, {
         "dest": "",
         "site": "",
-        "user": "",
-        "mode": "",
+        "user": ""
       });
       t.done();
     }));
@@ -52,8 +50,7 @@
       assert_header_equals(e.data, {
         "dest": "",
         "site": "",
-        "user": "",
-        "mode": "",
+        "user": ""
       });
       t.done();
     }));
diff --git a/testing/web-platform/tests/fetch/sec-metadata/img.tentative.https.sub.html b/testing/web-platform/tests/fetch/sec-metadata/img.tentative.https.sub.html
index 802ae25b775c..c5c389503cca 100644
--- a/testing/web-platform/tests/fetch/sec-metadata/img.tentative.https.sub.html
+++ b/testing/web-platform/tests/fetch/sec-metadata/img.tentative.https.sub.html
@@ -1,75 +1,72 @@
 <!DOCTYPE html>
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
-<script src=/common/security-features/resources/common.js></script>
+<script src=/referrer-policy/generic/common.js></script>
 <script src=/fetch/sec-metadata/resources/helper.js></script>
 <body>
 <script>
   // These tests reuse the `referrer-policy` infrastructure to load images that
   // encode their request headers in their pixels. Fun stuff!
-  promise_test(() =>
+  async_test(t => {
     loadImageInWindow(
       "https://{{host}}:{{ports[https][0]}}/referrer-policy/generic/subresource/image.py",
-      [],
-      window)
-    .then(img => {
+      t.step_func_done(img => {
         headers = decodeImageData(extractImageData(img)).headers;
         got = {
-          "dest": headers["sec-fetch-dest"],
-          "mode": headers["sec-fetch-mode"],
-          "site": headers["sec-fetch-site"],
-          "user": headers["sec-fetch-user"]
+        "dest": headers["sec-fetch-dest"],
+        "mode": headers["sec-fetch-mode"],
+        "site": headers["sec-fetch-site"],
+        "user": headers["sec-fetch-user"]
         };
         assert_header_equals(got, {
           "dest": "image",
           "site": "same-origin",
-          "user": "?F",
-          "mode": "cors", // Because `loadImageInWindow` tacks on `crossorigin`
+          "user": "?F"
         });
       }),
-    "Same-origin image");
+      [],
+      window);
+  }, "Same-origin image");
 
-  promise_test(() =>
+  async_test(t => {
     loadImageInWindow(
       "https://{{hosts[][www]}}:{{ports[https][0]}}/referrer-policy/generic/subresource/image.py",
-      [],
-      window)
-    .then(img => {
+      t.step_func_done(img => {
         headers = decodeImageData(extractImageData(img)).headers;
         got = {
-          "dest": headers["sec-fetch-dest"],
-          "mode": headers["sec-fetch-mode"],
-          "site": headers["sec-fetch-site"],
-          "user": headers["sec-fetch-user"]
+        "dest": headers["sec-fetch-dest"],
+        "mode": headers["sec-fetch-mode"],
+        "site": headers["sec-fetch-site"],
+        "user": headers["sec-fetch-user"]
         };
         assert_header_equals(got, {
           "dest": "image",
           "site": "same-site",
-          "user": "?F",
-          "mode": "cors", // Because `loadImageInWindow` tacks on `crossorigin`
+          "user": "?F"
         });
       }),
-    "Same-site image");
+      [],
+      window);
+  }, "Same-site image");
 
-  promise_test(() =>
+  async_test(t => {
     loadImageInWindow(
       "https://{{hosts[alt][www]}}:{{ports[https][0]}}/referrer-policy/generic/subresource/image.py",
-      [],
-      window)
-    .then(img => {
+      t.step_func_done(img => {
         headers = decodeImageData(extractImageData(img)).headers;
         got = {
-          "dest": headers["sec-fetch-dest"],
-          "mode": headers["sec-fetch-mode"],
-          "site": headers["sec-fetch-site"],
-          "user": headers["sec-fetch-user"]
+        "dest": headers["sec-fetch-dest"],
+        "mode": headers["sec-fetch-mode"],
+        "site": headers["sec-fetch-site"],
+        "user": headers["sec-fetch-user"]
         };
         assert_header_equals(got, {
           "dest": "image",
           "site": "cross-site",
-          "user": "?F",
-          "mode": "cors", // Because `loadImageInWindow` tacks on `crossorigin`
+          "user": "?F"
         });
       }),
-    "Cross-site image");
+      [],
+      window);
+  }, "Cross-site image");
 </script>
diff --git a/testing/web-platform/tests/fetch/sec-metadata/object.tentative.https.sub.html b/testing/web-platform/tests/fetch/sec-metadata/object.tentative.https.sub.html
index 2a0e8de85568..0b9839470d1d 100644
--- a/testing/web-platform/tests/fetch/sec-metadata/object.tentative.https.sub.html
+++ b/testing/web-platform/tests/fetch/sec-metadata/object.tentative.https.sub.html
@@ -13,7 +13,7 @@
       let e = document.createElement('object');
       e.data = "https://{{host}}:{{ports[https][0]}}/fetch/sec-metadata/resources/record-header.py?file=" + key;
       e.onload = e => {
-        let expected = {"dest":"object", "site":"same-origin", "user":"?F", "mode":"no-cors"};
+        let expected = {"dest":"object", "site":"same-origin", "user":"?F"};
         fetch("/fetch/sec-metadata/resources/record-header.py?retrieve=true&file=" + key)
           .then(response => response.text())
           .then(text => assert_header_equals(text, expected))
@@ -32,7 +32,7 @@
       let e = document.createElement('object');
       e.data = "https://{{hosts[][www]}}:{{ports[https][0]}}/fetch/sec-metadata/resources/record-header.py?file=" + key;
       e.onload = e => {
-        let expected = {"dest":"object", "site":"same-site", "user":"?F", "mode":"no-cors"};
+        let expected = {"dest":"object", "site":"same-site", "user":"?F"};
         fetch("/fetch/sec-metadata/resources/record-header.py?retrieve=true&file=" + key)
           .then(response => response.text())
           .then(text => assert_header_equals(text, expected))
@@ -51,7 +51,7 @@
       let e = document.createElement('object');
       e.data = "https://{{hosts[alt][www]}}:{{ports[https][0]}}/fetch/sec-metadata/resources/record-header.py?file=" + key;
       e.onload = e => {
-        let expected = {"dest":"object", "site":"cross-site", "user":"?F", "mode":"no-cors"};
+        let expected = {"dest":"object", "site":"cross-site", "user":"?F"};
         fetch("/fetch/sec-metadata/resources/record-header.py?retrieve=true&file=" + key)
           .then(response => response.text())
           .then(text => assert_header_equals(text, expected))
diff --git a/testing/web-platform/tests/fetch/sec-metadata/redirect/cross-site-redirect.tentative.https.sub.html b/testing/web-platform/tests/fetch/sec-metadata/redirect/cross-site-redirect.tentative.https.sub.html
index f88cf140d4e3..56d88d9156c7 100644
--- a/testing/web-platform/tests/fetch/sec-metadata/redirect/cross-site-redirect.tentative.https.sub.html
+++ b/testing/web-platform/tests/fetch/sec-metadata/redirect/cross-site-redirect.tentative.https.sub.html
@@ -12,7 +12,7 @@ promise_test(t => {
 
       let e = document.createElement('img');
       e.src = "https://{{hosts[alt][www]}}:{{ports[https][0]}}/xhr/resources/redirect.py?location=https://{{host}}:{{ports[https][0]}}/fetch/sec-metadata/resources/record-header.py?file=" + key;
-      let expected = {"dest":"image", "site":"cross-site", "user":"?F", "mode": "no-cors"};
+      let expected = {"dest":"image", "site":"cross-site", "user":"?F"};
       e.onload = e => {
         fetch("/fetch/sec-metadata/resources/record-header.py?retrieve=true&file=" + key)
           .then(response => response.text())
@@ -38,7 +38,7 @@ promise_test(t => {
 
       let e = document.createElement('img');
       e.src = "https://{{hosts[alt][www]}}:{{ports[https][0]}}/xhr/resources/redirect.py?location=https://{{hosts[][www]}}:{{ports[https][0]}}/fetch/sec-metadata/resources/record-header.py?file=" + key;
-      let expected = {"dest":"image", "site":"cross-site", "user":"?F", "mode": "no-cors"};
+      let expected = {"dest":"image", "site":"cross-site", "user":"?F"};
       e.onload = e => {
         fetch("/fetch/sec-metadata/resources/record-header.py?retrieve=true&file=" + key)
           .then(response => response.text())
@@ -64,7 +64,7 @@ promise_test(t => {
 
       let e = document.createElement('img');
       e.src = "https://{{hosts[alt][www]}}:{{ports[https][0]}}/xhr/resources/redirect.py?location=https://{{hosts[alt][www]}}:{{ports[https][0]}}/fetch/sec-metadata/resources/record-header.py?file=" + key;
-      let expected = {"dest":"image", "site":"cross-site", "user":"?F", "mode": "no-cors"};
+      let expected = {"dest":"image", "site":"cross-site", "user":"?F"};
       e.onload = e => {
         fetch("/fetch/sec-metadata/resources/record-header.py?retrieve=true&file=" + key)
           .then(response => response.text())
diff --git a/testing/web-platform/tests/fetch/sec-metadata/redirect/multiple-redirect-cross-site.tentative.https.sub.html b/testing/web-platform/tests/fetch/sec-metadata/redirect/multiple-redirect-cross-site.tentative.https.sub.html
index 688c697ac931..f6d18f568f1a 100644
--- a/testing/web-platform/tests/fetch/sec-metadata/redirect/multiple-redirect-cross-site.tentative.https.sub.html
+++ b/testing/web-platform/tests/fetch/sec-metadata/redirect/multiple-redirect-cross-site.tentative.https.sub.html
@@ -14,7 +14,7 @@ promise_test(t => {
       e.src = "https://{{host}}:{{ports[https][0]}}/xhr/resources/redirect.py?location=" +// same-origin
       "https://{{hosts[alt][www]}}:{{ports[https][0]}}/xhr/resources/redirect.py?location=" +// cross-site
       "https://{{host}}:{{ports[https][0]}}/fetch/sec-metadata/resources/record-header.py?file=" + key;// same-origin
-      let expected = {"dest":"image", "site":"cross-site", "user":"?F", "mode": "no-cors"};
+      let expected = {"dest":"image", "site":"cross-site", "user":"?F"};
 
       e.onload = e => {
         fetch("/fetch/sec-metadata/resources/record-header.py?retrieve=true&file=" + key)
diff --git a/testing/web-platform/tests/fetch/sec-metadata/redirect/multiple-redirect-same-site.tentative.https.sub.html b/testing/web-platform/tests/fetch/sec-metadata/redirect/multiple-redirect-same-site.tentative.https.sub.html
index bc79f7810a1b..4756a79ab258 100644
--- a/testing/web-platform/tests/fetch/sec-metadata/redirect/multiple-redirect-same-site.tentative.https.sub.html
+++ b/testing/web-platform/tests/fetch/sec-metadata/redirect/multiple-redirect-same-site.tentative.https.sub.html
@@ -14,7 +14,7 @@ promise_test(t => {
       e.src = "https://{{host}}:{{ports[https][0]}}/xhr/resources/redirect.py?location=" +// same-origin
       "https://{{hosts[][www]}}:{{ports[https][0]}}/xhr/resources/redirect.py?location=" +// same-site
       "https://{{host}}:{{ports[https][0]}}/fetch/sec-metadata/resources/record-header.py?file=" + key;// same-origin
-      let expected = {"dest":"image", "site":"same-site", "user":"?F", "mode": "no-cors"};
+      let expected = {"dest":"image", "site":"same-site", "user":"?F"};
 
       e.onload = e => {
         fetch("/fetch/sec-metadata/resources/record-header.py?retrieve=true&file=" + key)
diff --git a/testing/web-platform/tests/fetch/sec-metadata/redirect/same-origin-redirect.tentative.https.sub.html b/testing/web-platform/tests/fetch/sec-metadata/redirect/same-origin-redirect.tentative.https.sub.html
index a5323921c26b..8558d6890e6f 100644
--- a/testing/web-platform/tests/fetch/sec-metadata/redirect/same-origin-redirect.tentative.https.sub.html
+++ b/testing/web-platform/tests/fetch/sec-metadata/redirect/same-origin-redirect.tentative.https.sub.html
@@ -12,7 +12,7 @@ promise_test(t => {
 
       let e = document.createElement('img');
       e.src = "/xhr/resources/redirect.py?location=https://{{host}}:{{ports[https][0]}}/fetch/sec-metadata/resources/record-header.py?file=" + key;
-      let expected = {"dest":"image", "site":"same-origin", "user":"?F", "mode": "no-cors"};
+      let expected = {"dest":"image", "site":"same-origin", "user":"?F"};
 
       e.onload = e => {
         fetch("/fetch/sec-metadata/resources/record-header.py?retrieve=true&file=" + key)
@@ -39,7 +39,7 @@ promise_test(t => {
 
       let e = document.createElement('img');
       e.src = "/xhr/resources/redirect.py?location=https://{{hosts[][www]}}:{{ports[https][0]}}/fetch/sec-metadata/resources/record-header.py?file=" + key;
-      let expected = {"dest":"image", "site":"same-site", "user":"?F", "mode": "no-cors"};
+      let expected = {"dest":"image", "site":"same-site", "user":"?F"};
 
       e.onload = e => {
         fetch("/fetch/sec-metadata/resources/record-header.py?retrieve=true&file=" + key)
@@ -66,7 +66,7 @@ promise_test(t => {
 
       let e = document.createElement('img');
       e.src = "/xhr/resources/redirect.py?location=https://{{hosts[alt][www]}}:{{ports[https][0]}}/fetch/sec-metadata/resources/record-header.py?file=" + key;
-      let expected = {"dest":"image", "site":"cross-site", "user":"?F", "mode": "no-cors"};
+      let expected = {"dest":"image", "site":"cross-site", "user":"?F"};
 
       e.onload = e => {
         fetch("/fetch/sec-metadata/resources/record-header.py?retrieve=true&file=" + key)
diff --git a/testing/web-platform/tests/fetch/sec-metadata/redirect/same-site-redirect.tentative.https.sub.html b/testing/web-platform/tests/fetch/sec-metadata/redirect/same-site-redirect.tentative.https.sub.html
index 92749ae0b80c..8e05b255b88d 100644
--- a/testing/web-platform/tests/fetch/sec-metadata/redirect/same-site-redirect.tentative.https.sub.html
+++ b/testing/web-platform/tests/fetch/sec-metadata/redirect/same-site-redirect.tentative.https.sub.html
@@ -12,7 +12,7 @@ promise_test(t => {
 
       let e = document.createElement('img');
       e.src = "https://{{hosts[][www]}}:{{ports[https][0]}}/xhr/resources/redirect.py?location=https://{{host}}:{{ports[https][0]}}/fetch/sec-metadata/resources/record-header.py?file=" + key;
-      let expected = {"dest":"image", "site":"same-site", "user":"?F", "mode": "no-cors"};
+      let expected = {"dest":"image", "site":"same-site", "user":"?F"};
 
       e.onload = e => {
         fetch("/fetch/sec-metadata/resources/record-header.py?retrieve=true&file=" + key)
@@ -39,7 +39,7 @@ promise_test(t => {
 
       let e = document.createElement('img');
       e.src = "https://{{hosts[][www]}}:{{ports[https][0]}}/xhr/resources/redirect.py?location=https://{{host}}:{{ports[https][0]}}/fetch/sec-metadata/resources/record-header.py?file=" + key;
-      let expected = {"dest":"image", "site":"same-site", "user":"?F", "mode": "no-cors"};
+      let expected = {"dest":"image", "site":"same-site", "user":"?F"};
 
       e.onload = e => {
         fetch("/fetch/sec-metadata/resources/record-header.py?retrieve=true&file=" + key)
@@ -66,7 +66,7 @@ promise_test(t => {
 
       let e = document.createElement('img');
       e.src = "https://{{hosts[][www]}}:{{ports[https][0]}}/xhr/resources/redirect.py?location=https://{{hosts[alt][www]}}:{{ports[https][0]}}/fetch/sec-metadata/resources/record-header.py?file=" + key;
-      let expected = {"dest":"image", "site":"cross-site", "user":"?F", "mode": "no-cors"};
+      let expected = {"dest":"image", "site":"cross-site", "user":"?F"};
 
       e.onload = e => {
         fetch("/fetch/sec-metadata/resources/record-header.py?retrieve=true&file=" + key)
diff --git a/testing/web-platform/tests/fetch/sec-metadata/report.tentative.https.sub.html b/testing/web-platform/tests/fetch/sec-metadata/report.tentative.https.sub.html
index f1d8e06e50e2..1cfa8641ba87 100644
--- a/testing/web-platform/tests/fetch/sec-metadata/report.tentative.https.sub.html
+++ b/testing/web-platform/tests/fetch/sec-metadata/report.tentative.https.sub.html
@@ -22,9 +22,9 @@
     document.addEventListener("securitypolicyviolation", (e) => {
       counter++;
       if (counter == 3) {
-        generate_test({"dest":"report", "site":"same-origin", "user":"?F", "mode": "no-cors"}, "same-origin");
-        generate_test({"dest":"report", "site":"same-site", "user":"?F", "mode": "no-cors"}, "same-site");
-        generate_test({"dest":"report", "site":"cross-site", "user":"?F", "mode": "no-cors"}, "cross-site");
+        generate_test({"dest":"report", "site":"same-origin", "user":"?F"}, "same-origin");
+        generate_test({"dest":"report", "site":"same-site", "user":"?F"}, "same-site");
+        generate_test({"dest":"report", "site":"cross-site", "user":"?F"}, "cross-site");
       }
     });
   }, "Initialization.");
diff --git a/testing/web-platform/tests/fetch/sec-metadata/resources/helper.js b/testing/web-platform/tests/fetch/sec-metadata/resources/helper.js
index 4bee68996e86..1a9ec154e02b 100644
--- a/testing/web-platform/tests/fetch/sec-metadata/resources/helper.js
+++ b/testing/web-platform/tests/fetch/sec-metadata/resources/helper.js
@@ -4,7 +4,8 @@ function assert_header_equals(value, expected) {
     value = JSON.parse(value);
   }
   assert_equals(value.dest, expected.dest, "dest");
-  assert_equals(value.mode, expected.mode, "mode");
+  // Mode is commented out as no test cases have been filled out yet
+  // assert_equals(value.mode, expected.mode, "mode");
   assert_equals(value.site, expected.site, "site");
   assert_equals(value.user, expected.user, "user");
 }
diff --git a/testing/web-platform/tests/fetch/sec-metadata/script.tentative.https.sub.html b/testing/web-platform/tests/fetch/sec-metadata/script.tentative.https.sub.html
index a35e753c7898..d76378f1dd8d 100644
--- a/testing/web-platform/tests/fetch/sec-metadata/script.tentative.https.sub.html
+++ b/testing/web-platform/tests/fetch/sec-metadata/script.tentative.https.sub.html
@@ -12,8 +12,7 @@
     assert_header_equals(header, {
       "dest": "script",
       "site": "same-origin",
-      "user": "?F",
-      "mode": "no-cors",
+      "user":"?F"
     });
   }, "Same-origin script");
 </script>
@@ -27,8 +26,7 @@
     assert_header_equals(header, {
       "dest": "script",
       "site": "same-site",
-      "user": "?F",
-      "mode": "no-cors",
+      "user":"?F"
     });
   }, "Same-site script");
 </script>
@@ -42,23 +40,7 @@
     assert_header_equals(header, {
       "dest": "script",
       "site": "cross-site",
-      "user": "?F",
-      "mode": "no-cors",
+      "user":"?F"
     });
   }, "Cross-site script");
 </script>
-
-<!-- Same-origin script, CORS mode -->
-<script src="https://{{host}}:{{ports[https][0]}}/fetch/sec-metadata/resources/echo-as-script.py" crossorigin="anonymous"></script>
-<script>
-  test(t => {
-    t.add_cleanup(_ => { header = null; });
-
-    assert_header_equals(header, {
-      "dest": "script",
-      "site": "same-origin",
-      "user": "?F",
-      "mode": "cors",
-    });
-  }, "Same-origin CORS script");
-</script>
diff --git a/testing/web-platform/tests/fetch/sec-metadata/script.tentative.sub.html b/testing/web-platform/tests/fetch/sec-metadata/script.tentative.sub.html
index 3218a40abded..482f4b98f9e8 100644
--- a/testing/web-platform/tests/fetch/sec-metadata/script.tentative.sub.html
+++ b/testing/web-platform/tests/fetch/sec-metadata/script.tentative.sub.html
@@ -12,8 +12,7 @@
     assert_header_equals(header, {
       "dest": "",
       "site": "",
-      "user": "",
-      "mode": "",
+      "user": ""
     });
   }, "Non-secure same-origin script => No headers");
 </script>
@@ -27,8 +26,7 @@
     assert_header_equals(header, {
       "dest": "",
       "site": "",
-      "user": "",
-      "mode": "",
+      "user": ""
     });
   }, "Non-secure same-site script => No headers");
 </script>
@@ -42,8 +40,7 @@
     assert_header_equals(header, {
       "dest": "",
       "site": "",
-      "user": "",
-      "mode": "",
+      "user": ""
     });
   }, "Non-secure cross-site script => No headers");
 </script>
diff --git a/testing/web-platform/tests/fetch/sec-metadata/serviceworker.tentative.https.sub.html b/testing/web-platform/tests/fetch/sec-metadata/serviceworker.tentative.https.sub.html
index 5b7ee772b617..d0b86d2d9a8c 100644
--- a/testing/web-platform/tests/fetch/sec-metadata/serviceworker.tentative.https.sub.html
+++ b/testing/web-platform/tests/fetch/sec-metadata/serviceworker.tentative.https.sub.html
@@ -35,7 +35,7 @@
     promise_test(t => {
     return new Promise((resolve, reject) => {
       let key = "serviceworker-same-origin";
-      let expected = {"dest":"serviceworker", "site":"same-origin", "user":"?F", "mode": "same-origin"};
+      let expected = {"dest":"serviceworker", "site":"same-origin", "user":"?F"};
       fetch("/fetch/sec-metadata/resources/record-header.py?retrieve=true&file=" + key)
         .then(response => response.text())
         .then(text => assert_header_equals(text, expected))
diff --git a/testing/web-platform/tests/fetch/sec-metadata/sharedworker.tentative.https.sub.html b/testing/web-platform/tests/fetch/sec-metadata/sharedworker.tentative.https.sub.html
index cfeadd8d8e20..66f7d5b9d8dc 100644
--- a/testing/web-platform/tests/fetch/sec-metadata/sharedworker.tentative.https.sub.html
+++ b/testing/web-platform/tests/fetch/sec-metadata/sharedworker.tentative.https.sub.html
@@ -26,7 +26,7 @@
     promise_test(t => {
       return new Promise((resolve, reject) => {
         let key = "sharedworker-same-origin";
-        let expected = {"dest":"sharedworker", "site":"same-origin", "user":"?F", "mode": "same-origin"};
+        let expected = {"dest":"sharedworker", "site":"same-origin", "user":"?F"};
 
         fetch("/fetch/sec-metadata/resources/record-header.py?retrieve=true&file=" + key)
           .then(response => response.text())
diff --git a/testing/web-platform/tests/fetch/sec-metadata/style.tentative.https.sub.html b/testing/web-platform/tests/fetch/sec-metadata/style.tentative.https.sub.html
index 4ae12662a293..9697db75c82f 100644
--- a/testing/web-platform/tests/fetch/sec-metadata/style.tentative.https.sub.html
+++ b/testing/web-platform/tests/fetch/sec-metadata/style.tentative.https.sub.html
@@ -14,7 +14,7 @@
       e.rel = "stylesheet";
       e.href = "https://{{host}}:{{ports[https][0]}}/fetch/sec-metadata/resources/record-header.py?file=" + key;
       e.onload = e => {
-        let expected = {"dest":"style", "site":"same-origin", "user":"?F", "mode": "no-cors"};
+        let expected = {"dest":"style", "site":"same-origin", "user":"?F"};
         fetch("/fetch/sec-metadata/resources/record-header.py?retrieve=true&file=" + key)
           .then(response => response.text())
           .then(text => assert_header_equals(text, expected))
@@ -34,7 +34,7 @@
       e.rel = "stylesheet";
       e.href = "https://{{hosts[][www]}}:{{ports[https][0]}}/fetch/sec-metadata/resources/record-header.py?file=" + key;
       e.onload = e => {
-        let expected = {"dest":"style", "site":"same-site", "user":"?F", "mode": "no-cors"};
+        let expected = {"dest":"style", "site":"same-site", "user":"?F"};
         fetch("/fetch/sec-metadata/resources/record-header.py?retrieve=true&file=" + key)
           .then(response => response.text())
           .then(text => assert_header_equals(text, expected))
@@ -54,7 +54,7 @@
       e.rel = "stylesheet";
       e.href = "https://{{hosts[alt][www]}}:{{ports[https][0]}}/fetch/sec-metadata/resources/record-header.py?file=" + key;
       e.onload = e => {
-        let expected = {"dest":"style", "site":"cross-site", "user":"?F", "mode": "no-cors"};
+        let expected = {"dest":"style", "site":"cross-site", "user":"?F"};
         fetch("/fetch/sec-metadata/resources/record-header.py?retrieve=true&file=" + key)
           .then(response => response.text())
           .then(text => assert_header_equals(text, expected))
@@ -65,27 +65,6 @@
       document.body.appendChild(e);
     })
   }, "Cross-Site style");
-
-  promise_test(t => {
-    return new Promise((resolve, reject) => {
-      let key = "style-same-origin";
-
-      let e = document.createElement('link');
-      e.rel = "stylesheet";
-      e.href = "https://{{host}}:{{ports[https][0]}}/fetch/sec-metadata/resources/record-header.py?file=" + key;
-      e.crossOrigin = "anonymous";
-      e.onload = e => {
-        let expected = {"dest":"style", "site":"same-origin", "user":"?F", "mode": "cors"};
-        fetch("/fetch/sec-metadata/resources/record-header.py?retrieve=true&file=" + key)
-          .then(response => response.text())
-          .then(text => assert_header_equals(text, expected))
-          .then(_ => resolve())
-          .catch(e => reject(e));
-      };
-
-      document.body.appendChild(e);
-    })
-  }, "Same-Origin, cors style");
 </script>
 </html>
 
diff --git a/testing/web-platform/tests/fetch/sec-metadata/track.tentative.https.sub.html b/testing/web-platform/tests/fetch/sec-metadata/track.tentative.https.sub.html
index 89933f22c393..b9dfabf97397 100644
--- a/testing/web-platform/tests/fetch/sec-metadata/track.tentative.https.sub.html
+++ b/testing/web-platform/tests/fetch/sec-metadata/track.tentative.https.sub.html
@@ -29,12 +29,7 @@
       let el = createTrack();
       el.src = "https://{{host}}:{{ports[https][0]}}/fetch/sec-metadata/resources/record-header.py?file=track-same-origin";
       el.onload = t.step_func(_ => {
-        expected = {
-          "dest": "track",
-          "site": "same-origin",
-          "user": "?F",
-          "mode": "cors" // Because the `video` element has `crossorigin`
-        };
+        expected = {"dest":"track", "site":"same-origin", "user":"?F"};
         fetch("/fetch/sec-metadata/resources/record-header.py?retrieve=true&file=track-same-origin")
             .then(response => response.text())
             .then(text => assert_header_equals(text, expected))
@@ -51,12 +46,7 @@
       let el = createTrack();
       el.src = "https://{{hosts[][www]}}:{{ports[https][0]}}/fetch/sec-metadata/resources/record-header.py?file=track-same-site";
       el.onload = t.step_func(_ => {
-        expected = {
-          "dest": "track",
-          "site": "same-site",
-          "user": "?F",
-          "mode": "cors" // Because the `video` element has `crossorigin`
-        };
+        expected = {"dest":"track", "site":"same-site", "user":"?F"};
         fetch("/fetch/sec-metadata/resources/record-header.py?retrieve=true&file=track-same-site")
             .then(response => response.text())
             .then(text => assert_header_equals(text, expected))
@@ -75,12 +65,7 @@
       let el = createTrack();
       el.src = "https://{{hosts[alt][www]}}:{{ports[https][0]}}/fetch/sec-metadata/resources/record-header.py?file=track-cross-site";
       el.onload = t.step_func(_ => {
-        expected = {
-          "dest": "track",
-          "site": "cross-site",
-          "user": "?F",
-          "mode": "cors" // Because the `video` element has `crossorigin`
-        };
+        expected = {"dest":"track", "site":"cross-site", "user":"?F"};
         fetch("/fetch/sec-metadata/resources/record-header.py?retrieve=true&file=track-cross-site")
             .then(response => response.text())
             .then(text => assert_header_equals(text, expected))
@@ -91,30 +76,4 @@
       document.body.appendChild(video);
     });
   }, "Cross-Site track");
-
-  promise_test(t => {
-    return new Promise((resolve, reject) => {
-      let video = createVideoElement();
-
-      // Unset `crossorigin` to change the CORS mode:
-      video.crossOrigin = undefined;
-
-      let el = createTrack();
-      el.src = "https://{{host}}:{{ports[https][0]}}/fetch/sec-metadata/resources/record-header.py?file=track-same-origin";
-      el.onload = t.step_func(_ => {
-        expected = {
-          "dest":"track",
-          "site":"same-origin",
-          "user":"?F",
-          "mode": "same-origin"
-        };
-        fetch("/fetch/sec-metadata/resources/record-header.py?retrieve=true&file=track-same-origin")
-            .then(response => response.text())
-            .then(text => assert_header_equals(text, expected))
-            .then(_ => resolve());
-      });
-      video.appendChild(el);
-      document.body.appendChild(video);
-    });
-  }, "Same-Origin, CORS track");
 </script>
diff --git a/testing/web-platform/tests/fetch/sec-metadata/window-open.tentative.https.sub.html b/testing/web-platform/tests/fetch/sec-metadata/window-open.tentative.https.sub.html
index 2957dad40a43..236268e17740 100644
--- a/testing/web-platform/tests/fetch/sec-metadata/window-open.tentative.https.sub.html
+++ b/testing/web-platform/tests/fetch/sec-metadata/window-open.tentative.https.sub.html
@@ -17,8 +17,7 @@
       assert_header_equals(e.data, {
         "dest": "document",
         "site": "same-origin",
-        "user": "?F",
-        "mode": "navigate",
+        "user":"?F"
       });
       t.done();
     }));
@@ -34,8 +33,7 @@
       assert_header_equals(e.data, {
         "dest": "document",
         "site": "same-site",
-        "user": "?F",
-        "mode": "navigate",
+        "user":"?F"
       });
       t.done();
     }));
@@ -51,8 +49,7 @@
       assert_header_equals(e.data, {
         "dest": "document",
         "site": "cross-site",
-        "user": "?F",
-        "mode": "navigate",
+        "user":"?F"
       });
       t.done();
     }));
@@ -71,8 +68,7 @@
         assert_header_equals(e.data, {
           "dest": "document",
           "site": "same-origin",
-          "user": "?T",
-          "mode": "navigate",
+          "user": "?T"
         });
         t.done();
       }));
@@ -93,8 +89,7 @@
         assert_header_equals(e.data, {
           "dest": "document",
           "site": "same-site",
-          "user": "?T",
-          "mode": "navigate",
+          "user": "?T"
         });
         t.done();
       }));
@@ -115,8 +110,7 @@
         assert_header_equals(e.data, {
           "dest": "document",
           "site": "cross-site",
-          "user": "?T",
-          "mode": "navigate",
+          "user": "?T"
         });
         t.done();
       }));
diff --git a/testing/web-platform/tests/fetch/sec-metadata/worker.tentative.https.sub.html b/testing/web-platform/tests/fetch/sec-metadata/worker.tentative.https.sub.html
index 89be6f0b5a1b..fcffe91dbf70 100644
--- a/testing/web-platform/tests/fetch/sec-metadata/worker.tentative.https.sub.html
+++ b/testing/web-platform/tests/fetch/sec-metadata/worker.tentative.https.sub.html
@@ -10,7 +10,7 @@
       let key = "worker-same-origin";
       let w = new Worker("/fetch/sec-metadata/resources/record-header.py?file=" + key);
       w.onmessage = e => {
-        let expected = {"dest":"worker", "site":"same-origin", "user":"?F", "mode": "same-origin"};
+        let expected = {"dest":"worker", "site":"same-origin", "user":"?F"};
         fetch("/fetch/sec-metadata/resources/record-header.py?retrieve=true&file=" + key)
           .then(response => response.text())
           .then(text => assert_header_equals(text, expected))
diff --git a/testing/web-platform/tests/fetch/sec-metadata/xslt.tentative.https.sub.html b/testing/web-platform/tests/fetch/sec-metadata/xslt.tentative.https.sub.html
index eea2329900e0..32349c9598e8 100644
--- a/testing/web-platform/tests/fetch/sec-metadata/xslt.tentative.https.sub.html
+++ b/testing/web-platform/tests/fetch/sec-metadata/xslt.tentative.https.sub.html
@@ -12,21 +12,21 @@
       return;
 
     promise_test(t => {
-      let expected = {"dest":"xslt", "site":"same-origin", "user":"?F", "mode": "same-origin"};
+      let expected = {"dest":"xslt", "site":"same-origin", "user":"?F"};
       return fetch("/fetch/sec-metadata/resources/record-header.py?retrieve=true&file=xslt-same-origin")
           .then(response => response.text())
           .then(text => assert_header_equals(text, expected));
     }, "Same-Origin xslt");
 
     promise_test(t => {
-      let expected = {"dest":"xslt", "site":"same-site", "user":"?F", "mode": "no-cors"};
+      let expected = {"dest":"xslt", "site":"same-site", "user":"?F"};
       return fetch("/fetch/sec-metadata/resources/record-header.py?retrieve=true&file=xslt-same-site")
           .then(response => response.text())
           .then(text => assert_header_equals(text, expected));
     }, "Same-site xslt");
 
     promise_test(t => {
-      let expected = {"dest":"xslt", "site":"cross-site", "user":"?F", "mode": "no-cors"};
+      let expected = {"dest":"xslt", "site":"cross-site", "user":"?F"};
       return fetch("/fetch/sec-metadata/resources/record-header.py?retrieve=true&file=xslt-cross-site")
           .then(response => response.text())
           .then(text => assert_header_equals(text, expected));
diff --git a/testing/web-platform/tests/fetch/stale-while-revalidate/fetch.tentative.html b/testing/web-platform/tests/fetch/stale-while-revalidate/fetch.tentative.html
index 5b9b2dc5de28..01a991ebfb1c 100644
--- a/testing/web-platform/tests/fetch/stale-while-revalidate/fetch.tentative.html
+++ b/testing/web-platform/tests/fetch/stale-while-revalidate/fetch.tentative.html
@@ -7,14 +7,11 @@ https://github.com/whatwg/fetch/pull/853
 <title>Tests Stale While Revalidate is not executed for fetch API</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/common/utils.js"></script>
 <script>
 promise_test(async (test) => {
-  var request_token = token();
+  const response = await fetch(`stale-script.py`);
+  const response2 = await fetch(`stale-script.py`);
 
-  const response = await fetch(`stale-script.py?token=` + request_token);
-  const response2 = await fetch(`stale-script.py?token=` + request_token);
-
-  assert_not_equals(response.headers.get('Unique-Id'), response2.headers.get('Unique-Id'));
+  assert_not_equals(response.headers.get('Token'), response2.headers.get('Token'));
 }, 'Second fetch does not return same response');
 </script>
diff --git a/testing/web-platform/tests/fetch/stale-while-revalidate/stale-css.py b/testing/web-platform/tests/fetch/stale-while-revalidate/stale-css.py
index 425c889ac5ec..6f3014db5246 100644
--- a/testing/web-platform/tests/fetch/stale-while-revalidate/stale-css.py
+++ b/testing/web-platform/tests/fetch/stale-while-revalidate/stale-css.py
@@ -1,10 +1,9 @@
 def main(request, response):
 
-    token = request.GET.first("token", None)
-    value = request.server.stash.take(token)
+    cookie = request.cookies.first("Count", None)
     count = 0
-    if value != None:
-      count = int(value)
+    if cookie != None:
+      count = int(cookie.value)
     if request.GET.first("query", None) != None:
       headers = [("Count", count)]
       content = ""
@@ -16,7 +15,6 @@ def main(request, response):
         content = "body { background: rgb(255, 0, 0); }"
 
       headers = [("Content-Type", "text/css"),
-               ("Cache-Control", "private, max-age=0, stale-while-revalidate=60")]
-
-      request.server.stash.put(token, count)
+               ("Set-Cookie", "Count={}".format(count)),
+               ("Cache-Control", "private, max-age=0, stale-while-revalidate=10")]
       return 200, headers, content
diff --git a/testing/web-platform/tests/fetch/stale-while-revalidate/stale-css.tentative.html b/testing/web-platform/tests/fetch/stale-while-revalidate/stale-css.tentative.html
index 3459493f28c2..df03bd962431 100644
--- a/testing/web-platform/tests/fetch/stale-while-revalidate/stale-css.tentative.html
+++ b/testing/web-platform/tests/fetch/stale-while-revalidate/stale-css.tentative.html
@@ -7,24 +7,22 @@ https://github.com/whatwg/fetch/pull/853
 <title>Tests Stale While Revalidate works for css</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/common/utils.js"></script>
 <body>
 <script>
 
-var request_token = token();
 async_test(t => {
   window.onload = t.step_func(() => {
-    t.step_timeout(() => {
+    step_timeout(() => {
       assert_equals(window.getComputedStyle(document.body).getPropertyValue('background-color'), "rgb(0, 128, 0)");
       var link2 = document.createElement("link");
       link2.onload = t.step_func(() => {
         assert_equals(window.getComputedStyle(document.body).getPropertyValue('background-color'), "rgb(0, 128, 0)");
         var checkResult = () => {
           // We poll because we don't know when the revalidation will occur.
-          fetch("stale-css.py?query&token=" + request_token).then(t.step_func((response) => {
+          fetch("stale-css.py?query").then(t.step_func((response) => {
             var count = response.headers.get("Count");
             if (count == '2') {
-              t.done();
+                t.done();
             } else {
               t.step_timeout(checkResult, 25);
             }
@@ -34,7 +32,7 @@ async_test(t => {
       });
       link2.rel = "stylesheet";
       link2.type = "text/css";
-      link2.href = "stale-css.py?token=" + request_token;
+      link2.href = "stale-css.py";
       document.body.appendChild(link2);
     }, 0);
   });
@@ -43,7 +41,7 @@ async_test(t => {
 var link = document.createElement("link");
 link.rel = "stylesheet";
 link.type = "text/css";
-link.href = "stale-css.py?token=" + request_token;
+link.href = "stale-css.py";
 document.body.appendChild(link);
 </script>
 </body>
diff --git a/testing/web-platform/tests/fetch/stale-while-revalidate/stale-image.py b/testing/web-platform/tests/fetch/stale-while-revalidate/stale-image.py
index ce7f0fc78261..42d0764eb91e 100644
--- a/testing/web-platform/tests/fetch/stale-while-revalidate/stale-image.py
+++ b/testing/web-platform/tests/fetch/stale-while-revalidate/stale-image.py
@@ -2,11 +2,10 @@ import os.path
 
 def main(request, response):
 
-    token = request.GET.first("token", None)
-    value = request.server.stash.take(token)
+    cookie = request.cookies.first("Count", None)
     count = 0
-    if value != None:
-      count = int(value)
+    if cookie != None:
+      count = int(cookie.value)
     if request.GET.first("query", None) != None:
       headers = [("Count", count)]
       content = ""
@@ -14,18 +13,18 @@ def main(request, response):
     else:
       count = count + 1
       filename = "green-16x16.png"
-      if count > 1:
+      if cookie > 1:
         filename = "green-256x256.png"
 
       path = os.path.join(os.path.dirname(__file__), "../../images", filename)
       body = open(path, "rb").read()
 
-      request.server.stash.put(token, count)
       response.add_required_headers = False
       response.writer.write_status(200)
       response.writer.write_header("content-length", len(body))
-      response.writer.write_header("Cache-Control", "private, max-age=0, stale-while-revalidate=60")
+      response.writer.write_header("Cache-Control", "private, max-age=0, stale-while-revalidate=10")
       response.writer.write_header("content-type", "image/png")
+      response.writer.write_header("Set-Cookie", "Count={}".format(count))
       response.writer.end_headers()
 
       response.writer.write(body)
diff --git a/testing/web-platform/tests/fetch/stale-while-revalidate/stale-image.tentative.html b/testing/web-platform/tests/fetch/stale-while-revalidate/stale-image.tentative.html
index 8b6a896eb152..d8383acb319c 100644
--- a/testing/web-platform/tests/fetch/stale-while-revalidate/stale-image.tentative.html
+++ b/testing/web-platform/tests/fetch/stale-while-revalidate/stale-image.tentative.html
@@ -7,7 +7,6 @@ https://github.com/whatwg/fetch/pull/853
 <title>Tests Stale While Revalidate works for images</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/common/utils.js"></script>
 <body>
 <!--
 Use a child document to load the second stale image into because
@@ -17,10 +16,9 @@ See: https://html.spec.whatwg.org/#the-list-of-available-images
 <iframe id="child" srcdoc=""></iframe>
 <script>
 
-var request_token = token();
 async_test(t => {
   window.onload = t.step_func(() => {
-    t.step_timeout(() => {
+    step_timeout(() => {
       assert_equals(document.getElementById("firstimage").width, 16, "Width is 16");
       var childDocument = document.getElementById('child').contentDocument;
       var img2 = childDocument.createElement("img");
@@ -28,7 +26,7 @@ async_test(t => {
         assert_equals(img2.width, 16, "image dimension");
         var checkResult = () => {
           // We poll because we don't know when the revalidation will occur.
-          fetch("stale-image.py?query&token=" + request_token).then(t.step_func((response) => {
+          fetch("stale-image.py?query").then(t.step_func((response) => {
             var count = response.headers.get("Count");
             if (count == '2') {
                 t.done();
@@ -39,14 +37,14 @@ async_test(t => {
         };
         t.step_timeout(checkResult, 25);
       });
-      img2.src = "stale-image.py?token=" + request_token;
+      img2.src = "stale-image.py";
       childDocument.body.appendChild(img2);
     }, 0);
   });
 }, 'Cache returns stale resource');
 
 var img = document.createElement("img");
-img.src = "stale-image.py?token=" + request_token;
+img.src = "stale-image.py";
 img.id = "firstimage";
 document.body.appendChild(img);
 </script>
diff --git a/testing/web-platform/tests/fetch/stale-while-revalidate/stale-script.py b/testing/web-platform/tests/fetch/stale-while-revalidate/stale-script.py
index 0f91a9b83486..c17528d8e631 100644
--- a/testing/web-platform/tests/fetch/stale-while-revalidate/stale-script.py
+++ b/testing/web-platform/tests/fetch/stale-while-revalidate/stale-script.py
@@ -1,15 +1,14 @@
 import random, string, datetime
 
-def id_token():
+def token():
    letters = string.ascii_lowercase
    return ''.join(random.choice(letters) for i in range(20))
 
 def main(request, response):
-    token = request.GET.first("token", None)
-    value = request.server.stash.take(token)
+    cookie = request.cookies.first("Count", None)
     count = 0
-    if value != None:
-      count = int(value)
+    if cookie != None:
+      count = int(cookie.value)
     if request.GET.first("query", None) != None:
       headers = [("Count", count)]
       content = ""
@@ -17,10 +16,10 @@ def main(request, response):
     else:
       count = count + 1
 
-      unique_id = id_token()
+      unique_id = token()
       headers = [("Content-Type", "text/javascript"),
-                 ("Cache-Control", "private, max-age=0, stale-while-revalidate=60"),
-                 ("Unique-Id", unique_id)]
+                 ("Cache-Control", "private, max-age=0, stale-while-revalidate=10"),
+                 ("Set-Cookie", "Count={}".format(count)),
+                 ("Token", unique_id)]
       content = "report('{}')".format(unique_id)
-      request.server.stash.put(token, count)
       return 200, headers, content
diff --git a/testing/web-platform/tests/fetch/stale-while-revalidate/stale-script.tentative.html b/testing/web-platform/tests/fetch/stale-while-revalidate/stale-script.tentative.html
index 8cbb54b7dab3..2e04e3905780 100644
--- a/testing/web-platform/tests/fetch/stale-while-revalidate/stale-script.tentative.html
+++ b/testing/web-platform/tests/fetch/stale-while-revalidate/stale-script.tentative.html
@@ -7,12 +7,10 @@ https://github.com/whatwg/fetch/pull/853
 <title>Tests Stale While Revalidate works for scripts</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/common/utils.js"></script>
 <body>
 <script>
 var last_modified;
 var last_modified_count = 0;
-var request_token = token();
 
 // The script will call report via a uniquely generated ID on the subresource.
 // If it is a cache hit the ID will be the same and the test will pass.
@@ -29,13 +27,13 @@ async_test(t => {
   window.onload = t.step_func(() => {
     step_timeout(() => {
       var script = document.createElement("script");
-      script.src = "stale-script.py?token=" + request_token;
+      script.src = "stale-script.py";
       document.body.appendChild(script);
       script.onload = t.step_func(() => {
           assert_equals(last_modified_count, 2, "last modified");
           var checkResult = () => {
             // We poll because we don't know when the revalidation will occur.
-            fetch("stale-script.py?query&token=" + request_token).then(t.step_func((response) => {
+            fetch("stale-script.py?query").then(t.step_func((response) => {
               var count = response.headers.get("Count");
               if (count == '2') {
                   t.done();
@@ -51,7 +49,7 @@ async_test(t => {
 }, 'Cache returns stale resource');
 
 var script = document.createElement("script");
-script.src = "stale-script.py?token=" + request_token;
+script.src = "stale-script.py";
 document.body.appendChild(script);
 </script>
 </body>
diff --git a/testing/web-platform/tests/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-tokenization-noopener.html b/testing/web-platform/tests/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-tokenization-noopener.html
index c955e677899e..c31e75fdf57e 100644
--- a/testing/web-platform/tests/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-tokenization-noopener.html
+++ b/testing/web-platform/tests/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-tokenization-noopener.html
@@ -5,7 +5,158 @@
 <link rel="help" href="https://html.spec.whatwg.org/multipage/#apis-for-creating-and-navigating-browsing-contexts-by-name">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="resources/tokenization-noopener-noreferrer.js"></script>
 <script>
-  booleanTests("noopener");
+var windowURL = 'resources/close-self.html';
+
+// Tests for how windows features are tokenized into 'name', 'value'
+// window features separators are ASCII whitespace, '=' and  ','
+
+test (t => {
+  // Tokenizing `name`: initial window features separators are ignored
+  // Each of these variants should tokenize to ('noopener', '')
+  var featureVariants = [
+    ' noopener',
+    '=noopener',
+    ',,noopener',
+    ',=, noopener',
+    '\n=noopener=',
+    '\tnoopener',
+    '\r,,,=noopener',
+    '\u000Cnoopener'
+  ];
+  featureVariants.forEach(feature => {
+    var win = window.open(windowURL, '', feature);
+    assert_equals(win, null, `"${feature}" should activate feature "noopener"`);
+  });
+}, 'tokenization should skip window features separators before `name`');
+
+test (t => {
+  // Tokenizing `name`: lowercase conversion
+  // Each of these variants should tokenize as feature ('noopener', '')
+  // except where indicated
+  // Note also that `value` is lowercased during tokenization
+  var featureVariants = [
+    'NOOPENER',
+    'noOpenER',
+    '  NOopener',
+    '=NOOPENER',
+    'noopener=1',
+    'NOOPENER=1',
+    'NOOPENER=yes',
+    'noopener=YES',
+  ];
+  featureVariants.forEach(feature => {
+    var win = window.open(windowURL, '', feature);
+    assert_equals(win, null, `"${feature}" should activate feature "noopener"`);
+  });
+}, 'feature `name` should be converted to ASCII lowercase');
+
+test (t => {
+  // After `name` has been collected, ignore any window features separators until '='
+  // except ',' OR a non-window-features-separator — break in those cases
+  // i.e. ignore whitespace until '=' unless a ',' is encountered first
+  // Each of these variants should tokenize as feature ('noopener', '')
+  var featureVariants = [
+    'noopener',
+    ' noopener\r',
+    'noopener\n =',
+    'noopener,',
+    'noopener  =,',
+    ', noopener   =',
+    'noopener,=',
+    'noopener foo', // => ('noopener', ''), ('foo', '')
+    'foo noopener=1', // => ('foo', ''), ('noopener', '1')
+    'foo=\u000Cbar\u000Cnoopener' // => ('foo', 'bar'), ('noopener', '')
+  ];
+  featureVariants.forEach(feature => {
+    var win = window.open(windowURL, '', feature);
+    assert_equals(win, null, `"${feature}" should activate feature "noopener"`);
+  });
+}, 'after `name`, tokenization should skip window features separators that are not "=" or ","');
+
+test (t => {
+  // After initial '=', tokenizing should ignore all separators except ','
+  // before collecting `value`
+  // Each of these variants should tokenize as feature ('noopener', '')
+  // Except where indicated
+  var featureVariants = [
+    'noopener=  yes', // => ('noopener', 'yes')
+    'noopener==,',
+    'noopener=\n ,',
+    'noopener = \t ,',
+    'noopener\n=\r 1,', // => ('noopener', '1')
+    'noopener=,yes', // => ('noopener'), ('yes')
+    'noopener= yes=,', // => ('noopener', 'yes')
+    'noopener = \u000Cyes' // => ('noopener', 'yes')
+  ];
+  featureVariants.forEach(feature => {
+    var win = window.open(windowURL, '', feature);
+    assert_equals(win, null, `"${feature}" should activate feature "noopener"`);
+  });
+}, 'Tokenizing should ignore window feature separators except "," after initial "=" and before value');
+
+test (t => {
+  // Tokenizing `value` should collect any non-separator code points until first separator
+  var featureVariants = [
+    'noopener=1', // => ('noopener', 'noopener')
+    'noopener=yes', // => ('noopener', 'yes')
+    'noopener = yes ,', // => ('noopener', 'yes')
+    'noopener=\nyes  ,', // => ('noopener', 'yes')
+    'noopener=yes yes', // => ('noopener', 'yes'), ('yes', '')
+    'noopener=yes\ts', // => ('noopener', 'yes'), ('s', '')
+    'noopener==', // => ('noopener', '')
+    'noopener=1\n,', // => ('noopener', '1')
+    '==noopener===', // => ('noopener', '')
+    'noopener==\u000C' // => ('noopener', '')
+  ];
+  featureVariants.forEach(feature => {
+    var win = window.open(windowURL, '', feature);
+    assert_equals(win, null, `"${feature}" should set "noopener"`);
+  });
+}, 'Tokenizing should read characters until first window feature separator as `value`');
+
+test (t => {
+  var featureVariants = [
+    'noopener=1',
+    'noopener=2',
+    'noopener=12345',
+    'noopener=1.5',
+    'noopener=-1',
+  ];
+  featureVariants.forEach(feature => {
+    var win = window.open(windowURL, '', feature);
+    assert_equals(win, null, `"${feature}" should activate feature "noopener"`);
+  });
+}, 'Integer values other than 0 should activate the feature');
+
+test (t => {
+  var featureVariants = [
+    'noopener=0',
+    'noopener=0.5',
+    'noopener=error',
+  ];
+  featureVariants.forEach(feature => {
+    var win = window.open(windowURL, '', feature);
+    assert_not_equals(win, null, `"${feature}" should NOT activate feature "noopener"`);
+  });
+}, 'Integer value of 0 should not activate the feature');
+
+test (t => {
+  var invalidFeatureVariants = [
+    '-noopener', //     => ('-noopener', '')
+    'NOOPENERRRR', //   => ('noopenerrr', '')
+    'noOpenErR', //     => ('noopenerr', '')
+    'no_opener', //     => ('no_opener', '')
+    ' no opener', //    => ('no', ''), ('opener', '')
+    'no\nopener', //    => ('no', ''), ('opener', '')
+    'no,opener', //     => ('no', ''), ('opener', '')
+    '\0noopener', //    => ('\0noopener', '')
+    'noopener\u0000=yes', // => ('noopener\0', 'yes')
+    'foo=\u000Cnoopener' // => ('foo', 'noopener')
+  ];
+  invalidFeatureVariants.forEach(feature => {
+    var win = window.open(windowURL, '', feature);
+    assert_not_equals(win, null, `"${feature}" should NOT activate feature "noopener"`);
+  });
+}, 'invalid feature names should not tokenize as "noopener"');
 </script>
diff --git a/testing/web-platform/tests/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-tokenization-noreferrer.html b/testing/web-platform/tests/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-tokenization-noreferrer.html
deleted file mode 100644
index 4807f634fdac..000000000000
--- a/testing/web-platform/tests/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-tokenization-noreferrer.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>HTML: window.open `features`: tokenization -- `noreferrer`</title>
-<meta name=timeout content=long>
-<link rel="help" href="https://html.spec.whatwg.org/multipage/#apis-for-creating-and-navigating-browsing-contexts-by-name">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="resources/tokenization-noopener-noreferrer.js"></script>
-<script>
-  booleanTests("noreferrer");
-</script>
diff --git a/testing/web-platform/tests/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/resources/tokenization-noopener-noreferrer.js b/testing/web-platform/tests/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/resources/tokenization-noopener-noreferrer.js
deleted file mode 100644
index a9d42e26dea1..000000000000
--- a/testing/web-platform/tests/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/resources/tokenization-noopener-noreferrer.js
+++ /dev/null
@@ -1,152 +0,0 @@
-function booleanTests(feature) {
-  const windowURL = 'resources/close-self.html';
-  // Tests for how windows features are tokenized into 'name', 'value'
-  // window features separators are ASCII whitespace, '=' and  ','
-
-  const featureUpper = feature.toUpperCase(),
-        featureSplitBegin = feature.slice(0, 2),
-        featureSplitEnd = feature.slice(2),
-        featureMixedCase = featureSplitBegin.toUpperCase() + featureSplitEnd;
-        featureMixedCase2 = featureSplitBegin + featureSplitEnd.toUpperCase();
-
-  test (t => {
-    // Tokenizing `name`: initial window features separators are ignored
-    // Each of these variants should tokenize to (`${feature}`, '')
-    [
-      ` ${feature}`,
-      `=${feature}`,
-      `,,${feature}`,
-      `,=, ${feature}`,
-      `\n=${feature}=`,
-      `\t${feature}`,
-      `\r,,,=${feature}`,
-      `\u000C${feature}`
-    ].forEach(variant => {
-      const win = window.open(windowURL, "", variant);
-      assert_equals(win, null, `"${variant}" should activate feature "${feature}"`);
-    });
-  }, `Tokenization of "${feature}" should skip window features separators before feature`);
-
-  test (t => {
-    // Tokenizing `name`: lowercase conversion
-    // Each of these variants should tokenize as feature (`${feature}`, '')
-    // except where indicated
-    // Note also that `value` is lowercased during tokenization
-    [
-      `${featureUpper}`,
-      `${featureMixedCase}`,
-      `  ${featureMixedCase2}`,
-      `=${featureUpper}`,
-      `${featureUpper}=1`,
-      `${featureUpper}=1`,
-      `${featureUpper}=yes`,
-      `${feature}=YES`,
-    ].forEach(variant => {
-      const win = window.open(windowURL, '', variant);
-      assert_equals(win, null, `"${variant}" should activate feature "${feature}"`);
-    });
-  }, `Feature "${feature}" should be converted to ASCII lowercase`);
-
-  test (t => {
-    // After `name` has been collected, ignore any window features separators until '='
-    // except ',' OR a non-window-features-separator — break in those cases
-    // i.e. ignore whitespace until '=' unless a ',' is encountered first
-    // Each of these variants should tokenize as feature ('noopener', '')
-    [
-      `${feature}`,
-      ` ${feature}\r`,
-      `${feature}\n =`,
-      `${feature},`,
-      `${feature}  =,`,
-      `, ${feature}   =`,
-      `${feature},=`,
-      `${feature} foo`,
-      `foo ${feature}=1`,
-      `foo=\u000Cbar\u000C${feature}`
-    ].forEach(variant => {
-      const win = window.open(windowURL, '', variant);
-      assert_equals(win, null, `"${variant}" should activate feature "${feature}"`);
-    });
-  }, `After "${feature}", tokenization should skip window features separators that are not "=" or ","`);
-
-  test (t => {
-    // After initial '=', tokenizing should ignore all separators except ','
-    // before collecting `value`
-    // Each of these variants should tokenize as feature ('noopener', '')
-    // Except where indicated
-    [
-      `${feature}=  yes`,
-      `${feature}==,`,
-      `${feature}=\n ,`,
-      `${feature} = \t ,`,
-      `${feature}\n=\r 1,`,
-      `${feature}=,yes`,
-      `${feature}= yes=,`,
-      `${feature} = \u000Cyes`
-    ].forEach(variant => {
-      const win = window.open(windowURL, '', variant);
-      assert_equals(win, null, `"${variant}" should activate feature "${feature}"`);
-    });
-  }, `Tokenizing "${feature}" should ignore window feature separators except "," after initial "=" and before value`);
-
-  test (t => {
-    // Tokenizing `value` should collect any non-separator code points until first separator
-    [
-      `${feature}=1`,
-      `${feature}=yes`,
-      `${feature} = yes ,`,
-      `${feature}=\nyes  ,`,
-      `${feature}=yes yes`,
-      `${feature}=yes\ts`,
-      `${feature}==`,
-      `${feature}=1\n,`,
-      `==${feature}===`,
-      `${feature}==\u000C`
-    ].forEach(variant => {
-      const win = window.open(windowURL, '', variant);
-      assert_equals(win, null, `"${variant}" should set "${feature}"`);
-    });
-  }, `Tokenizing "${feature}" should read characters until first window feature separator as \`value\``);
-
-  test (t => {
-    [
-      `${feature}=1`,
-      `${feature}=2`,
-      `${feature}=12345`,
-      `${feature}=1.5`,
-      `${feature}=-1`,
-    ].forEach(variant => {
-      const win = window.open(windowURL, '', variant);
-      assert_equals(win, null, `"${variant}" should activate feature "${feature}"`);
-    });
-  }, 'Integer values other than 0 should activate the feature');
-
-  test (t => {
-    [
-      `${feature}=0`,
-      `${feature}=0.5`,
-      `${feature}=error`,
-    ].forEach(variant => {
-      const win = window.open(windowURL, '', variant);
-      assert_not_equals(win, null, `"${variant}" should NOT activate feature "${feature}"`);
-    });
-  }, `Integer value of 0 should not activate "${feature}"`);
-
-  test (t => {
-    [
-      `-${feature}`,
-      `${featureUpper}RRR`,
-      `${featureMixedCase}R`,
-      `${featureSplitBegin}_${featureSplitEnd}`,
-      ` ${featureSplitBegin} ${featureSplitEnd}`,
-      `${featureSplitBegin}\n${featureSplitEnd}`,
-      `${featureSplitBegin},${featureSplitEnd}`,
-      `\0${feature}`,
-      `${feature}\u0000=yes`,
-      `foo=\u000C${feature}`
-    ].forEach(variant => {
-      const win = window.open(windowURL, '', variant);
-      assert_not_equals(win, null, `"${variant}" should NOT activate feature "${feature}"`);
-    });
-  }, `Invalid feature names should not tokenize as "${feature}"`);
-}
diff --git a/testing/web-platform/tests/html/browsers/the-window-object/focus.window.js b/testing/web-platform/tests/html/browsers/the-window-object/focus.window.js
deleted file mode 100644
index 6ec7feee281e..000000000000
--- a/testing/web-platform/tests/html/browsers/the-window-object/focus.window.js
+++ /dev/null
@@ -1,15 +0,0 @@
-async_test(t => {
-  const input = document.body.appendChild(document.createElement("input"));
-  input.onfocus = t.step_func(() => {
-    const frame = document.body.appendChild(document.createElement("iframe")),
-          frameW = frame.contentWindow;
-    frameW.onfocus = t.unreached_func();
-    frame.remove();
-    frameW.focus();
-    t.step_timeout(() => {
-      assert_equals(document.activeElement, input);
-      t.done();
-    }, 100);
-  });
-  input.focus();
-});
diff --git a/testing/web-platform/tests/html/browsers/the-window-object/length-attribute.window.js b/testing/web-platform/tests/html/browsers/the-window-object/length-attribute.window.js
deleted file mode 100644
index d56e1e469280..000000000000
--- a/testing/web-platform/tests/html/browsers/the-window-object/length-attribute.window.js
+++ /dev/null
@@ -1,24 +0,0 @@
-async_test(t => {
-  const frame = document.createElement("iframe");
-  frame.srcdoc = "<iframe name=x srcdoc='<iframe name=z></iframe>'></iframe><iframe name=y></iframe>";
-  frame.onload = t.step_func_done(() => {
-    const frameW = frame.contentWindow;
-    assert_equals(frameW.length, 2);
-    assert_not_equals(frameW.x, undefined);
-    assert_not_equals(frameW.y, undefined);
-    assert_equals(frameW.z, undefined);
-    assert_equals(frameW.x, frameW[0]);
-    assert_equals(frameW.y, frameW[1]);
-    const xFrameW = frameW.x;
-    assert_equals(xFrameW.length, 1);
-    assert_not_equals(xFrameW.z, undefined);
-    assert_equals(xFrameW.z, xFrameW[0]);
-    frame.remove();
-    assert_equals(frameW.length, 0);
-    assert_equals(frameW.x, undefined);
-    assert_equals(frameW[0], undefined);
-    assert_equals(xFrameW.length, 0);
-    assert_equals(xFrameW.z, undefined);
-  });
-  document.body.append(frame);
-}, "Window object's length IDL attribute (and named access)");
diff --git a/testing/web-platform/tests/html/browsers/the-window-object/name-attribute.window.js b/testing/web-platform/tests/html/browsers/the-window-object/name-attribute.window.js
deleted file mode 100644
index f266dd7acb96..000000000000
--- a/testing/web-platform/tests/html/browsers/the-window-object/name-attribute.window.js
+++ /dev/null
@@ -1,18 +0,0 @@
-test(() => {
-  const frame = document.createElement("iframe"),
-        name = "A",
-        name2 = "B";
-  frame.setAttribute("name", name);
-  document.body.append(frame);
-  const frameW = frame.contentWindow;
-  assert_equals(frameW.name, name);
-  frameW.name = name2;
-  assert_equals(frame.getAttribute("name"), name);
-  assert_equals(frameW.name, name2);
-  frame.remove();
-  assert_equals(frame.getAttribute("name"), name);
-  assert_equals(frameW.name, "");
-  frameW.name = name2;
-  assert_equals(frame.getAttribute("name"), name);
-  assert_equals(frameW.name, "");
-}, "Window object's name IDL attribute");
diff --git a/testing/web-platform/tests/html/browsers/the-window-object/support/noreferrer-target.html b/testing/web-platform/tests/html/browsers/the-window-object/support/noreferrer-target.html
deleted file mode 100644
index c2446c6fe958..000000000000
--- a/testing/web-platform/tests/html/browsers/the-window-object/support/noreferrer-target.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<script>
-  const channelName = location.search.substr(1),
-        channel = new BroadcastChannel(channelName);
-  channel.postMessage({ name: window.name,
-                        haveOpener: window.opener !== null,
-                        referrer: document.referrer });
-
-  // Because messages are not delivered synchronously and because closing a
-  // browsing context prompts the eventual clearing of all task sources, this
-  // document should not be closed until the opener document has confirmed
-  // receipt.
-  channel.onmessage = () => window.close();
-</script>
diff --git a/testing/web-platform/tests/html/browsers/the-window-object/window-open-noreferrer.html b/testing/web-platform/tests/html/browsers/the-window-object/window-open-noreferrer.html
deleted file mode 100644
index 92b72cdb5f1e..000000000000
--- a/testing/web-platform/tests/html/browsers/the-window-object/window-open-noreferrer.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!doctype html>
-<meta charset=utf-8>
-<title>window.open() with "noreferrer" tests</title>
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script>
-async_test(t => {
-  const channelName = "343243423432",
-        channel = new BroadcastChannel(channelName);
-  window.open("support/noreferrer-target.html?" + channelName, "", "noreferrer");
-  channel.onmessage = t.step_func_done(e => {
-    // Send message first so if asserts throw the popup is still closed
-    channel.postMessage(null);
-
-    assert_equals(e.data.name, "");
-    assert_equals(e.data.referrer, "");
-    assert_equals(e.data.haveOpener, false);
-  });
-});
-</script>
diff --git a/testing/web-platform/tests/html/browsers/windows/embedded-opener-remove-frame.html b/testing/web-platform/tests/html/browsers/windows/embedded-opener-remove-frame.html
deleted file mode 100644
index 9bce93f0888e..000000000000
--- a/testing/web-platform/tests/html/browsers/windows/embedded-opener-remove-frame.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<!doctype html>
-<title>opener and "removed" embedded documents</title>
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<div id=log></div>
-<iframe name=matchesastring></iframe>
-<script>
-async_test(t => {
-  const frame = document.querySelector("iframe"),
-        frameW = frame.contentWindow;
-  frame.onload = t.step_func(() => {
-    // Firefox and Chrome/Safari load differently
-    if (frame.contentWindow.location.href === "about:blank") {
-      return;
-    }
-
-    // Test bits
-    assert_equals(frameW.opener, window, "opener before removal");
-
-    const openerDesc = Object.getOwnPropertyDescriptor(frameW, "opener"),
-          openerGet = openerDesc.get;
-
-    assert_equals(openerGet(), window, "opener before removal via directly invoking the getter");
-    frame.remove();
-    assert_equals(frameW.opener, null, "opener after removal");
-    assert_equals(openerGet(), null, "opener after removal via directly invoking the getter");
-
-    frameW.opener = null;
-    assert_equals(openerGet(), null, "opener after setting it null via directly invoking the getter");
-    const openerDescNull = Object.getOwnPropertyDescriptor(frameW, "opener");
-    assert_not_equals(openerDescNull, openerDesc);
-    assert_object_equals(openerDescNull, openerDesc);
-
-    frameW.opener = "immaterial";
-    assert_equals(openerGet(), null, "opener after setting it \"immaterial\" via directly invoking the getter");
-    const openerDescImmaterial = Object.getOwnPropertyDescriptor(frameW, "opener");
-    assert_equals(openerDescImmaterial.value, "immaterial");
-    assert_true(openerDescImmaterial.writable);
-    assert_true(openerDescImmaterial.enumerable);
-    assert_true(openerDescImmaterial.configurable);
-
-    t.done();
-  });
-  window.open("/common/blank.html", "matchesastring");
-});
-</script>
diff --git a/testing/web-platform/tests/html/browsers/windows/nested-browsing-contexts/name-attribute.window.js b/testing/web-platform/tests/html/browsers/windows/nested-browsing-contexts/name-attribute.window.js
deleted file mode 100644
index 69908af71b72..000000000000
--- a/testing/web-platform/tests/html/browsers/windows/nested-browsing-contexts/name-attribute.window.js
+++ /dev/null
@@ -1,58 +0,0 @@
-// META: script=/common/get-host-info.sub.js
-
-[
-  "frame", // This works without <frameset>, so great
-  "iframe",
-  "object",
-  "embed",
-].forEach(element => {
-  [
-    null,
-    "",
-    "initialvalue"
-  ].forEach(initialNameValue => {
-    [
-      "same-origin",
-      "cross-origin"
-    ].forEach(originType => {
-      async_test(t => {
-        const ident = element + initialNameValue + originType,
-              file = `${new URL("resources/post-to-parent.html", location.href).pathname}?ident=${ident}`,
-              child = originType === "same-origin" ? file : `${get_host_info().HTTP_REMOTE_ORIGIN}${file}`,
-              frame = document.createElement(element),
-              expectedNameValue = initialNameValue || "";
-        let state = "set";
-        const listener = t.step_func(e => {
-          if (e.data.ident === ident) {
-            assert_equals(e.data.name, expectedNameValue); // This check is always the same
-            if (state === "set") {
-              frame.setAttribute("name", "meh");
-              state = "remove"
-              e.source.postMessage(null, "*");
-              return;
-            }
-            if (state === "remove") {
-              frame.removeAttribute("name");
-              state = "done";
-              e.source.postMessage(null, "*");
-              return;
-            }
-            if (state === "done") {
-              t.done();
-            }
-          }
-        });
-        frame.setAttribute(element === "object" ? "data" : "src", child);
-        if (initialNameValue !== null) {
-          frame.setAttribute("name", initialNameValue);
-        }
-        t.add_cleanup(() => {
-          self.removeEventListener("message", listener);
-          frame.remove();
-        });
-        self.addEventListener("message", listener);
-        document.body.append(frame);
-      }, `${originType} <${element}${initialNameValue !== null ? ' name=' + initialNameValue : ''}>`);
-    });
-  });
-});
diff --git a/testing/web-platform/tests/html/browsers/windows/nested-browsing-contexts/resources/post-to-parent.html b/testing/web-platform/tests/html/browsers/windows/nested-browsing-contexts/resources/post-to-parent.html
deleted file mode 100644
index 302e9d9cc12b..000000000000
--- a/testing/web-platform/tests/html/browsers/windows/nested-browsing-contexts/resources/post-to-parent.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<script>
-const ident = new URL(location).searchParams.get("ident"),
-      post = () => parent.postMessage({ name: window.name, ident }, "*");
-onmessage = () => post();
-post();
-</script>
diff --git a/testing/web-platform/tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-rendering-empty-cue-ref.html b/testing/web-platform/tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-rendering-empty-cue-ref.html
deleted file mode 100644
index 837c4fd7833d..000000000000
--- a/testing/web-platform/tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-rendering-empty-cue-ref.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-wait">
-<title>Reference for track rendering with empty cue</title>
-<script src="/common/reftest-wait.js"></script>
-<style>
-html { overflow:hidden }
-body { margin:0 }
-.container {
-  display: inline-block;
-  position: relative;
-}
-</style>
-<div class="container">
-  <video width="320" height="180">
-    <source src="/media/white.webm" type="video/webm">
-    <source src="/media/white.mp4" type="video/mp4">
-    <script>
-      var video = document.querySelector("video");
-      video.addEventListener('playing', () => {
-        video.pause();
-        takeScreenshot();
-      }, { once: true});
-      video.play();
-    </script>
-  </video>
-</div>
-</html>
\ No newline at end of file
diff --git a/testing/web-platform/tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-rendering-empty-cue.html b/testing/web-platform/tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-rendering-empty-cue.html
index c2d300999eea..427189f6fc78 100644
--- a/testing/web-platform/tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-rendering-empty-cue.html
+++ b/testing/web-platform/tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-rendering-empty-cue.html
@@ -1,26 +1,16 @@
 <!DOCTYPE html>
-<html class="reftest-wait">
-<title>Track rendering with empty cue</title>
-<link rel="match" href="track-cue-rendering-empty-cue-ref.html">
-<style>
-html { overflow:hidden }
-body { margin:0 }
-</style>
-<script src="/common/reftest-wait.js"></script>
-<video width="320" height="180">
-  <source src="/media/white.webm" type="video/webm">
-  <source src="/media/white.mp4" type="video/mp4">
-  <script>
-    var video = document.querySelector("video");
-    var track = video.addTextTrack("captions", "regular captions track", "en");
-    track.addCue(new VTTCue(0, 4, ""));
-    track.mode = "showing";
+<title>Empty cues</title>
+<script src="/common/media.js"></script>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+async_test(function(t) {
+    var video = document.createElement("video");
+    video.src = getVideoURI("/media/test");
+    video.addTextTrack("captions", "regular captions track", "en");
+    video.textTracks[0].addCue(new VTTCue(0, 4, ""));
 
-    video.addEventListener('playing', () => {
-      video.pause();
-      takeScreenshot();
-    }, { once: true});
+    video.onplaying = t.step_func_done();
     video.play();
-  </script>
-</video>
-</html>
\ No newline at end of file
+});
+</script>
\ No newline at end of file
diff --git a/testing/web-platform/tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-rendering-line-doesnt-fit-ref.html b/testing/web-platform/tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-rendering-line-doesnt-fit-ref.html
index c4c14bc2a394..8354041eb2a0 100644
--- a/testing/web-platform/tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-rendering-line-doesnt-fit-ref.html
+++ b/testing/web-platform/tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-rendering-line-doesnt-fit-ref.html
@@ -20,6 +20,7 @@
   background: green;
   color: green;
   font-size: 120px;
+  padding: 2px;
 }
 </style>
 <div class="container">
diff --git a/testing/web-platform/tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-rendering-transformed-video-ref.html b/testing/web-platform/tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-rendering-transformed-video-ref.html
index c3ee804c485b..39461350b089 100644
--- a/testing/web-platform/tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-rendering-transformed-video-ref.html
+++ b/testing/web-platform/tests/html/semantics/embedded-content/media-elements/track/track-element/track-cue-rendering-transformed-video-ref.html
@@ -22,6 +22,7 @@
   background: green;
   color: green;
   font-size: 50px;
+  padding: 2px;
 }
 </style>
 <div class="container">
diff --git a/testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_anchor_download_allow_downloads_without_user_activation.sub.tentative.html b/testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_anchor_download_allow_downloads_without_user_activation.sub.tentative.html
deleted file mode 100644
index 32409f220f0a..000000000000
--- a/testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_anchor_download_allow_downloads_without_user_activation.sub.tentative.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>&lt;a download&gt; triggered download in sandbox is allowed by allow-downloads-without-user-activation.</title>
-<link rel="help" href="https://html.spec.whatwg.org/multipage/#attr-iframe-sandbox">
-<link rel="help" href="https://html.spec.whatwg.org/multipage/#the-iframe-element">
-<script src="/resources/testharness.js"></script>
-<script src='/resources/testharnessreport.js'></script>
-<script src="support/iframe_sandbox_download_helper.js"></script>
-<body>
-<script>
-"use strict";
-
-async_test(t => {
-    const token = "{{$id:uuid()}}";
-    var iframe = document.createElement("iframe");
-    iframe.srcdoc = "<a>Download</a>";
-    iframe.sandbox = "allow-same-origin allow-downloads-without-user-activation";
-    iframe.onload = t.step_func(function () {
-        iframe.contentWindow.addEventListener(
-            "unload", t.unreached_func("Unexpected navigation."));
-        var anchor = iframe.contentDocument.getElementsByTagName('a')[0];
-        anchor.href = "support/download_stash.py?token=" + token;
-        anchor.download = null;
-        anchor.click();
-        AssertDownloadSuccess(t, token, DownloadVerifyDelay());
-    });
-
-    document.body.appendChild(iframe);
-}, "<a download> triggered download in sandbox is allowed by allow-downloads-without-user-activation.");
-</script>
-</body>
diff --git a/testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_anchor_download_block_downloads_without_user_activation.sub.tentative.html b/testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_anchor_download_block_downloads_without_user_activation.sub.tentative.html
deleted file mode 100644
index abd4d7c5e0d7..000000000000
--- a/testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_anchor_download_block_downloads_without_user_activation.sub.tentative.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>&lt;a download&gt; triggered download in sandbox is blocked.</title>
-<link rel="help" href="https://html.spec.whatwg.org/multipage/#attr-iframe-sandbox">
-<link rel="help" href="https://html.spec.whatwg.org/multipage/#the-iframe-element">
-<script src="/resources/testharness.js"></script>
-<script src='/resources/testharnessreport.js'></script>
-<script src="support/iframe_sandbox_download_helper.js"></script>
-<body>
-<script>
-"use strict";
-
-async_test(t => {
-    const token = "{{$id:uuid()}}";
-    var iframe = document.createElement("iframe");
-    iframe.srcdoc = "<a>Download</a>";
-    iframe.sandbox = "allow-same-origin";
-    iframe.onload = t.step_func(function () {
-        iframe.contentWindow.addEventListener(
-            "unload", t.unreached_func("Unexpected navigation."));
-        var anchor = iframe.contentDocument.getElementsByTagName('a')[0];
-        anchor.href = "support/download_stash.py?token=" + token;
-        anchor.download = null;
-        anchor.click();
-        AssertDownloadFailure(t, token, DownloadVerifyDelay());
-    });
-
-    document.body.appendChild(iframe);
-}, "<a download> triggered download in sandbox is blocked.");
-</script>
-</body>
diff --git a/testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigation_download_allow_downloads_without_user_activation.sub.tentative.html b/testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigation_download_allow_downloads_without_user_activation.sub.tentative.html
deleted file mode 100644
index 4fee27f9ba92..000000000000
--- a/testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigation_download_allow_downloads_without_user_activation.sub.tentative.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>Navigation resulted download in sandbox is allowed by allow-downloads-without-user-activation.</title>
-<link rel="help" href="https://html.spec.whatwg.org/multipage/#attr-iframe-sandbox">
-<link rel="help" href="https://html.spec.whatwg.org/multipage/#the-iframe-element">
-<script src="/resources/testharness.js"></script>
-<script src='/resources/testharnessreport.js'></script>
-<script src="support/iframe_sandbox_download_helper.js"></script>
-<body>
-<script>
-"use strict";
-
-async_test(t => {
-    const token = "{{$id:uuid()}}";
-    var iframe = document.createElement("iframe");
-    iframe.srcdoc = "<a>Download</a>";
-    iframe.sandbox = "allow-same-origin allow-downloads-without-user-activation";
-    iframe.onload = t.step_func(function () {
-        iframe.contentWindow.addEventListener(
-            "unload", t.unreached_func("Unexpected navigation."));
-        var anchor = iframe.contentDocument.getElementsByTagName('a')[0];
-        // Set |finish-delay| to let the server stream a response over a  period
-        // of time, so it's able to catch potential download cancellation by
-        // detecting a socket close.
-        anchor.href = "support/download_stash.py?token=" + token + "&finish-delay=" + StreamDownloadFinishDelay();
-        anchor.click();
-        AssertDownloadSuccess(t, token, StreamDownloadFinishDelay() + DownloadVerifyDelay());
-    });
-
-    document.body.appendChild(iframe);
-}, "Navigation resulted download in sandbox is allowed by allow-downloads-without-user-activation.");
-</script>
-</body>
diff --git a/testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigation_download_block_downloads_without_user_activation.sub.tentative.html b/testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigation_download_block_downloads_without_user_activation.sub.tentative.html
deleted file mode 100644
index 9b9246c393ec..000000000000
--- a/testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigation_download_block_downloads_without_user_activation.sub.tentative.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>Navigation resulted download in sandbox is blocked.</title>
-<link rel="help" href="https://html.spec.whatwg.org/multipage/#attr-iframe-sandbox">
-<link rel="help" href="https://html.spec.whatwg.org/multipage/#the-iframe-element">
-<script src="/resources/testharness.js"></script>
-<script src='/resources/testharnessreport.js'></script>
-<script src="support/iframe_sandbox_download_helper.js"></script>
-<body>
-<script>
-"use strict";
-
-async_test(t => {
-    const token = "{{$id:uuid()}}";
-    var iframe = document.createElement("iframe");
-    iframe.srcdoc = "<a>Download</a>";
-    iframe.sandbox = "allow-same-origin";
-    iframe.onload = t.step_func(function () {
-        iframe.contentWindow.addEventListener(
-            "unload", t.unreached_func("Unexpected navigation."));
-        var anchor = iframe.contentDocument.getElementsByTagName('a')[0];
-        // Set |finish-delay| to let the server stream a response over a  period
-        // of time, so it's able to catch potential download cancellation by
-        // detecting a socket close.
-        anchor.href = "support/download_stash.py?token=" + token + "&finish-delay=" + StreamDownloadFinishDelay();
-        anchor.click();
-        AssertDownloadFailure(t, token, StreamDownloadFinishDelay() + DownloadVerifyDelay());
-    });
-
-    document.body.appendChild(iframe);
-}, "Navigation resulted download in sandbox is blocked.");
-</script>
-</body>
diff --git a/testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/support/download_stash.py b/testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/support/download_stash.py
deleted file mode 100644
index 24e1dfd58f76..000000000000
--- a/testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/support/download_stash.py
+++ /dev/null
@@ -1,28 +0,0 @@
-import time
-
-def main(request, response):
-    token = request.GET["token"]
-    response.status = 200
-    response.headers.append("Content-Type", "text/html")
-    if "verify-token" in request.GET:
-      if request.server.stash.take(token):
-        return 'TOKEN_SET'
-      return 'TOKEN_NOT_SET'
-
-    if "finish-delay" not in request.GET:
-      # <a download>
-      request.server.stash.put(token, True)
-      return
-
-    # navigation to download
-    response.headers.append("Content-Disposition", "attachment")
-    response.write_status_headers()
-    finish_delay = float(request.GET["finish-delay"]) / 1E3
-    count = 10
-    single_delay = finish_delay / count
-    for i in range(count): # pylint: disable=unused-variable
-        time.sleep(single_delay)
-        response.writer.write_content("\n")
-        if not response.writer.flush():
-          return
-    request.server.stash.put(token, True)
diff --git a/testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_download_helper.js b/testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_download_helper.js
deleted file mode 100644
index 7090e7662ca8..000000000000
--- a/testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/support/iframe_sandbox_download_helper.js
+++ /dev/null
@@ -1,37 +0,0 @@
-function StreamDownloadFinishDelay() {
-    return 1000;
-}
-
-function DownloadVerifyDelay() {
-    return 1000;
-}
-
-function VerifyDownload(test_obj, token, timeout, expect_download) {
-    var verify_token = test_obj.step_func(function () {
-        var xhr = new XMLHttpRequest();
-        xhr.open('GET', 'support/download_stash.py?verify-token&token=' + token);
-        xhr.onload = test_obj.step_func(function(e) {
-            if (expect_download) {
-              if (xhr.response != "TOKEN_SET") {
-                // Always retry, and rely on the test timeout to conclude that
-                // download didn't happen and to fail the test.
-                test_obj.step_timeout(verify_token, DownloadVerifyDelay());
-                return;
-              }
-            } else {
-              assert_equals(xhr.response, "TOKEN_NOT_SET", "Expect no download to happen, but got one.");
-            }
-            test_obj.done();
-        });
-        xhr.send();
-    });
-    test_obj.step_timeout(verify_token, timeout);
-}
-
-function AssertDownloadSuccess(test_obj, token, timeout) {
-    VerifyDownload(test_obj, token, timeout, true);
-}
-
-function AssertDownloadFailure(test_obj, token, timeout) {
-    VerifyDownload(test_obj, token, timeout, false);
-}
diff --git a/testing/web-platform/tests/html/semantics/forms/form-submission-target/rel-base-target.html b/testing/web-platform/tests/html/semantics/forms/form-submission-target/rel-base-target.html
deleted file mode 100644
index 222be95d2e8a..000000000000
--- a/testing/web-platform/tests/html/semantics/forms/form-submission-target/rel-base-target.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<title>&lt;form rel> with &lt;base target></title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src=resources/reltester.js></script>
-<base target=_blank>
-<div id=log></div>
-<form action=resources/endpoint.html><input type=hidden name=channelname></form>
-<script>
-const submitter = document.querySelector("form"),
-      channelInput = document.querySelector("input");
-relTester(submitter, channelInput, "<base target>");
-</script>
diff --git a/testing/web-platform/tests/html/semantics/forms/form-submission-target/rel-button-target.html b/testing/web-platform/tests/html/semantics/forms/form-submission-target/rel-button-target.html
deleted file mode 100644
index 76fa8685905a..000000000000
--- a/testing/web-platform/tests/html/semantics/forms/form-submission-target/rel-button-target.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<!DOCTYPE html>
-<title>&lt;form rel> with &lt;button formtarget></title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src=resources/reltester.js></script>
-<div id=log></div>
-<form action=resources/endpoint.html><input type=hidden name=channelname><button type=submit formtarget=_blank></form>
-<script>
-const submitter = document.querySelector("button"),
-      channelInput = document.querySelector("input");
-relTester(submitter, channelInput, "<button formtarget>");
-</script>
diff --git a/testing/web-platform/tests/html/semantics/forms/form-submission-target/rel-form-target.html b/testing/web-platform/tests/html/semantics/forms/form-submission-target/rel-form-target.html
deleted file mode 100644
index 58611f41a9fd..000000000000
--- a/testing/web-platform/tests/html/semantics/forms/form-submission-target/rel-form-target.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<!DOCTYPE html>
-<title>&lt;form rel target></title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src=resources/reltester.js></script>
-<div id=log></div>
-<form action=resources/endpoint.html target=_blank><input type=hidden name=channelname></form>
-<script>
-const submitter = document.querySelector("form"),
-      channelInput = document.querySelector("input");
-relTester(submitter, channelInput, "<form target>");
-</script>
diff --git a/testing/web-platform/tests/html/semantics/forms/form-submission-target/rel-input-target.html b/testing/web-platform/tests/html/semantics/forms/form-submission-target/rel-input-target.html
deleted file mode 100644
index b80e0240bae3..000000000000
--- a/testing/web-platform/tests/html/semantics/forms/form-submission-target/rel-input-target.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<title>&lt;form rel> with &lt;input formtarget></title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src=resources/reltester.js></script>
-<base target=_blank>
-<div id=log></div>
-<form action=resources/endpoint.html><input type=hidden name=channelname><input type=submit formtarget=_blank></form>
-<script>
-const submitter = document.querySelector("input[type=submit]"),
-      channelInput = document.querySelector("input");
-relTester(submitter, channelInput, "<input formtarget>");
-</script>
diff --git a/testing/web-platform/tests/html/semantics/forms/form-submission-target/resources/endpoint.html b/testing/web-platform/tests/html/semantics/forms/form-submission-target/resources/endpoint.html
deleted file mode 100644
index be9e7942927d..000000000000
--- a/testing/web-platform/tests/html/semantics/forms/form-submission-target/resources/endpoint.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<script>
-  const channelName = new URL(location).searchParams.get("channelname"),
-        channel = new BroadcastChannel(channelName);
-  channel.postMessage({ haveOpener: window.opener !== null,
-                        referrer: document.referrer });
-  // Because messages are not delivered synchronously and because closing a
-  // browsing context prompts the eventual clearing of all task sources, this
-  // document should not be closed until the opener document has confirmed
-  // receipt.
-  channel.onmessage = () => window.close();
-</script>
diff --git a/testing/web-platform/tests/html/semantics/forms/form-submission-target/resources/reltester.js b/testing/web-platform/tests/html/semantics/forms/form-submission-target/resources/reltester.js
deleted file mode 100644
index 0fa9774ce4f1..000000000000
--- a/testing/web-platform/tests/html/semantics/forms/form-submission-target/resources/reltester.js
+++ /dev/null
@@ -1,65 +0,0 @@
-function relTester(submitter, channelInput, title) {
-  [
-    {
-      rel: "",
-      exposed: "all"
-    },
-    {
-      rel: "noopener",
-      exposed: "noopener"
-    },
-    {
-      rel: "noreferrer",
-      exposed: "noreferrer"
-    },
-    {
-      rel: "opener",
-      exposed: "all"
-    },
-    {
-      rel: "noopener noreferrer",
-      exposed: "noreferrer"
-    },
-    {
-      rel: "noreferrer opener",
-      exposed: "noreferrer"
-    },
-    {
-      rel: "opener noopener",
-      exposed: "noopener"
-    }
-  ].forEach(relTest => {
-    // Use promise_test to submit only after one test concluded
-    promise_test(t => {
-      return new Promise(resolve => {
-        const channelName = Date.now() + relTest.rel,
-              channel = new BroadcastChannel(channelName);
-        let form = submitter;
-        if (submitter.localName !== "form") {
-          form = submitter.form;
-        }
-        form.rel = relTest.rel;
-        channelInput.value = channelName;
-        if (submitter.localName !== "form") {
-          submitter.click();
-        } else {
-          submitter.submit();
-        }
-        channel.onmessage = t.step_func(e => {
-          if (relTest.exposed === "all" || relTest.exposed === "noopener") {
-            assert_equals(e.data.referrer, window.location.href, "referrer");
-          } else {
-            assert_equals(e.data.referrer, "", "referrer");
-          }
-          if (relTest.exposed === "all") {
-            assert_true(e.data.haveOpener, "opener");
-          } else {
-            assert_false(e.data.haveOpener, "opener");
-          }
-          resolve();
-        });
-        t.add_cleanup(() => channel.postMessage(null));
-      });
-    }, `<form rel="${relTest.rel}"> with ${title}`);
-  });
-}
diff --git a/testing/web-platform/tests/html/semantics/rellist-feature-detection.html b/testing/web-platform/tests/html/semantics/rellist-feature-detection.html
index d290439d8ee6..f4ce621172eb 100644
--- a/testing/web-platform/tests/html/semantics/rellist-feature-detection.html
+++ b/testing/web-platform/tests/html/semantics/rellist-feature-detection.html
@@ -15,7 +15,7 @@ link_support_table['link'] = {
                  'noreferrer', 'noopener']
 };
 link_support_table['a'] =  {
-  supported : ['noreferrer', 'noopener', 'opener'],
+  supported : ['noreferrer', 'noopener'],
   unsupported : ['author', 'bookmark', 'external', 'help', 'license',
                  'nofollow', 'pingback', 'prev', 'search', 'tag',
                  'modulepreload', 'preload', 'preconnect', 'dns-prefetch',
@@ -24,7 +24,6 @@ link_support_table['a'] =  {
                  'apple-touch-icon-precomposed', 'canonical']
 };
 link_support_table['area'] = link_support_table['a'];
-link_support_table['form'] = link_support_table['form'];
 
 function test_rellist(tag_name, rel_table) {
   let element = document.createElement(tag_name);
@@ -78,6 +77,5 @@ test(function() {
   test_rellist('LINK', link_support_table['link']);
   test_rellist('A', link_support_table['a']);
   test_rellist('AREA', link_support_table['area']);
-  test_rellist('FORM', link_support_table['form']);
 }, 'Make sure that relList based feature detection is working');
 </script>
diff --git a/testing/web-platform/tests/html/semantics/text-level-semantics/the-a-element/a.rel-setter-01.html b/testing/web-platform/tests/html/semantics/text-level-semantics/the-a-element/a.rel-setter-01.html
index c319266887b7..83c69de30142 100644
--- a/testing/web-platform/tests/html/semantics/text-level-semantics/the-a-element/a.rel-setter-01.html
+++ b/testing/web-platform/tests/html/semantics/text-level-semantics/the-a-element/a.rel-setter-01.html
@@ -13,8 +13,8 @@ test(function() {
   var a = document.getElementById("test");
 
   test(function() {
-    a.rel = "noreferrer";
-    assert_equals(a.getAttribute("rel"), "noreferrer");
+    a.rel = "noreferrer"
+    assert_equals(a.rel, "noreferrer");
   }, "Test anchor's rel setter");
 });
 </script>
diff --git a/testing/web-platform/tests/html/webappapis/animation-frames/cancel-pending.html b/testing/web-platform/tests/html/webappapis/animation-frames/cancel-pending.html
deleted file mode 100644
index 9c9aff511d03..000000000000
--- a/testing/web-platform/tests/html/webappapis/animation-frames/cancel-pending.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!doctype html>
-<title>cancelAnimationFrame cancels a pending animation frame callback</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<link rel="help" href="https://html.spec.whatwg.org/multipage/imagebitmap-and-animations.html#run-the-animation-frame-callbacks">
-<div id="log"></div>
-<script>
-async_test(t => {
-  let didCall = false;
-
-  function callbackOne() {
-    cancelAnimationFrame(twoHandle);
-    requestAnimationFrame(t.step_func(() => {
-      assert_false(didCall, 'Should NOT have called the second callback');
-      t.done();
-    }));
-  }
-
-  function callbackTwo() {
-    didCall = true;
-  }
-
-  requestAnimationFrame(callbackOne);
-  const twoHandle = requestAnimationFrame(callbackTwo);
-}, 'cancelAnimationFrame cancels a pending animation frame callback');
-</script>
diff --git a/testing/web-platform/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/navigator_user_agent.tentative.html b/testing/web-platform/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/navigator_user_agent.tentative.html
deleted file mode 100644
index dd4c531070c8..000000000000
--- a/testing/web-platform/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/navigator_user_agent.tentative.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script>
-  test(t => {
-    assert_false("getUserAgent" in navigator);
-  }, "navigator.getUserAgent() is not available in non-secure contexts.");
-</script>
diff --git a/testing/web-platform/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/navigator_user_agent.tentative.https.html b/testing/web-platform/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/navigator_user_agent.tentative.https.html
deleted file mode 100644
index 5f0dba6bcf72..000000000000
--- a/testing/web-platform/tests/html/webappapis/system-state-and-capabilities/the-navigator-object/navigator_user_agent.tentative.https.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/webrtc/dictionary-helper.js"></script>
-<script>
-  test(t => {
-    assert_true("getUserAgent" in navigator);
-  }, "navigator.getUserAgent() is exposed.");
-
-  promise_test(t => {
-    return navigator.getUserAgent()
-      .then(ua => {
-        // TODO(web-platform-tests/wpt#9106): Use `idlharness.js` once it supports dictionaries.
-        assert_string_field(ua, "brand");
-        assert_string_field(ua, "version");
-        assert_string_field(ua, "platform");
-        assert_string_field(ua, "architecture");
-        assert_string_field(ua, "model");
-      });
-  }, "navigator.getUserAgent() returns a UserAgentMetadata object.");
-</script>
diff --git a/testing/web-platform/tests/import-maps/@std/__dir__.headers b/testing/web-platform/tests/import-maps/@std/__dir__.headers
deleted file mode 100644
index e7ec0d6699d0..000000000000
--- a/testing/web-platform/tests/import-maps/@std/__dir__.headers
+++ /dev/null
@@ -1 +0,0 @@
-Content-Type: text/javascript
diff --git a/testing/web-platform/tests/import-maps/@std/blank b/testing/web-platform/tests/import-maps/@std/blank
deleted file mode 100644
index 38e1891bf7d5..000000000000
--- a/testing/web-platform/tests/import-maps/@std/blank
+++ /dev/null
@@ -1 +0,0 @@
-log.push("relative:@std/blank");
diff --git a/testing/web-platform/tests/import-maps/@std/none b/testing/web-platform/tests/import-maps/@std/none
deleted file mode 100644
index 69e165cce5e2..000000000000
--- a/testing/web-platform/tests/import-maps/@std/none
+++ /dev/null
@@ -1 +0,0 @@
-log.push("relative:@std/none");
diff --git a/testing/web-platform/tests/import-maps/README.md b/testing/web-platform/tests/import-maps/README.md
deleted file mode 100644
index 3803e350c844..000000000000
--- a/testing/web-platform/tests/import-maps/README.md
+++ /dev/null
@@ -1,9 +0,0 @@
-Tests for [Import Maps](https://github.com/WICG/import-maps).
-
-Because the spec itself is still under development and there are ongoing spec
-discussions, the tests are all tentative.
-
-Also, some tests are based on Chromium's behavior which reflects an older
-version of import maps spec ("package name maps" around May 2018), and have
-dependency to Chromium's implementation (internals.resolveModuleSpecifier).
-These dependencies should be removed, once the spec matures.
diff --git a/testing/web-platform/tests/import-maps/acquire-import-maps-flag/dynamic-import/success.tentative.html b/testing/web-platform/tests/import-maps/acquire-import-maps-flag/dynamic-import/success.tentative.html
deleted file mode 100644
index 512cd7fa6974..000000000000
--- a/testing/web-platform/tests/import-maps/acquire-import-maps-flag/dynamic-import/success.tentative.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE html>
-<html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script>
-// https://github.com/WICG/import-maps/blob/master/spec.md#when-import-maps-can-be-encountered
-const t = async_test(
-  'After dynamic imports, import maps should fire error events');
-const log = [];
-// To ensure we are testing that the flag is cleared at the beginning of module
-// script loading unconditionally, not at the end of loading or not at the
-// first attempt to resolve a module specifier, trickle(d1) is used to ensure
-// the following import map is added after module loading is triggered but
-// before the first module script is parsed.
-promise_test(() => import('../../resources/empty.js?pipe=trickle(d1)'),
-             "A dynamic import succeeds");
-</script>
-<script type="importmap" onload="t.assert_unreached('onload')" onerror="t.done()">
-{
-  "imports": {
-    "../../resources/log.js?pipe=sub&name=A": "../../resources/log.js?pipe=sub&name=B"
-  }
-}
-</script>
-<script>
-promise_test(() => {
-  return import("../../resources/log.js?pipe=sub&name=A")
-    .then(() => assert_array_equals(log, ["log:A"]))
-  },
-  'After a dynamic import(), import maps are not effective');
-</script>
diff --git a/testing/web-platform/tests/import-maps/acquire-import-maps-flag/script-tag/success.tentative.html b/testing/web-platform/tests/import-maps/acquire-import-maps-flag/script-tag/success.tentative.html
deleted file mode 100644
index 7f319b04758f..000000000000
--- a/testing/web-platform/tests/import-maps/acquire-import-maps-flag/script-tag/success.tentative.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE html>
-<html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script>
-// https://github.com/WICG/import-maps/blob/master/spec.md#when-import-maps-can-be-encountered
-const t = async_test(
-  'After <script type="module"> import maps should fire error events');
-const log = [];
-</script>
-<script type="module" src="../../resources/empty.js?pipe=trickle(d1)"></script>
-<script type="importmap" onerror="t.done()">
-{
-  "imports": {
-    "../../resources/log.js?pipe=sub&name=A": "../../resources/log.js?pipe=sub&name=B"
-  }
-}
-</script>
-<script>
-promise_test(() => {
-  return import("../../resources/log.js?pipe=sub&name=A")
-    .then(() => assert_array_equals(log, ["log:A"]))
-  },
-  'After <script type="module"> import maps are not effective');
-</script>
diff --git a/testing/web-platform/tests/import-maps/acquire-import-maps-flag/worker-request/success.tentative.html b/testing/web-platform/tests/import-maps/acquire-import-maps-flag/worker-request/success.tentative.html
deleted file mode 100644
index ceef4100aad0..000000000000
--- a/testing/web-platform/tests/import-maps/acquire-import-maps-flag/worker-request/success.tentative.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE html>
-<html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script>
-// https://github.com/WICG/import-maps/blob/master/spec.md#when-import-maps-can-be-encountered
-const t = async_test(
-  'After module worker creation, import maps should fire error events');
-const log = [];
-new Worker('../../resources/empty.js?pipe=trickle(d1)', {type: "module"});
-</script>
-<script type="importmap" onerror="t.done()">
-{
-  "imports": {
-    "../../resources/log.js?pipe=sub&name=A": "../../resources/log.js?pipe=sub&name=B"
-  }
-}
-</script>
-<script>
-promise_test(() => {
-  return import("../../resources/log.js?pipe=sub&name=A")
-    .then(() => assert_array_equals(log, ["A"]))
-  },
-  'After module worker creation import maps are not effective');
-</script>
diff --git a/testing/web-platform/tests/import-maps/bare.sub.tentative.html b/testing/web-platform/tests/import-maps/bare.sub.tentative.html
deleted file mode 100644
index 5bfb6b520723..000000000000
--- a/testing/web-platform/tests/import-maps/bare.sub.tentative.html
+++ /dev/null
@@ -1,70 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="resources/test-helper.js"></script>
-
-<script>
-// "bare/..." (i.e. without leading "./") are bare specifiers
-// (not relative paths).
-//
-// Discussions about notations for builtin modules are ongoing, e.g.
-// https://github.com/tc39/proposal-javascript-standard-library/issues/12
-// Currently the tests expects two notations are accepted.
-// TODO: Once the discussions converge, update the tests.
-const importMap = `
-{
-  "imports": {
-    "bare/bare": "./resources/log.js?pipe=sub&name=bare",
-    "bare/cross-origin-bare": "https://{{domains[www1]}}:{{ports[https][0]}}/import-maps/resources/log.js?pipe=sub&name=cross-origin-bare",
-    "bare/to-data": "data:text/javascript,log.push('dataURL')",
-
-    "bare/std-blank": "std:blank",
-    "bare/blank": "@std/blank",
-    "bare/std-none": "std:none",
-    "bare/none": "@std/none",
-
-    "bare/to-bare": "bare/bare"
-  }
-}
-`;
-
-const tests = {
-  // Arrays of expected results for:
-  // - <script src type="module">,
-  // - <script src> (classic script),
-  // - static import, and
-  // - dynamic import.
-
-  // Currently, Chromium's implementation resolves import maps as a part of
-  // specifier resolution, and thus failure in import map resolution causes
-  // a parse error, not fetch error. Therefore, we use Result.PARSE_ERROR
-  // below. https://crbug.com/928435
-
-  // Bare to HTTP(S).
-  "bare/bare":
-    [Result.URL, Result.URL, "log:bare", "log:bare"],
-  "bare/cross-origin-bare":
-    [Result.URL, Result.URL, "log:cross-origin-bare", "log:cross-origin-bare"],
-
-  // Bare to data:
-  "bare/to-data":
-    [Result.URL, Result.URL, "dataURL", "dataURL"],
-
-  // Bare to built-in.
-  "bare/std-blank":
-    [Result.URL, Result.URL, Result.BUILTIN, Result.BUILTIN],
-  "bare/blank":
-    [Result.URL, Result.URL, Result.BUILTIN, Result.BUILTIN],
-  "bare/std-none":
-    [Result.URL, Result.URL, Result.PARSE_ERROR, Result.PARSE_ERROR],
-  "bare/none":
-    [Result.URL, Result.URL, Result.PARSE_ERROR, Result.PARSE_ERROR],
-
-  // Bare to bare mapping is disabled.
-  "bare/to-bare":
-    [Result.URL, Result.URL, Result.PARSE_ERROR, Result.PARSE_ERROR],
-};
-
-doTests(importMap, null, tests);
-</script>
-<body>
diff --git a/testing/web-platform/tests/import-maps/bare/__dir__.headers b/testing/web-platform/tests/import-maps/bare/__dir__.headers
deleted file mode 100644
index e7ec0d6699d0..000000000000
--- a/testing/web-platform/tests/import-maps/bare/__dir__.headers
+++ /dev/null
@@ -1 +0,0 @@
-Content-Type: text/javascript
diff --git a/testing/web-platform/tests/import-maps/bare/bare b/testing/web-platform/tests/import-maps/bare/bare
deleted file mode 100644
index 1011e866b81d..000000000000
--- a/testing/web-platform/tests/import-maps/bare/bare
+++ /dev/null
@@ -1 +0,0 @@
-log.push("relative:bare/bare");
diff --git a/testing/web-platform/tests/import-maps/bare/blank b/testing/web-platform/tests/import-maps/bare/blank
deleted file mode 100644
index 841d433acf72..000000000000
--- a/testing/web-platform/tests/import-maps/bare/blank
+++ /dev/null
@@ -1 +0,0 @@
-log.push("relative:bare/blank");
diff --git a/testing/web-platform/tests/import-maps/bare/cross-origin-bare b/testing/web-platform/tests/import-maps/bare/cross-origin-bare
deleted file mode 100644
index 64851cc8e245..000000000000
--- a/testing/web-platform/tests/import-maps/bare/cross-origin-bare
+++ /dev/null
@@ -1 +0,0 @@
-log.push("relative:bare/cross-origin-bare");
diff --git a/testing/web-platform/tests/import-maps/bare/none b/testing/web-platform/tests/import-maps/bare/none
deleted file mode 100644
index 2aec0d72826f..000000000000
--- a/testing/web-platform/tests/import-maps/bare/none
+++ /dev/null
@@ -1 +0,0 @@
-log.push("relative:bare/none");
diff --git a/testing/web-platform/tests/import-maps/bare/std-blank b/testing/web-platform/tests/import-maps/bare/std-blank
deleted file mode 100644
index 5ded98fd382a..000000000000
--- a/testing/web-platform/tests/import-maps/bare/std-blank
+++ /dev/null
@@ -1 +0,0 @@
-log.push("relative:bare/std-blank");
diff --git a/testing/web-platform/tests/import-maps/bare/std-none b/testing/web-platform/tests/import-maps/bare/std-none
deleted file mode 100644
index 1437d9ff1e0c..000000000000
--- a/testing/web-platform/tests/import-maps/bare/std-none
+++ /dev/null
@@ -1 +0,0 @@
-log.push("relative:bare/std-none");
diff --git a/testing/web-platform/tests/import-maps/bare/to-bare b/testing/web-platform/tests/import-maps/bare/to-bare
deleted file mode 100644
index bdb3791bc947..000000000000
--- a/testing/web-platform/tests/import-maps/bare/to-bare
+++ /dev/null
@@ -1 +0,0 @@
-log.push("relative:bare/to-bare");
diff --git a/testing/web-platform/tests/import-maps/bare/to-data b/testing/web-platform/tests/import-maps/bare/to-data
deleted file mode 100644
index 6f25c5af1241..000000000000
--- a/testing/web-platform/tests/import-maps/bare/to-data
+++ /dev/null
@@ -1 +0,0 @@
-log.push("relative:bare/to-data");
diff --git a/testing/web-platform/tests/import-maps/builtin-empty.tentative.html b/testing/web-platform/tests/import-maps/builtin-empty.tentative.html
deleted file mode 100644
index aba28d18e043..000000000000
--- a/testing/web-platform/tests/import-maps/builtin-empty.tentative.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="resources/test-helper.js"></script>
-
-<script>
-const importMap = `
-{
-  "imports": {
-    "./resources/log.js?pipe=sub&name=empty": [ "@std/" ],
-    "./resources/log.js?pipe=sub&name=empty-fallback": [
-      "@std/",
-      "./resources/log.js?pipe=sub&name=empty-fallback"
-    ]
-  }
-}
-`;
-
-const tests = {
-  // Arrays of expected results for:
-  // - <script src type="module">,
-  // - <script src> (classic script),
-  // - static import, and
-  // - dynamic import.
-
-  // Discussions about notations are ongoing, e.g.
-  // https://github.com/tc39/proposal-javascript-standard-library/issues/12
-  // Currently the tests expects two notations are accepted.
-  // TODO: Once the discussions converge, update this and related tests.
-  "std:":
-    [Result.FETCH_ERROR, Result.FETCH_ERROR, Result.FETCH_ERROR, Result.FETCH_ERROR],
-  "@std/":
-    [Result.FETCH_ERROR, Result.PARSE_ERROR, Result.FETCH_ERROR, Result.FETCH_ERROR],
-
-  "./resources/log.js?pipe=sub&name=empty":
-    [Result.URL, Result.URL, Result.PARSE_ERROR, Result.PARSE_ERROR],
-  "./resources/log.js?pipe=sub&name=empty-fallback":
-    [Result.URL, Result.URL, Result.URL, Result.URL],
-};
-
-doTests(importMap, null, tests);
-</script>
-<body>
diff --git a/testing/web-platform/tests/import-maps/builtin-import-scheme.tentative.html b/testing/web-platform/tests/import-maps/builtin-import-scheme.tentative.html
deleted file mode 100644
index 6a27ef5aee23..000000000000
--- a/testing/web-platform/tests/import-maps/builtin-import-scheme.tentative.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="resources/test-helper.js"></script>
-
-<script>
-const tests = {
-  // Arrays of expected results for:
-  // - <script src type="module">,
-  // - <script src> (classic script),
-  // - static import, and
-  // - dynamic import.
-
-  // Currently direct use of import: URLs are disabled.
-  "import:std:blank":
-    [Result.FETCH_ERROR, Result.FETCH_ERROR, Result.FETCH_ERROR, Result.FETCH_ERROR],
-  "import:@std/blank":
-    [Result.FETCH_ERROR, Result.FETCH_ERROR, Result.FETCH_ERROR, Result.FETCH_ERROR],
-  "import:std:none":
-    [Result.FETCH_ERROR, Result.FETCH_ERROR, Result.FETCH_ERROR, Result.FETCH_ERROR],
-  "import:@std/none":
-    [Result.FETCH_ERROR, Result.FETCH_ERROR, Result.FETCH_ERROR, Result.FETCH_ERROR],
-};
-
-doTests(null, null, tests);
-</script>
-<body>
diff --git a/testing/web-platform/tests/import-maps/builtin.tentative.html b/testing/web-platform/tests/import-maps/builtin.tentative.html
deleted file mode 100644
index e85289e4d884..000000000000
--- a/testing/web-platform/tests/import-maps/builtin.tentative.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="resources/test-helper.js"></script>
-
-<script>
-const tests = {
-  // Arrays of expected results for:
-  // - <script src type="module">,
-  // - <script src> (classic script),
-  // - static import, and
-  // - dynamic import.
-
-  // Discussions about notations are ongoing, e.g.
-  // https://github.com/tc39/proposal-javascript-standard-library/issues/12
-  // Currently the tests expects two notations are accepted.
-  // TODO: Once the discussions converge, update this and related tests.
-  "std:blank":
-    [Result.BUILTIN, Result.FETCH_ERROR, Result.BUILTIN, Result.BUILTIN],
-  "@std/blank":
-    [Result.URL, Result.URL, Result.BUILTIN, Result.BUILTIN],
-  "std:none":
-    [Result.FETCH_ERROR, Result.FETCH_ERROR, Result.FETCH_ERROR, Result.FETCH_ERROR],
-  "@std/none":
-    [Result.URL, Result.URL, Result.FETCH_ERROR, Result.FETCH_ERROR],
-};
-
-doTests(null, null, tests);
-</script>
-<body>
diff --git a/testing/web-platform/tests/import-maps/data.sub.tentative.html b/testing/web-platform/tests/import-maps/data.sub.tentative.html
deleted file mode 100644
index 1c7172bf7c6f..000000000000
--- a/testing/web-platform/tests/import-maps/data.sub.tentative.html
+++ /dev/null
@@ -1,72 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="resources/test-helper.js"></script>
-
-<script>
-// "bare/..." (i.e. without leading "./") are bare specifiers
-// (not relative paths).
-//
-// Discussions about notations for builtin modules are ongoing, e.g.
-// https://github.com/tc39/proposal-javascript-standard-library/issues/12
-// Currently the tests expects two notations are accepted.
-// TODO: Once the discussions converge, update the tests.
-const importMap = `
-{
-  "imports": {
-    "bare": "./resources/log.js?pipe=sub&name=bare",
-
-    "data:text/javascript,log.push('data:foo')": "./resources/log.js?pipe=sub&name=foo",
-    "data:text/javascript,log.push('data:cross-origin-foo')": "https://{{domains[www1]}}:{{ports[https][0]}}/import-maps/resources/log.js?pipe=sub&name=cross-origin-foo",
-    "data:text/javascript,log.push('data:to-data')": "data:text/javascript,log.push('dataURL')",
-
-    "data:text/javascript,log.push('data:std-blank')": "std:blank",
-    "data:text/javascript,log.push('data:blank')": "@std/blank",
-    "data:text/javascript,log.push('data:std-none')": "std:none",
-    "data:text/javascript,log.push('data:none')": "@std/none",
-
-    "data:text/javascript,log.push('data:to-bare')": "bare"
-  }
-}
-`;
-
-const tests = {
-  // Arrays of expected results for:
-  // - <script src type="module">,
-  // - <script src> (classic script),
-  // - static import, and
-  // - dynamic import.
-
-  // Currently, Chromium's implementation resolves import maps as a part of
-  // specifier resolution, and thus failure in import map resolution causes
-  // a parse error, not fetch error. Therefore, we use Result.PARSE_ERROR
-  // below. https://crbug.com/928435
-
-  // data: to HTTP(S).
-  "data:text/javascript,log.push('data:foo')":
-    [Result.URL, Result.URL, "log:foo", "log:foo"],
-  "data:text/javascript,log.push('data:cross-origin-foo')":
-    [Result.URL, Result.URL, "log:cross-origin-foo", "log:cross-origin-foo"],
-
-  // data: to data:
-  "data:text/javascript,log.push('data:to-data')":
-    [Result.URL, Result.URL, "dataURL", "dataURL"],
-
-  // data: to built-in.
-  "data:text/javascript,log.push('data:std-blank')":
-    [Result.URL, Result.URL, Result.BUILTIN, Result.BUILTIN],
-  "data:text/javascript,log.push('data:blank')":
-    [Result.URL, Result.URL, Result.BUILTIN, Result.BUILTIN],
-  "data:text/javascript,log.push('data:std-none')":
-    [Result.URL, Result.URL, Result.PARSE_ERROR, Result.PARSE_ERROR],
-  "data:text/javascript,log.push('data:none')":
-    [Result.URL, Result.URL, Result.PARSE_ERROR, Result.PARSE_ERROR],
-
-  // data: to bare mapping is disabled.
-  "data:text/javascript,log.push('data:to-bare')":
-    [Result.URL, Result.URL, Result.PARSE_ERROR, Result.PARSE_ERROR],
-};
-
-doTests(importMap, null, tests);
-</script>
-<body>
diff --git a/testing/web-platform/tests/import-maps/fallback-disallowed.sub.tentative.html b/testing/web-platform/tests/import-maps/fallback-disallowed.sub.tentative.html
deleted file mode 100644
index 3f89e8f12dfe..000000000000
--- a/testing/web-platform/tests/import-maps/fallback-disallowed.sub.tentative.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="resources/test-helper.js"></script>
-
-<script>
-// Fallbacks from external URLs (such as HTTPS URLs) are
-// blocked by ongoing spec discussions, for example
-// https://github.com/WICG/import-maps/issues/76.
-// https://crbug.com/928435
-//
-// This test, as well as Chromium's implementation, rejects broader range of
-// fallbacks (not only those from HTTPS), to avoid potential spec and
-// interoperability issues.
-// The only allowed fallback pattern is fallbacks from bare specifiers with
-// two elements, which are listed in fallback.sub.tentative.html.
-const importMap = `
-{
-  "imports": {
-    "bare": "./resources/log.js?pipe=sub&name=bare",
-
-    "./resources/log.js?pipe=sub&name=http-to-builtin": [
-      "./resources/log.js?pipe=sub&name=http-to-builtin",
-      "@std/blank"
-    ],
-
-    "./resources/log.js?pipe=sub&name=fallback-to-different-url-1": [
-      "@std/blank",
-      "./resources/log.js?pipe=sub&name=something-different"
-    ],
-    "./resources/log.js?pipe=sub&name=fallback-to-different-url-2": [
-      "@std/none",
-      "./resources/log.js?pipe=sub&name=something-different2"
-    ],
-    "./resources/log.js?pipe=sub&name=fallback-to-different-origin-1": [
-      "@std/blank",
-      "https://{{domains[www1]}}:{{ports[https][0]}}/import-maps/resources/log.js?pipe=sub&name=fallback-to-different-origin-1"
-    ],
-    "./resources/log.js?pipe=sub&name=fallback-to-different-origin-2": [
-      "@std/none",
-      "https://{{domains[www1]}}:{{ports[https][0]}}/import-maps/resources/log.js?pipe=sub&name=fallback-to-different-origin-2"
-    ],
-
-    "./resources/log.js?pipe=sub&name=more-than-two-values-1": [
-      "@std/none",
-      "@std/blank",
-      "./resources/log.js?pipe=sub&name=more-than-two-values-1"
-    ],
-    "./resources/log.js?pipe=sub&name=more-than-two-values-2": [
-      "@std/none",
-      "./resources/log.js?pipe=sub&name=more-than-two-values-2",
-      "@std/blank"
-    ],
-    "./resources/log.js?pipe=sub&name=fallback-from-http": [
-      "./resources/log.js?pipe=sub&name=non-built-in",
-      "./resources/log.js?pipe=sub&name=fallback-from-http"
-    ],
-    "./resources/log.js?pipe=sub&name=fallback-from-data-1": [
-      "data:text/plain,",
-      "./resources/log.js?pipe=sub&name=fallback-from-http"
-    ],
-    "./resources/log.js?pipe=sub&name=fallback-from-data-2": [
-      "data:text/javascript,log.push('dataURL')",
-      "./resources/log.js?pipe=sub&name=fallback-from-http"
-    ]
-  }
-}
-`;
-const tests = {};
-for (const key in JSON.parse(importMap).imports) {
-  if (key === "bare") {
-    continue;
-  }
-  tests[key] =
-    [Result.URL, Result.URL, Result.PARSE_ERROR, Result.PARSE_ERROR];
-}
-doTests(importMap, null, tests);
-</script>
-<body>
diff --git a/testing/web-platform/tests/import-maps/fallback.sub.tentative.html b/testing/web-platform/tests/import-maps/fallback.sub.tentative.html
deleted file mode 100644
index 4cf3e18182a1..000000000000
--- a/testing/web-platform/tests/import-maps/fallback.sub.tentative.html
+++ /dev/null
@@ -1,84 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="resources/test-helper.js"></script>
-
-<script>
-// This tests is for fallbacks with the pattern of
-// `"https://some.external/url": ["@std/x", "https://some.external/url"]`
-// which maps "https://some.external/url" to "@std/x" if "@std/x" is
-// implemented, or leaves it unmodified otherwise.
-//
-// This is the primary use case where fallback should work.
-// Some other patterns of fallbacks are intentionally blocked due to ongoing
-// spec issues. See fallback-disallowed.sub.tentative.html.
-const importMap = `
-{
-  "imports": {
-    "./resources/log.js?pipe=sub&name=blank": [
-      "@std/blank",
-      "./resources/log.js?pipe=sub&name=blank"
-    ],
-    "./resources/log.js?pipe=sub&name=none": [
-      "@std/none",
-      "./resources/log.js?pipe=sub&name=none"
-    ],
-    "https://{{domains[www1]}}:{{ports[https][0]}}/import-maps/resources/log.js?pipe=sub&name=cross-origin-blank": [
-      "@std/blank",
-      "https://{{domains[www1]}}:{{ports[https][0]}}/import-maps/resources/log.js?pipe=sub&name=cross-origin-blank"
-    ],
-    "https://{{domains[www1]}}:{{ports[https][0]}}/import-maps/resources/log.js?pipe=sub&name=cross-origin-none": [
-      "@std/none",
-      "https://{{domains[www1]}}:{{ports[https][0]}}/import-maps/resources/log.js?pipe=sub&name=cross-origin-none"
-    ],
-
-    "./resources/log.js?pipe=sub&name=std-blank": [
-      "std:blank",
-      "./resources/log.js?pipe=sub&name=std-blank"
-    ],
-    "./resources/log.js?pipe=sub&name=std-none": [
-      "std:none",
-      "./resources/log.js?pipe=sub&name=std-none"
-    ],
-    "https://{{domains[www1]}}:{{ports[https][0]}}/import-maps/resources/log.js?pipe=sub&name=std-cross-origin-blank": [
-      "std:blank",
-      "https://{{domains[www1]}}:{{ports[https][0]}}/import-maps/resources/log.js?pipe=sub&name=std-cross-origin-blank"
-    ],
-    "https://{{domains[www1]}}:{{ports[https][0]}}/import-maps/resources/log.js?pipe=sub&name=std-cross-origin-none": [
-      "std:none",
-      "https://{{domains[www1]}}:{{ports[https][0]}}/import-maps/resources/log.js?pipe=sub&name=std-cross-origin-none"
-    ]
-
-  }
-}
-`;
-const tests = {
-  // Arrays of expected results for:
-  // - <script src type="module">,
-  // - <script src> (classic script),
-  // - static import, and
-  // - dynamic import.
-  // Result.URL indicates that the specifier was not re-mapped by import maps,
-  // i.e. either considered as a relative path, or fallback occured.
-  "./resources/log.js?pipe=sub&name=blank":
-    [Result.URL, Result.URL, Result.BUILTIN, Result.BUILTIN],
-  "./resources/log.js?pipe=sub&name=none":
-    [Result.URL, Result.URL, Result.URL, Result.URL],
-  "https://{{domains[www1]}}:{{ports[https][0]}}/import-maps/resources/log.js?pipe=sub&name=cross-origin-blank":
-    [Result.URL, Result.URL, Result.BUILTIN, Result.BUILTIN],
-  "https://{{domains[www1]}}:{{ports[https][0]}}/import-maps/resources/log.js?pipe=sub&name=cross-origin-none":
-    [Result.URL, Result.URL, Result.URL, Result.URL],
-
-  "./resources/log.js?pipe=sub&name=std-blank":
-    [Result.URL, Result.URL, Result.BUILTIN, Result.BUILTIN],
-  "./resources/log.js?pipe=sub&name=std-none":
-    [Result.URL, Result.URL, Result.URL, Result.URL],
-  "https://{{domains[www1]}}:{{ports[https][0]}}/import-maps/resources/log.js?pipe=sub&name=std-cross-origin-blank":
-    [Result.URL, Result.URL, Result.BUILTIN, Result.BUILTIN],
-  "https://{{domains[www1]}}:{{ports[https][0]}}/import-maps/resources/log.js?pipe=sub&name=std-cross-origin-none":
-    [Result.URL, Result.URL, Result.URL, Result.URL],
-};
-
-doTests(importMap, null, tests);
-</script>
-<body>
diff --git a/testing/web-platform/tests/import-maps/http.sub.tentative.html b/testing/web-platform/tests/import-maps/http.sub.tentative.html
deleted file mode 100644
index bd24f3535507..000000000000
--- a/testing/web-platform/tests/import-maps/http.sub.tentative.html
+++ /dev/null
@@ -1,72 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="resources/test-helper.js"></script>
-
-<script>
-// "bare/..." (i.e. without leading "./") are bare specifiers
-// (not relative paths).
-//
-// Discussions about notations for builtin modules are ongoing, e.g.
-// https://github.com/tc39/proposal-javascript-standard-library/issues/12
-// Currently the tests expects two notations are accepted.
-// TODO: Once the discussions converge, update the tests.
-const importMap = `
-{
-  "imports": {
-    "bare": "./resources/log.js?pipe=sub&name=bare",
-
-    "./resources/log.js?pipe=sub&name=foo": "./resources/log.js?pipe=sub&name=bar",
-    "./resources/log.js?pipe=sub&name=cross-origin-foo": "https://{{domains[www1]}}:{{ports[https][0]}}/import-maps/resources/log.js?pipe=sub&name=cross-origin-bar",
-    "./resources/log.js?pipe=sub&name=to-data": "data:text/javascript,log.push('dataURL')",
-
-    "./resources/log.js?pipe=sub&name=std-blank": "std:blank",
-    "./resources/log.js?pipe=sub&name=blank": "@std/blank",
-    "./resources/log.js?pipe=sub&name=std-none": "std:none",
-    "./resources/log.js?pipe=sub&name=none": "@std/none",
-
-    "./resources/log.js?pipe=sub&name=to-bare": "bare"
-  }
-}
-`;
-
-const tests = {
-  // Arrays of expected results for:
-  // - <script src type="module">,
-  // - <script src> (classic script),
-  // - static import, and
-  // - dynamic import.
-
-  // Currently, Chromium's implementation resolves import maps as a part of
-  // specifier resolution, and thus failure in import map resolution causes
-  // a parse error, not fetch error. Therefore, we use Result.PARSE_ERROR
-  // below. https://crbug.com/928435
-
-  // HTTP(S) to HTTP(S).
-  "{{location[server]}}/import-maps/resources/log.js?pipe=sub&name=foo":
-    [Result.URL, Result.URL, "log:bar", "log:bar"],
-  "{{location[server]}}/import-maps/resources/log.js?pipe=sub&name=cross-origin-foo":
-    [Result.URL, Result.URL, "log:cross-origin-bar", "log:cross-origin-bar"],
-
-  // HTTP(S) to data:
-  "{{location[server]}}/import-maps/resources/log.js?pipe=sub&name=to-data":
-    [Result.URL, Result.URL, "dataURL", "dataURL"],
-
-  // HTTP(S) to built-in.
-  "{{location[server]}}/import-maps/resources/log.js?pipe=sub&name=std-blank":
-    [Result.URL, Result.URL, Result.BUILTIN, Result.BUILTIN],
-  "{{location[server]}}/import-maps/resources/log.js?pipe=sub&name=blank":
-    [Result.URL, Result.URL, Result.BUILTIN, Result.BUILTIN],
-  "{{location[server]}}/import-maps/resources/log.js?pipe=sub&name=std-none":
-    [Result.URL, Result.URL, Result.PARSE_ERROR, Result.PARSE_ERROR],
-  "{{location[server]}}/import-maps/resources/log.js?pipe=sub&name=none":
-    [Result.URL, Result.URL, Result.PARSE_ERROR, Result.PARSE_ERROR],
-
-  // HTTP(S) to bare mapping is disabled.
-  "{{location[server]}}/import-maps/resources/log.js?pipe=sub&name=to-bare":
-    [Result.URL, Result.URL, Result.PARSE_ERROR, Result.PARSE_ERROR],
-};
-
-doTests(importMap, null, tests);
-</script>
-<body>
diff --git a/testing/web-platform/tests/import-maps/module-map-key.tentative.html b/testing/web-platform/tests/import-maps/module-map-key.tentative.html
deleted file mode 100644
index 13bd122c6731..000000000000
--- a/testing/web-platform/tests/import-maps/module-map-key.tentative.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE html>
-<html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script type="importmap">
-{
-  "imports": {
-    "./resources/log.js?pipe=sub&name=A": "./resources/log.js?pipe=sub&name=B"
-  }
-}
-</script>
-<script>
-const log = [];
-
-// This test reflects the Chromium's current implementation.
-// If the import map resolution is moved into the fetch spec, the module map's
-// key will become the URL/specifier BEFORE import map resolution.
-// https://crbug.com/928435
-promise_test(() => {
-  return import("./resources/log.js?pipe=sub&name=A")
-    .then(() => import("./resources/log.js?pipe=sub&name=B"))
-    .then(() => assert_array_equals(log, ["log:B"]))
-  },
-  "Module map's key is the URL after import map resolution");
-</script>
diff --git a/testing/web-platform/tests/import-maps/resolving.tentative.html b/testing/web-platform/tests/import-maps/resolving.tentative.html
deleted file mode 100644
index f2b09a7ae024..000000000000
--- a/testing/web-platform/tests/import-maps/resolving.tentative.html
+++ /dev/null
@@ -1,81 +0,0 @@
-<!DOCTYPE html>
-<html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script>
-setup({allow_uncaught_exception : true});
-
-// Hacky glue code to run Jest-based tests as WPT tests.
-// Only supports resolving.js.
-function require(name) {
-  return {
-    'URL': URL,
-    'parseFromString': parseFromString,
-    'resolve': resolve
-  };
-}
-
-function expect(v) {
-  return {
-    toMatchURL: expected => assert_equals(v, expected),
-    toThrow: expected => assert_throws(expected(), v)
-  };
-}
-
-let current_message = '';
-function describe(message, f) {
-  const old = current_message;
-  if (current_message !== '') {
-    current_message += ' / ';
-  }
-  current_message += message;
-  f();
-  current_message = old;
-}
-function it(message, f) {
-  const old = current_message;
-  if (current_message !== '') {
-    current_message += ' / ';
-  }
-  current_message += message;
-  test(t => t.step_func(f)(), current_message);
-  current_message = old;
-}
-
-// Creates a new Document (via <iframe>) and add an inline import map.
-// Currently document.write() is used to make everything synchronous, which
-// is just needed for running the existing Jest-based tests easily.
-function parseFromString(mapString, mapBaseURL) {
-  const iframe = document.createElement('iframe');
-  document.body.appendChild(iframe);
-  iframe.contentDocument.write(`
-    <base href="${mapBaseURL}">
-    <script>
-    let isError = false;
-    function onError() {
-      isError = true;
-    }
-    </sc` + `ript>
-    <script type="importmap" onerror="onError()">
-    ${mapString}
-    </sc` + `ript>
-  `);
-  iframe.contentDocument.close();
-  return iframe;
-}
-
-// URL resolution is tested using Chromium's `internals`.
-// TODO(hiroshige): Remove the Chromium-specific dependency.
-function resolve(specifier, map, baseURL) {
-  return internals.resolveModuleSpecifier(specifier,
-                                          baseURL,
-                                          map.contentDocument);
-}
-
-</script>
-
-<!--
-resolving.js is
-https://github.com/WICG/import-maps/blob/master/reference-implementation/__tests__/resolving.js
--->
-<script type="module" src="resources/resolving.js"></script>
diff --git a/testing/web-platform/tests/import-maps/resources/log.js b/testing/web-platform/tests/import-maps/resources/log.js
deleted file mode 100644
index a024a29bf248..000000000000
--- a/testing/web-platform/tests/import-maps/resources/log.js
+++ /dev/null
@@ -1 +0,0 @@
-log.push("log:{{GET[name]}}");
diff --git a/testing/web-platform/tests/import-maps/resources/log.js.headers b/testing/web-platform/tests/import-maps/resources/log.js.headers
deleted file mode 100644
index cb762eff8068..000000000000
--- a/testing/web-platform/tests/import-maps/resources/log.js.headers
+++ /dev/null
@@ -1 +0,0 @@
-Access-Control-Allow-Origin: *
diff --git a/testing/web-platform/tests/import-maps/resources/resolving.js b/testing/web-platform/tests/import-maps/resources/resolving.js
deleted file mode 100644
index ec2645e59911..000000000000
--- a/testing/web-platform/tests/import-maps/resources/resolving.js
+++ /dev/null
@@ -1,206 +0,0 @@
-'use strict';
-const { URL } = require('url');
-const { parseFromString } = require('../lib/parser.js');
-const { resolve } = require('../lib/resolver.js');
-
-const mapBaseURL = new URL('https://example.com/app/index.html');
-const scriptURL = new URL('https://example.com/js/app.mjs');
-
-function makeResolveUnderTest(mapString) {
-  const map = parseFromString(mapString, mapBaseURL);
-  return specifier => resolve(specifier, map, scriptURL);
-}
-
-describe('Unmapped', () => {
-  const resolveUnderTest = makeResolveUnderTest(`{}`);
-
-  it('should resolve ./ specifiers as URLs', () => {
-    expect(resolveUnderTest('./foo')).toMatchURL('https://example.com/js/foo');
-    expect(resolveUnderTest('./foo/bar')).toMatchURL('https://example.com/js/foo/bar');
-    expect(resolveUnderTest('./foo/../bar')).toMatchURL('https://example.com/js/bar');
-    expect(resolveUnderTest('./foo/../../bar')).toMatchURL('https://example.com/bar');
-  });
-
-  it('should resolve ../ specifiers as URLs', () => {
-    expect(resolveUnderTest('../foo')).toMatchURL('https://example.com/foo');
-    expect(resolveUnderTest('../foo/bar')).toMatchURL('https://example.com/foo/bar');
-    expect(resolveUnderTest('../../../foo/bar')).toMatchURL('https://example.com/foo/bar');
-  });
-
-  it('should resolve / specifiers as URLs', () => {
-    expect(resolveUnderTest('/foo')).toMatchURL('https://example.com/foo');
-    expect(resolveUnderTest('/foo/bar')).toMatchURL('https://example.com/foo/bar');
-    expect(resolveUnderTest('/../../foo/bar')).toMatchURL('https://example.com/foo/bar');
-    expect(resolveUnderTest('/../foo/../bar')).toMatchURL('https://example.com/bar');
-  });
-
-  it('should parse absolute fetch-scheme URLs', () => {
-    expect(resolveUnderTest('about:good')).toMatchURL('about:good');
-    expect(resolveUnderTest('https://example.net')).toMatchURL('https://example.net/');
-    expect(resolveUnderTest('https://ex%41mple.com/')).toMatchURL('https://example.com/');
-    expect(resolveUnderTest('https:example.org')).toMatchURL('https://example.org/');
-    expect(resolveUnderTest('https://///example.com///')).toMatchURL('https://example.com///');
-  });
-
-  it('should fail for absolute non-fetch-scheme URLs', () => {
-    expect(() => resolveUnderTest('mailto:bad')).toThrow(TypeError);
-    expect(() => resolveUnderTest('import:bad')).toThrow(TypeError);
-    expect(() => resolveUnderTest('javascript:bad')).toThrow(TypeError);
-    expect(() => resolveUnderTest('wss:bad')).toThrow(TypeError);
-  });
-
-  it('should fail for strings not parseable as absolute URLs and not starting with ./ ../ or /', () => {
-    expect(() => resolveUnderTest('foo')).toThrow(TypeError);
-    expect(() => resolveUnderTest('\\foo')).toThrow(TypeError);
-    expect(() => resolveUnderTest(':foo')).toThrow(TypeError);
-    expect(() => resolveUnderTest('@foo')).toThrow(TypeError);
-    expect(() => resolveUnderTest('%2E/foo')).toThrow(TypeError);
-    expect(() => resolveUnderTest('%2E%2E/foo')).toThrow(TypeError);
-    expect(() => resolveUnderTest('.%2Ffoo')).toThrow(TypeError);
-    expect(() => resolveUnderTest('https://ex ample.org/')).toThrow(TypeError);
-    expect(() => resolveUnderTest('https://example.com:demo')).toThrow(TypeError);
-    expect(() => resolveUnderTest('http://[www.example.com]/')).toThrow(TypeError);
-  });
-});
-
-describe('Mapped using the "imports" key only (no scopes)', () => {
-  it('should fail when the mapping is to an empty array', () => {
-    const resolveUnderTest = makeResolveUnderTest(`{
-      "imports": {
-        "moment": null,
-        "lodash": []
-      }
-    }`);
-
-    expect(() => resolveUnderTest('moment')).toThrow(TypeError);
-    expect(() => resolveUnderTest('lodash')).toThrow(TypeError);
-  });
-
-  describe('Package-like scenarios', () => {
-    const resolveUnderTest = makeResolveUnderTest(`{
-      "imports": {
-        "moment": "/node_modules/moment/src/moment.js",
-        "moment/": "/node_modules/moment/src/",
-        "lodash-dot": "./node_modules/lodash-es/lodash.js",
-        "lodash-dot/": "./node_modules/lodash-es/",
-        "lodash-dotdot": "../node_modules/lodash-es/lodash.js",
-        "lodash-dotdot/": "../node_modules/lodash-es/"
-      }
-    }`);
-
-    it('should work for package main modules', () => {
-      expect(resolveUnderTest('moment')).toMatchURL('https://example.com/node_modules/moment/src/moment.js');
-      expect(resolveUnderTest('lodash-dot')).toMatchURL('https://example.com/app/node_modules/lodash-es/lodash.js');
-      expect(resolveUnderTest('lodash-dotdot')).toMatchURL('https://example.com/node_modules/lodash-es/lodash.js');
-    });
-
-    it('should work for package submodules', () => {
-      expect(resolveUnderTest('moment/foo')).toMatchURL('https://example.com/node_modules/moment/src/foo');
-      expect(resolveUnderTest('lodash-dot/foo')).toMatchURL('https://example.com/app/node_modules/lodash-es/foo');
-      expect(resolveUnderTest('lodash-dotdot/foo')).toMatchURL('https://example.com/node_modules/lodash-es/foo');
-    });
-
-    it('should work for package names that end in a slash by just passing through', () => {
-      // TODO: is this the right behavior, or should we throw?
-      expect(resolveUnderTest('moment/')).toMatchURL('https://example.com/node_modules/moment/src/');
-    });
-
-    it('should still fail for package modules that are not declared', () => {
-      expect(() => resolveUnderTest('underscore/')).toThrow(TypeError);
-      expect(() => resolveUnderTest('underscore/foo')).toThrow(TypeError);
-    });
-  });
-
-  describe('Tricky specifiers', () => {
-    const resolveUnderTest = makeResolveUnderTest(`{
-      "imports": {
-        "package/withslash": "/node_modules/package-with-slash/index.mjs",
-        "not-a-package": "/lib/not-a-package.mjs",
-        ".": "/lib/dot.mjs",
-        "..": "/lib/dotdot.mjs",
-        "..\\\\": "/lib/dotdotbackslash.mjs",
-        "%2E": "/lib/percent2e.mjs",
-        "%2F": "/lib/percent2f.mjs"
-      }
-    }`);
-
-    it('should work for explicitly-mapped specifiers that happen to have a slash', () => {
-      expect(resolveUnderTest('package/withslash')).toMatchURL('https://example.com/node_modules/package-with-slash/index.mjs');
-    });
-
-    it('should work when the specifier has punctuation', () => {
-      expect(resolveUnderTest('.')).toMatchURL('https://example.com/lib/dot.mjs');
-      expect(resolveUnderTest('..')).toMatchURL('https://example.com/lib/dotdot.mjs');
-      expect(resolveUnderTest('..\\')).toMatchURL('https://example.com/lib/dotdotbackslash.mjs');
-      expect(resolveUnderTest('%2E')).toMatchURL('https://example.com/lib/percent2e.mjs');
-      expect(resolveUnderTest('%2F')).toMatchURL('https://example.com/lib/percent2f.mjs');
-    });
-
-    it('should fail for attempting to get a submodule of something not declared with a trailing slash', () => {
-      expect(() => resolveUnderTest('not-a-package/foo')).toThrow(TypeError);
-    });
-  });
-
-  describe('URL-like specifiers', () => {
-    const resolveUnderTest = makeResolveUnderTest(`{
-      "imports": {
-        "/node_modules/als-polyfill/index.mjs": "@std/kv-storage",
-
-        "/lib/foo.mjs": "./more/bar.mjs",
-        "./dotrelative/foo.mjs": "/lib/dot.mjs",
-        "../dotdotrelative/foo.mjs": "/lib/dotdot.mjs",
-
-        "/lib/no.mjs": null,
-        "./dotrelative/no.mjs": [],
-
-        "/": "/lib/slash-only.mjs",
-        "./": "/lib/dotslash-only.mjs",
-
-        "/test": "/lib/test1.mjs",
-        "../test": "/lib/test2.mjs"
-      }
-    }`);
-
-    it('should remap to built-in modules', () => {
-      expect(resolveUnderTest('/node_modules/als-polyfill/index.mjs')).toMatchURL('import:@std/kv-storage');
-      expect(resolveUnderTest('https://example.com/node_modules/als-polyfill/index.mjs')).toMatchURL('import:@std/kv-storage');
-      expect(resolveUnderTest('https://///example.com/node_modules/als-polyfill/index.mjs')).toMatchURL('import:@std/kv-storage');
-    });
-
-    it('should remap to other URLs', () => {
-      expect(resolveUnderTest('https://example.com/lib/foo.mjs')).toMatchURL('https://example.com/app/more/bar.mjs');
-      expect(resolveUnderTest('https://///example.com/lib/foo.mjs')).toMatchURL('https://example.com/app/more/bar.mjs');
-      expect(resolveUnderTest('/lib/foo.mjs')).toMatchURL('https://example.com/app/more/bar.mjs');
-
-      expect(resolveUnderTest('https://example.com/app/dotrelative/foo.mjs')).toMatchURL('https://example.com/lib/dot.mjs');
-      expect(resolveUnderTest('../app/dotrelative/foo.mjs')).toMatchURL('https://example.com/lib/dot.mjs');
-
-      expect(resolveUnderTest('https://example.com/dotdotrelative/foo.mjs')).toMatchURL('https://example.com/lib/dotdot.mjs');
-      expect(resolveUnderTest('../dotdotrelative/foo.mjs')).toMatchURL('https://example.com/lib/dotdot.mjs');
-    });
-
-    it('should fail for URLs that remap to empty arrays', () => {
-      expect(() => resolveUnderTest('https://example.com/lib/no.mjs')).toThrow(TypeError);
-      expect(() => resolveUnderTest('/lib/no.mjs')).toThrow(TypeError);
-      expect(() => resolveUnderTest('../lib/no.mjs')).toThrow(TypeError);
-
-      expect(() => resolveUnderTest('https://example.com/app/dotrelative/no.mjs')).toThrow(TypeError);
-      expect(() => resolveUnderTest('/app/dotrelative/no.mjs')).toThrow(TypeError);
-      expect(() => resolveUnderTest('../app/dotrelative/no.mjs')).toThrow(TypeError);
-    });
-
-    it('should remap URLs that are just composed from / and .', () => {
-      expect(resolveUnderTest('https://example.com/')).toMatchURL('https://example.com/lib/slash-only.mjs');
-      expect(resolveUnderTest('/')).toMatchURL('https://example.com/lib/slash-only.mjs');
-      expect(resolveUnderTest('../')).toMatchURL('https://example.com/lib/slash-only.mjs');
-
-      expect(resolveUnderTest('https://example.com/app/')).toMatchURL('https://example.com/lib/dotslash-only.mjs');
-      expect(resolveUnderTest('/app/')).toMatchURL('https://example.com/lib/dotslash-only.mjs');
-      expect(resolveUnderTest('../app/')).toMatchURL('https://example.com/lib/dotslash-only.mjs');
-    });
-
-    it('should use the last entry\'s address when URL-like specifiers parse to the same absolute URL', () => {
-      expect(resolveUnderTest('/test')).toMatchURL('https://example.com/lib/test2.mjs');
-    });
-  });
-});
diff --git a/testing/web-platform/tests/import-maps/resources/test-helper.js b/testing/web-platform/tests/import-maps/resources/test-helper.js
deleted file mode 100644
index 2447bfb94353..000000000000
--- a/testing/web-platform/tests/import-maps/resources/test-helper.js
+++ /dev/null
@@ -1,205 +0,0 @@
-let log = [];
-
-function expect_log(test, expected_log) {
-  test.step_func_done(() => {
-    const actual_log = log;
-    log = [];
-    assert_array_equals(actual_log, expected_log, 'fallback log');
-  })();
-}
-
-// Results of resolving a specifier using import maps.
-const Result = {
-  // A built-in module (std:blank) is loaded.
-  BUILTIN: "builtin",
-
-  // A failure considered as a fetch error in a module script tree.
-  // <script>'s error event is fired.
-  FETCH_ERROR: "fetch_error",
-
-  // A failure considered as a parse error in a module script tree.
-  // Window's error event is fired.
-  PARSE_ERROR: "parse_error",
-
-  // The specifier is considered as a relative or absolute URL.
-  // Specifier                 Expected log
-  // ------------------------- ----------------------
-  // ...?name=foo              log:foo
-  // data:...log('foo')        foo
-  // Others, e.g. @std/blank   relative:@std/blank
-  // ------------------------- ----------------------
-  // (The last case assumes a file `@std/blank` that logs `relative:@std/blank`
-  // exists)
-  URL: "URL",
-};
-
-const Handler = {
-  // Handlers for <script> element cases.
-  // Note that on a parse error both WindowErrorEvent and ScriptLoadEvent are
-  // called.
-  ScriptLoadEvent: "<script> element's load event handler",
-  ScriptErrorEvent: "<script> element's error event handler",
-  WindowErrorEvent: "window's error event handler",
-
-  // Handlers for dynamic imports.
-  DynamicImportResolve: "dynamic import resolve",
-  DynamicImportReject: "dynamic import reject",
-};
-
-// Returns a map with Handler.* as the keys.
-function getHandlers(t, specifier, expected) {
-  let handlers = {};
-  handlers[Handler.ScriptLoadEvent] = t.unreached_func("Shouldn't load");
-  handlers[Handler.ScriptErrorEvent] =
-      t.unreached_func("script's error event shouldn't be fired");
-  handlers[Handler.WindowErrorEvent] =
-      t.unreached_func("window's error event shouldn't be fired");
-  handlers[Handler.DynamicImportResolve] =
-    t.unreached_func("dynamic import promise shouldn't be resolved");
-  handlers[Handler.DynamicImportReject] =
-    t.unreached_func("dynamic import promise shouldn't be rejected");
-
-  if (expected === Result.FETCH_ERROR) {
-    handlers[Handler.ScriptErrorEvent] = () => expect_log(t, []);
-    handlers[Handler.DynamicImportReject] = () => expect_log(t, []);
-  } else if (expected === Result.PARSE_ERROR) {
-    let error_occurred = false;
-    handlers[Handler.WindowErrorEvent] = () => { error_occurred = true; };
-    handlers[Handler.ScriptLoadEvent] = t.step_func(() => {
-      // Even if a parse error occurs, load event is fired (after
-      // window.onerror is called), so trigger the load handler only if
-      // there was no previous window.onerror call.
-      assert_true(error_occurred, "window.onerror should be fired");
-      expect_log(t, []);
-    });
-    handlers[Handler.DynamicImportReject] = t.step_func(() => {
-      assert_false(error_occurred,
-        "window.onerror shouldn't be fired for dynamic imports");
-      expect_log(t, []);
-    });
-  } else {
-    let expected_log;
-    if (expected === Result.BUILTIN) {
-      expected_log = [];
-    } else if (expected === Result.URL) {
-      const match_data_url = specifier.match(/data:.*log\.push\('(.*)'\)/);
-      const match_log_js = specifier.match(/name=(.*)/);
-      if (match_data_url) {
-        expected_log = [match_data_url[1]];
-      } else if (match_log_js) {
-        expected_log = ["log:" + match_log_js[1]];
-      } else {
-        expected_log = ["relative:" + specifier];
-      }
-    } else {
-      expected_log = [expected];
-    }
-    handlers[Handler.ScriptLoadEvent] = () => expect_log(t, expected_log);
-    handlers[Handler.DynamicImportResolve] = () => expect_log(t, expected_log);
-  }
-  return handlers;
-}
-
-// Creates an <iframe> and run a test inside the <iframe>
-// to separate the module maps and import maps in each test.
-function testInIframe(importMapString, importMapBaseURL, testScript) {
-  const iframe = document.createElement('iframe');
-  document.body.appendChild(iframe);
-  if (!importMapBaseURL) {
-    importMapBaseURL = document.baseURI;
-  }
-  let content = `
-    <script src="/resources/testharness.js"></script>
-    <script src="/import-maps/resources/test-helper.js"></script>
-    <base href="${importMapBaseURL}">
-  `;
-  if (importMapString) {
-    content += `
-      <script type="importmap">
-      ${importMapString}
-      </sc` + `ript>
-    `;
-  }
-  content += `
-    <body>
-    <script>
-    setup({ allow_uncaught_exception: true });
-    ${testScript}
-    </sc` + `ript>
-  `;
-  iframe.contentDocument.write(content);
-  iframe.contentDocument.close();
-  fetch_tests_from_window(iframe.contentWindow);
-}
-
-function testScriptElement(importMapString, importMapBaseURL, specifier, expected, type) {
-  testInIframe(importMapString, importMapBaseURL, `
-    const t = async_test("${specifier}: <script src type=${type}>");
-    const handlers = getHandlers(t, "${specifier}", "${expected}");
-    const script = document.createElement("script");
-    script.setAttribute("type", "${type}");
-    script.setAttribute("src", "${specifier}");
-    script.addEventListener("load", handlers[Handler.ScriptLoadEvent]);
-    script.addEventListener("error", handlers[Handler.ScriptErrorEvent]);
-    window.addEventListener("error", handlers[Handler.WindowErrorEvent]);
-    document.body.appendChild(script);
-  `);
-}
-
-function testStaticImport(importMapString, importMapBaseURL, specifier, expected) {
-  testInIframe(importMapString, importMapBaseURL, `
-    const t = async_test("${specifier}: static import");
-    const handlers = getHandlers(t, "${specifier}", "${expected}");
-    const script = document.createElement("script");
-    script.setAttribute("type", "module");
-    script.setAttribute("src",
-        "/import-maps/static-import.js?pipe=sub(none)&url=" +
-        encodeURIComponent("${specifier}"));
-    script.addEventListener("load", handlers[Handler.ScriptLoadEvent]);
-    script.addEventListener("error", handlers[Handler.ScriptErrorEvent]);
-    window.addEventListener("error", handlers[Handler.WindowErrorEvent]);
-    document.body.appendChild(script);
-  `);
-}
-
-function testDynamicImport(importMapString, importMapBaseURL, specifier, expected, type) {
-  testInIframe(importMapString, importMapBaseURL, `
-    const t = async_test("${specifier}: dynamic import (from ${type})");
-    const handlers = getHandlers(t, "${specifier}", "${expected}");
-    const script = document.createElement("script");
-    script.setAttribute("type", "${type}");
-    script.innerText =
-        "import(\\"${specifier}\\")" +
-        ".then(handlers[Handler.DynamicImportResolve], " +
-        "handlers[Handler.DynamicImportReject]);";
-    script.addEventListener("error",
-        t.unreached_func("top-level inline script shouldn't error"));
-    document.body.appendChild(script);
-  `);
-}
-
-function doTests(importMapString, importMapBaseURL, tests) {
-  window.addEventListener("load", () => {
-    for (const specifier in tests) {
-      // <script src> (module scripts)
-      testScriptElement(importMapString, importMapBaseURL, specifier,
-        tests[specifier][0], "module");
-
-      // <script src> (classic scripts)
-      testScriptElement(importMapString, importMapBaseURL, specifier,
-        tests[specifier][1], "text/javascript");
-
-      // static imports.
-      testStaticImport(importMapString, importMapBaseURL, specifier,
-        tests[specifier][2]);
-
-      // dynamic imports from a module script.
-      testDynamicImport(importMapString, importMapBaseURL, specifier,
-        tests[specifier][3], "module");
-
-      // dynamic imports from a classic script.
-      testDynamicImport(importMapString, importMapBaseURL, specifier,
-        tests[specifier][3], "text/javascript");
-    }
-  });
-}
diff --git a/testing/web-platform/tests/import-maps/static-import.js b/testing/web-platform/tests/import-maps/static-import.js
deleted file mode 100644
index 1686fc123a79..000000000000
--- a/testing/web-platform/tests/import-maps/static-import.js
+++ /dev/null
@@ -1 +0,0 @@
-import "{{GET[url]}}";
diff --git a/testing/web-platform/tests/infrastructure/reftest/size-ref.html b/testing/web-platform/tests/infrastructure/reftest/size-ref.html
index bb792a3feb21..b2669612b792 100644
--- a/testing/web-platform/tests/infrastructure/reftest/size-ref.html
+++ b/testing/web-platform/tests/infrastructure/reftest/size-ref.html
@@ -1,2 +1,2 @@
 <!doctype html>
-<p>innerWidth x innerHeight: <span>800x600</span></p>
+<p>innerWidth x innerHeight: <span>600x600</span></p>
diff --git a/testing/web-platform/tests/interfaces/font-metrics-api.idl b/testing/web-platform/tests/interfaces/font-metrics-api.idl
index b38024e44616..b13def2d74c7 100644
--- a/testing/web-platform/tests/interfaces/font-metrics-api.idl
+++ b/testing/web-platform/tests/interfaces/font-metrics-api.idl
@@ -10,7 +10,7 @@ partial interface Document {
 
 interface FontMetrics {
   readonly attribute double width;
-  readonly attribute FrozenArray<double> advances;
+  readonly attribute sequence<double> advances;
 
   readonly attribute double boundingBoxLeft;
   readonly attribute double boundingBoxRight;
@@ -24,8 +24,8 @@ interface FontMetrics {
   readonly attribute double fontBoundingBoxDescent;
 
   readonly attribute Baseline dominantBaseline;
-  readonly attribute FrozenArray<Baseline> baselines;
-  readonly attribute FrozenArray<Font> fonts;
+  readonly attribute sequence<Baseline> baselines;
+  readonly attribute sequence<Font> fonts;
 };
 
 interface Baseline {
diff --git a/testing/web-platform/tests/interfaces/html.idl b/testing/web-platform/tests/interfaces/html.idl
index 641213d1bb6f..0d6445e7f016 100644
--- a/testing/web-platform/tests/interfaces/html.idl
+++ b/testing/web-platform/tests/interfaces/html.idl
@@ -114,8 +114,6 @@ interface HTMLElement : Element {
   [CEReactions] attribute DOMString autocapitalize;
 
   [CEReactions] attribute [TreatNullAs=EmptyString] DOMString innerText;
-
-  ElementInternals attachInternals();
 };
 
 HTMLElement includes GlobalEventHandlers;
@@ -727,8 +725,6 @@ interface HTMLFormElement : HTMLElement {
   [CEReactions] attribute DOMString name;
   [CEReactions] attribute boolean noValidate;
   [CEReactions] attribute DOMString target;
-  [CEReactions] attribute DOMString rel;
-  [SameObject, PutForwards=value] readonly attribute DOMTokenList relList;
 
   [SameObject] readonly attribute HTMLFormControlsCollection elements;
   readonly attribute unsigned long length;
@@ -1412,11 +1408,6 @@ dictionary ElementDefinitionOptions {
   DOMString extends;
 };
 
-[Exposed=Window]
-interface ElementInternals {
-
-};
-
 dictionary FocusOptions {
   boolean preventScroll = false;
 };
diff --git a/testing/web-platform/tests/interfaces/netinfo.idl b/testing/web-platform/tests/interfaces/netinfo.idl
index 729678396884..a4876c999106 100644
--- a/testing/web-platform/tests/interfaces/netinfo.idl
+++ b/testing/web-platform/tests/interfaces/netinfo.idl
@@ -23,7 +23,7 @@ enum EffectiveConnectionType {
 };
 
 interface mixin NavigatorNetworkInformation {
-  [SameObject] readonly attribute NetworkInformation connection;
+  readonly attribute NetworkInformation connection;
 };
 
 Navigator includes NavigatorNetworkInformation;
diff --git a/testing/web-platform/tests/interfaces/storage.idl b/testing/web-platform/tests/interfaces/storage.idl
index 437bc6dd43c2..29603241222b 100644
--- a/testing/web-platform/tests/interfaces/storage.idl
+++ b/testing/web-platform/tests/interfaces/storage.idl
@@ -5,7 +5,7 @@
 
 [SecureContext]
 interface mixin NavigatorStorage {
-  [SameObject] readonly attribute StorageManager storage;
+  readonly attribute StorageManager storage;
 };
 Navigator includes NavigatorStorage;
 WorkerNavigator includes NavigatorStorage;
diff --git a/testing/web-platform/tests/interfaces/web-bluetooth.idl b/testing/web-platform/tests/interfaces/web-bluetooth.idl
index c5fd30cf320a..00b93a551335 100644
--- a/testing/web-platform/tests/interfaces/web-bluetooth.idl
+++ b/testing/web-platform/tests/interfaces/web-bluetooth.idl
@@ -199,7 +199,6 @@ interface mixin CharacteristicEventHandlers {
 
 [SecureContext]
 interface mixin BluetoothDeviceEventHandlers {
-  attribute EventHandler onadvertisementreceived;
   attribute EventHandler ongattserverdisconnected;
 };
 
diff --git a/testing/web-platform/tests/interfaces/web-nfc.idl b/testing/web-platform/tests/interfaces/web-nfc.idl
index 11a36cde6eb7..5a6d6f8a06b1 100644
--- a/testing/web-platform/tests/interfaces/web-nfc.idl
+++ b/testing/web-platform/tests/interfaces/web-nfc.idl
@@ -3,20 +3,20 @@
 // (https://github.com/tidoust/reffy-reports)
 // Source: Web NFC API (https://w3c.github.io/web-nfc/)
 
-dictionary NDEFMessage {
-  sequence<NDEFRecord> records;
+dictionary NFCMessage {
+  sequence<NFCRecord> records;
   USVString url;
 };
 
-typedef (DOMString or unrestricted double or ArrayBuffer or Dictionary) NDEFRecordData;
+typedef (DOMString or unrestricted double or ArrayBuffer or Dictionary) NFCRecordData;
 
-dictionary NDEFRecord {
-  NDEFRecordType recordType;
+dictionary NFCRecord {
+  NFCRecordType recordType;
   USVString mediaType;
-  NDEFRecordData data;
+  NFCRecordData data;
 };
 
-enum NDEFRecordType {
+enum NFCRecordType {
   "empty",
   "text",
   "url",
@@ -24,11 +24,11 @@ enum NDEFRecordType {
   "opaque"
 };
 
-typedef (DOMString or ArrayBuffer or NDEFMessage) NDEFMessageSource;
+typedef (DOMString or ArrayBuffer or NFCMessage) NFCMessageSource;
 
 [Constructor(), SecureContext, Exposed=Window]
 interface NFCWriter {
-  Promise<void> push(NDEFMessageSource message, optional NFCPushOptions options);
+  Promise<void> push(NFCMessageSource message, optional NFCPushOptions options);
 };
 
 [Constructor(optional NFCReaderOptions options), SecureContext, Exposed=Window]
@@ -42,11 +42,11 @@ interface NFCReader : EventTarget {
 
 [Constructor(DOMString type, NFCReadingEventInit readingEventInitDict), SecureContext, Exposed=Window]
 interface NFCReadingEvent : Event {
-  readonly attribute NDEFMessage message;
+  readonly attribute NFCMessage message;
 };
 
 dictionary NFCReadingEventInit : EventInit {
-  required NDEFMessage message;
+  required NFCMessage message;
 };
 
 [Constructor(DOMString type, NFCErrorEventInit errorEventInitDict), SecureContext, Exposed=Window]
@@ -58,18 +58,11 @@ dictionary NFCErrorEventInit : EventInit {
   required DOMException error;
 };
 
-enum NDEFCompatibility {
-  "nfc-forum",
-  "vendor",
-  "any"
-};
-
 dictionary NFCPushOptions {
   NFCPushTarget target = "any";
   unrestricted double timeout = Infinity;
   boolean ignoreRead = true;
   AbortSignal? signal;
-  NDEFCompatibility compatibility = "nfc-forum";
 };
 
 enum NFCPushTarget {
@@ -80,7 +73,12 @@ enum NFCPushTarget {
 
 dictionary NFCReaderOptions {
   USVString url = "";
-  NDEFRecordType recordType;
+  NFCRecordType recordType;
   USVString mediaType = "";
-  NDEFCompatibility compatibility = "nfc-forum";
+  NFCAccept accept = "web-nfc-only";
+};
+
+enum NFCAccept {
+  "web-nfc-only",
+  "any"
 };
diff --git a/testing/web-platform/tests/interfaces/webgl1.idl b/testing/web-platform/tests/interfaces/webgl1.idl
index 7f5130ef7076..bab7d421da02 100644
--- a/testing/web-platform/tests/interfaces/webgl1.idl
+++ b/testing/web-platform/tests/interfaces/webgl1.idl
@@ -24,14 +24,14 @@ typedef unrestricted float GLclampf;
 enum WebGLPowerPreference { "default", "low-power", "high-performance" };
 
 dictionary WebGLContextAttributes {
-    boolean alpha = true;
-    boolean depth = true;
-    boolean stencil = false;
-    boolean antialias = true;
-    boolean premultipliedAlpha = true;
-    boolean preserveDrawingBuffer = false;
+    GLboolean alpha = true;
+    GLboolean depth = true;
+    GLboolean stencil = false;
+    GLboolean antialias = true;
+    GLboolean premultipliedAlpha = true;
+    GLboolean preserveDrawingBuffer = false;
     WebGLPowerPreference powerPreference = "default";
-    boolean failIfMajorPerformanceCaveat = false;
+    GLboolean failIfMajorPerformanceCaveat = false;
 };
 
 [Exposed=(Window,Worker)]
@@ -84,8 +84,7 @@ typedef (ImageBitmap or
          ImageData or
          HTMLImageElement or
          HTMLCanvasElement or
-         HTMLVideoElement or
-         OffscreenCanvas) TexImageSource;
+         HTMLVideoElement) TexImageSource;
 
 typedef ([AllowShared] Float32Array or sequence<GLfloat>) Float32List;
 typedef ([AllowShared] Int32Array or sequence<GLint>) Int32List;
@@ -511,8 +510,7 @@ interface mixin WebGLRenderingContextBase
     const GLenum UNPACK_COLORSPACE_CONVERSION_WEBGL = 0x9243;
     const GLenum BROWSER_DEFAULT_WEBGL          = 0x9244;
 
-    [Exposed=Window] readonly attribute (HTMLCanvasElement or OffscreenCanvas) canvas;
-    [Exposed=Worker] readonly attribute OffscreenCanvas canvas;
+    [Exposed=Window] readonly attribute HTMLCanvasElement canvas;
     readonly attribute GLsizei drawingBufferWidth;
     readonly attribute GLsizei drawingBufferHeight;
 
diff --git a/testing/web-platform/tests/interfaces/webxr.idl b/testing/web-platform/tests/interfaces/webxr.idl
index 899bb0daa008..2bc100e100d8 100644
--- a/testing/web-platform/tests/interfaces/webxr.idl
+++ b/testing/web-platform/tests/interfaces/webxr.idl
@@ -28,7 +28,6 @@ enum XREnvironmentBlendMode {
   readonly attribute XRPresentationContext? outputContext;
   readonly attribute XREnvironmentBlendMode environmentBlendMode;
   readonly attribute XRRenderState renderState;
-  readonly attribute XRSpace viewerSpace;
 
   // Methods
   void updateRenderState(optional XRRenderStateInit state);
@@ -79,12 +78,12 @@ callback XRFrameRequestCallback = void (DOMHighResTimeStamp time, XRFrame frame)
 [SecureContext, Exposed=Window] interface XRFrame {
   readonly attribute XRSession session;
 
-  XRViewerPose? getViewerPose(XRReferenceSpace referenceSpace);
-  XRPose? getPose(XRSpace space, XRSpace relativeTo);
+  XRViewerPose? getViewerPose(optional XRReferenceSpace referenceSpace);
+  XRInputPose? getInputPose(XRInputSource inputSource, optional XRReferenceSpace referenceSpace);
 };
 
 [SecureContext, Exposed=Window] interface XRSpace : EventTarget {
-
+  XRRigidTransform? getTransformTo(XRSpace other);
 };
 
 enum XRReferenceSpaceType {
@@ -160,17 +159,13 @@ interface XRRay {
   readonly attribute Float32Array matrix;
 };
 
-[SecureContext, Exposed=Window] interface XRPose {
+[SecureContext, Exposed=Window] interface XRViewerPose {
   readonly attribute XRRigidTransform transform;
-  readonly attribute boolean emulatedPosition;
-};
-
-[SecureContext, Exposed=Window] interface XRViewerPose : XRPose {
   readonly attribute FrozenArray<XRView> views;
 };
 
 enum XRHandedness {
-  "none",
+  "",
   "left",
   "right"
 };
@@ -185,8 +180,13 @@ enum XRTargetRayMode {
 interface XRInputSource {
   readonly attribute XRHandedness handedness;
   readonly attribute XRTargetRayMode targetRayMode;
-  readonly attribute XRSpace targetRaySpace;
-  readonly attribute XRSpace? gripSpace;
+};
+
+[SecureContext, Exposed=Window]
+interface XRInputPose {
+  readonly attribute boolean emulatedPosition;
+  readonly attribute XRRay targetRay;
+  readonly attribute XRRigidTransform? gripTransform;
 };
 
 [SecureContext, Exposed=Window] interface XRLayer {};
diff --git a/testing/web-platform/tests/intersection-observer/resources/intersection-observer-test-utils.js b/testing/web-platform/tests/intersection-observer/resources/intersection-observer-test-utils.js
index 44f794b0883b..8683c8b570c8 100644
--- a/testing/web-platform/tests/intersection-observer/resources/intersection-observer-test-utils.js
+++ b/testing/web-platform/tests/intersection-observer/resources/intersection-observer-test-utils.js
@@ -72,15 +72,7 @@
 //       notifications.
 function waitForNotification(t, f) {
   requestAnimationFrame(function() {
-    requestAnimationFrame(function() { t.step_timeout(f, 0); });
-  });
-}
-
-// If you need to wait until the IntersectionObserver algorithm has a chance
-// to run, but don't need to wait for delivery of the notifications...
-function waitForFrame(t, f) {
-  requestAnimationFrame(function() {
-    t.step_timeout(f, 0);
+    requestAnimationFrame(function() { t.step_timeout(f); });
   });
 }
 
@@ -93,19 +85,9 @@ function waitForFrame(t, f) {
 //
 // Following these rules will ensure that the test suite will not abort before
 // all test steps have run.
-//
-// If the 'delay' parameter to the IntersectionObserver constructor is used,
-// tests will need to add the same delay to their runTestCycle invocations, to
-// wait for notifications to be generated and delivered.
-function runTestCycle(f, description, delay) {
+function runTestCycle(f, description) {
   async_test(function(t) {
-    if (delay) {
-      step_timeout(() => {
-        waitForNotification(t, t.step_func_done(f));
-      }, delay);
-    } else {
-      waitForNotification(t, t.step_func_done(f));
-    }
+    waitForNotification(t, t.step_func_done(f));
   }, description);
 }
 
@@ -192,4 +174,4 @@ function checkJsonEntries(actual, expected, description) {
 function checkIsIntersecting(entries, i, expected) {
   assert_equals(entries[i].isIntersecting, expected,
     'entries[' + i + '].target.isIntersecting equals ' + expected);
-}
+}
\ No newline at end of file
diff --git a/testing/web-platform/tests/intersection-observer/resources/v2-subframe.html b/testing/web-platform/tests/intersection-observer/resources/v2-subframe.html
deleted file mode 100644
index 295bbf047e65..000000000000
--- a/testing/web-platform/tests/intersection-observer/resources/v2-subframe.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html>
-<div id="target">target</div>
-<script>
-var delay = 100;
-var results = [];
-
-function waitForNotification(f) {
-  setTimeout(() => {
-    requestAnimationFrame(function () {
-      requestAnimationFrame(function () {
-        setTimeout(f)
-      })
-    })
-  }, delay)
-}
-
-window.addEventListener("message", event => {
-  waitForNotification(() => {
-    window.parent.postMessage(results.map(e => e.isVisible), "*");
-    results = [];
-  });
-});
-
-onload = () => {
-  var target = document.getElementById("target");
-  var observer = new IntersectionObserver(entries => {
-    results = entries;
-  }, {trackVisibility: true, delay: delay});
-  observer.observe(document.getElementById("target"));
-  window.parent.postMessage("", "*");
-};
-</script>
diff --git a/testing/web-platform/tests/intersection-observer/v2/animated-occlusion.html b/testing/web-platform/tests/intersection-observer/v2/animated-occlusion.html
deleted file mode 100644
index c1eafb7fa142..000000000000
--- a/testing/web-platform/tests/intersection-observer/v2/animated-occlusion.html
+++ /dev/null
@@ -1,72 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../resources/intersection-observer-test-utils.js"></script>
-
-<style>
-body, html {
-  margin: 0;
-}
-pre, #log {
-  position: absolute;
-  top: 0;
-  left: 200px;
-}
-#target {
-  width: 100px;
-  height: 100px;
-  background-color: green;
-}
-@keyframes rotate {
-  from {
-    transform: rotate(0deg);
-  }
-  to {
-    transform: rotate(45deg);
-  }
-}
-#occluder {
-  will-change: transform;
-  width: 100px;
-  height: 100px;
-  background-color: blue;
-}
-</style>
-
-<div id="target"></div>
-<div id="occluder"></div>
-
-<script>
-var vw = document.documentElement.clientWidth;
-var vh = document.documentElement.clientHeight;
-var delay = 100;
-var entries = [];
-var target;
-var occluder;
-
-runTestCycle(function() {
-  target = document.getElementById("target");
-  occluder = document.getElementById("occluder");
-  assert_true(!!target, "target exists");
-  assert_true(!!occluder, "occluder exists");
-  var observer = new IntersectionObserver(function(changes) {
-    entries = entries.concat(changes)
-  }, {trackVisibility: true, delay: delay});
-  observer.observe(target);
-  entries = entries.concat(observer.takeRecords());
-  assert_equals(entries.length, 0, "No initial notifications.");
-  runTestCycle(step0, "First rAF.", delay);
-}, "IntersectionObserverV2 in a single document using the implicit root, with an animated occluding element.", delay);
-
-function step0() {
-  occluder.style.animation = "rotate .1s linear";
-  step_timeout(() => {
-    runTestCycle(step1, "occluder.style.animation = 'rotate .1s linear'", delay);
-  }, 50);
-  checkLastEntry(entries, 0, [0, 100, 0, 100, 0, 100, 0, 100, 0, vw, 0, vh, true, true]);
-}
-
-function step1() {
-  checkLastEntry(entries, 1, [0, 100, 0, 100, 0, 100, 0, 100, 0, vw, 0, vh, true, false]);
-}
-</script>
diff --git a/testing/web-platform/tests/intersection-observer/v2/blur-filter.html b/testing/web-platform/tests/intersection-observer/v2/blur-filter.html
deleted file mode 100644
index 2f55066e3630..000000000000
--- a/testing/web-platform/tests/intersection-observer/v2/blur-filter.html
+++ /dev/null
@@ -1,64 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../resources/intersection-observer-test-utils.js"></script>
-
-<style>
-body, html {
-  margin: 0;
-}
-pre, #log {
-  position: absolute;
-  top: 0;
-  left: 200px;
-}
-#target {
-  width: 100px;
-  height: 100px;
-  background-color: green;
-}
-#occluder {
-  margin-top: 10px;
-  width: 100px;
-  height: 100px;
-  background-color: blue;
-  filter: blur(50px);
-}
-</style>
-
-<div id="target"></div>
-<div id="occluder"></div>
-
-<script>
-var delay = 100;
-var entries = [];
-var target;
-var occluder;
-
-runTestCycle(function() {
-  target = document.getElementById("target");
-  occluder = document.getElementById("occluder");
-  assert_true(!!target, "target exists");
-  assert_true(!!occluder, "occluder exists");
-  var observer = new IntersectionObserver(function(changes) {
-    entries = entries.concat(changes)
-  }, {trackVisibility: true, delay: delay});
-  observer.observe(target);
-  entries = entries.concat(observer.takeRecords());
-  assert_equals(entries.length, 0, "No initial notifications.");
-  runTestCycle(step0, "First rAF.", delay);
-}, "IntersectionObserverV2 in a single document using the implicit root, with an occluding element.", delay);
-
-function step0() {
-  // Occluding elements with opacity=0 should not affect target visibility.
-  occluder.style.opacity = "0";
-  runTestCycle(step2, "occluder.style.opacity = 0", delay);
-
-  // First notification should report occlusion due to blur filter.
-  checkLastEntry(entries, 0, [0, 100, 0, 100, 0, 100, 0, 100, 0, 800, 0, 600, true, false]);
-}
-
-function step2() {
-  checkLastEntry(entries, 1, [0, 100, 0, 100, 0, 100, 0, 100, 0, 800, 0, 600, true, true]);
-}
-</script>
diff --git a/testing/web-platform/tests/intersection-observer/v2/box-shadow.html b/testing/web-platform/tests/intersection-observer/v2/box-shadow.html
deleted file mode 100644
index bcc6980aec36..000000000000
--- a/testing/web-platform/tests/intersection-observer/v2/box-shadow.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../resources/intersection-observer-test-utils.js"></script>
-
-<style>
-body, html {
-  margin: 0;
-}
-pre, #log {
-  position: absolute;
-  top: 0;
-  left: 200px;
-}
-iframe {
-  width: 100px;
-  height: 100px;
-  border: 0;
-}
-#box-shadow {
-  display: inline-block;
-  box-shadow: -50px -50px 0 50px rgba(255, 0, 0, 0.7);
-}
-</style>
-
-<iframe id=target srcdoc="<!DOCTYPE html><div>Lorem ipsum. Lorem ipsum. Lorem ipsum. Lorem ipsum. Lorem ipsum. Lorem ipsum. Lorem ipsum. Lorem ipsum. Lorem ipsum. Lorem ipsum.</div>"></iframe><div id=box-shadow></div>
-
-<script>
-var delay = 100;
-var entries = [];
-var target;
-var occluder;
-
-runTestCycle(function() {
-  target = document.getElementById("target");
-  occluder = document.getElementById("box-shadow");
-  assert_true(!!target, "target exists");
-  assert_true(!!occluder, "occluder exists");
-  let observer = new IntersectionObserver(function(changes) {
-    entries = entries.concat(changes)
-  }, {trackVisibility: true, delay: delay});
-  observer.observe(target);
-  entries = entries.concat(observer.takeRecords());
-  assert_equals(entries.length, 0, "No initial notifications.");
-  runTestCycle(step0, "First rAF.", delay);
-}, "IntersectionObserverV2 observing an iframe element.", delay);
-
-function step0() {
-  occluder.style.boxShadow = "none";
-  runTestCycle(step1, 'occluder.style.boxShadow = "none"', delay);
-  assert_equals(entries.length, 1, "Initial notification.");
-  assert_equals(entries[0].isVisible, false, "Initially occluded.");
-}
-
-function step1() {
-  occluder.style.boxShadow = "";
-  runTestCycle(step2, 'occluder.style.boxShadow = ""', delay);
-  assert_equals(entries.length, 2, "Notification after removing box shadow.");
-  assert_equals(entries[1].isVisible, true, "Visible when box shadow removed.");
-}
-
-function step2() {
-  assert_equals(entries.length, 3, "Notification after re-adding box shadow.");
-  assert_equals(entries[2].isVisible, false, "Occluded when box shadow re-added.");
-}
-</script>
diff --git a/testing/web-platform/tests/intersection-observer/v2/cross-origin-effects.sub.html b/testing/web-platform/tests/intersection-observer/v2/cross-origin-effects.sub.html
deleted file mode 100644
index edb8f023c09f..000000000000
--- a/testing/web-platform/tests/intersection-observer/v2/cross-origin-effects.sub.html
+++ /dev/null
@@ -1,64 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../resources/intersection-observer-test-utils.js"></script>
-
-<style>
-pre, #log {
-  position: absolute;
-  top: 0;
-  left: 200px;
-}
-</style>
-
-<div id="container">
-  <iframe src="http://{{domains[www1]}}:{{ports[http][0]}}/intersection-observer/resources/v2-subframe.html"></iframe>
-</div>
-
-<script>
-async_test(function(t) {
-  let container = document.getElementById("container");
-  let iframe = document.querySelector("iframe");
-
-  function step0(event) {
-    assert_equals(event.data,"");
-  }
-
-  function step1(event) {
-    container.style.opacity = "0.99";
-    assert_equals(JSON.stringify(event.data),
-                  JSON.stringify([true]));
-  }
-
-  function step2(event) {
-    container.style.opacity = "";
-    assert_equals(JSON.stringify(event.data),
-                  JSON.stringify([false]));
-  }
-
-  function step3(event) {
-    container.style.transform = "skew(30deg)";
-    assert_equals(JSON.stringify(event.data),
-                  JSON.stringify([true]));
-  }
-
-  function step4(event) {
-    assert_equals(JSON.stringify(event.data),
-                  JSON.stringify([false]));
-  }
-
-  let steps = [step0, step1, step2, step3, step4];
-
-  window.addEventListener("message", event => {
-    if (steps.length) {
-      t.step_func(steps.shift(), event);
-      waitForFrame(t, () => {
-        iframe.contentWindow.postMessage("", "*")
-      });
-    } else {
-      t.done();
-    }
-  });
-
-}, "Intersection observer V2 test with visual effects on iframe.");
-</script>
diff --git a/testing/web-platform/tests/intersection-observer/v2/cross-origin-occlusion.sub.html b/testing/web-platform/tests/intersection-observer/v2/cross-origin-occlusion.sub.html
deleted file mode 100644
index 6f9fa57fb718..000000000000
--- a/testing/web-platform/tests/intersection-observer/v2/cross-origin-occlusion.sub.html
+++ /dev/null
@@ -1,68 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../resources/intersection-observer-test-utils.js"></script>
-
-<style>
-pre, #log {
-  position: absolute;
-  top: 0;
-  left: 200px;
-}
-iframe {
-  width: 300px;
-  height: 150px;
-  border: none;
-}
-#occluder {
-  will-change: transform;
-  width: 100px;
-  height: 100px;
-  background-color: green;
-}
-</style>
-
-<iframe src="http://{{domains[www1]}}:{{ports[http][0]}}/intersection-observer/resources/v2-subframe.html"></iframe>
-<div id="occluder"></div>
-
-<script>
-async_test(function(t) {
-  let iframe = document.querySelector("iframe");
-  let occluder = document.getElementById("occluder");
-
-  function step0(event) {
-    assert_equals(event.data,"");
-  }
-
-  function step1(event) {
-    occluder.style.marginTop = "-150px";
-    assert_equals(JSON.stringify(event.data),
-                  JSON.stringify([true]));
-  }
-
-  function step2(event) {
-    occluder.style.marginTop = "";
-    assert_equals(JSON.stringify(event.data),
-                  JSON.stringify([false]));
-  }
-
-  function step3(event) {
-    assert_equals(JSON.stringify(event.data),
-                  JSON.stringify([true]));
-  }
-
-  let steps = [step0, step1, step2, step3];
-
-  window.addEventListener("message", event => {
-    if (steps.length) {
-      t.step_func(steps.shift(), event);
-      waitForFrame(t, () => {
-        iframe.contentWindow.postMessage("", "*");
-      });
-    } else {
-      t.done();
-    }
-  });
-
-}, "Intersection observer V2 test with occlusion of target in iframe.");
-</script>
diff --git a/testing/web-platform/tests/intersection-observer/v2/delay-test.html b/testing/web-platform/tests/intersection-observer/v2/delay-test.html
deleted file mode 100644
index 086301c44d4e..000000000000
--- a/testing/web-platform/tests/intersection-observer/v2/delay-test.html
+++ /dev/null
@@ -1,75 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../resources/intersection-observer-test-utils.js"></script>
-
-<style>
-body, html {
-  margin: 0;
-}
-pre, #log {
-  position: absolute;
-  top: 0;
-  left: 200px;
-}
-#target {
-  width: 100px;
-  height: 100px;
-  background-color: green;
-}
-#occluder {
-  width: 100px;
-  height: 100px;
-  background-color: blue;
-}
-</style>
-
-<div id="target"></div>
-<div id="occluder"></div>
-
-<script>
-async_test(t => {
-  let entries = [];
-  let delay = 100;
-  let target = document.getElementById("target");
-  let occluder = document.getElementById("occluder");
-
-  assert_true(!!target, "target exists");
-  assert_true(!!occluder, "occluder exists");
-  let observer = new IntersectionObserver(function(changes) {
-    entries = entries.concat(changes)
-  }, {trackVisibility: true, delay: delay});
-  observer.observe(target);
-  entries = entries.concat(observer.takeRecords());
-  assert_equals(entries.length, 0, "No initial notifications.");
-  // The first notification should be sent without delay.
-  waitForNotification(t, t.step_func(step0));
-
-  function waitForDelay(timerExpiredBeforeLastFrame) {
-    requestAnimationFrame(t.step_func(() => {
-      if (timerExpiredBeforeLastFrame) {
-        // New notifications should have been generated during the previous
-        // frame and delivered by now.
-        assert_equals(entries.length, 2);
-        assert_greater_than(entries[1].time - entries[0].time, delay);
-        assert_false(entries[1].isVisible);
-        t.done();
-      } else {
-        // Observer may not have updated yet. Wait for next frame.
-        let timerExpired = performance.now() - entries[0].time >= delay;
-        waitForDelay(timerExpired);
-      }
-    }));
-  }
-
-  function step0() {
-    assert_equals(entries.length, 1);
-    assert_true(entries[0].isVisible);
-    // This should trigger a notification on the next run.
-    occluder.style.marginTop = "-10px";
-    // Enter a rAF loop until the delay timer expires.
-    waitForDelay(false);
-  }
-
-}, "'delay' parameter throttles frequency of notifications.");
-</script>
diff --git a/testing/web-platform/tests/intersection-observer/v2/iframe-target.html b/testing/web-platform/tests/intersection-observer/v2/iframe-target.html
deleted file mode 100644
index 3e53ee5f5814..000000000000
--- a/testing/web-platform/tests/intersection-observer/v2/iframe-target.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../resources/intersection-observer-test-utils.js"></script>
-
-<style>
-body, html {
-  margin: 0;
-}
-pre, #log {
-  position: absolute;
-  top: 0;
-  left: 200px;
-}
-iframe {
-  width: 150px;
-  height: 100px;
-  border: 0;
-}
-</style>
-
-<iframe srcdoc="<!DOCTYPE html><div>Lorem ipsum. Lorem ipsum. Lorem ipsum. Lorem ipsum. Lorem ipsum. Lorem ipsum. Lorem ipsum. Lorem ipsum. Lorem ipsum. Lorem ipsum.</div>"></iframe>
-
-<script>
-var delay = 100;
-var entries = [];
-var target;
-
-runTestCycle(function() {
-  target = document.querySelector("iframe");
-  assert_true(!!target, "target exists");
-  var observer = new IntersectionObserver(function(changes) {
-    entries = entries.concat(changes)
-  }, {trackVisibility: true, delay: delay});
-  observer.observe(target);
-  entries = entries.concat(observer.takeRecords());
-  assert_equals(entries.length, 0, "No initial notifications.");
-  runTestCycle(step0, "First rAF.", delay);
-}, "IntersectionObserverV2 observing an iframe element.", delay);
-
-function step0() {
-  checkLastEntry(entries, 0, [0, 150, 0, 100, 0, 150, 0, 100, 0, 800, 0, 600, true, true]);
-}
-</script>
diff --git a/testing/web-platform/tests/intersection-observer/v2/simple-effects.html b/testing/web-platform/tests/intersection-observer/v2/simple-effects.html
deleted file mode 100644
index 2b7a83a9c950..000000000000
--- a/testing/web-platform/tests/intersection-observer/v2/simple-effects.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../resources/intersection-observer-test-utils.js"></script>
-
-<style>
-body, html {
-  margin: 0;
-}
-pre, #log {
-  position: absolute;
-  top: 0;
-  left: 200px;
-}
-#target {
-  width: 100px;
-  height: 100px;
-  background-color: green;
-}
-#effects {
-  opacity: 1;
-  filter: none;
-}
-</style>
-
-<div id="effects">
-  <div id="target"></div>
-</div>
-
-<script>
-var delay = 100;
-var entries = [];
-var target;
-var effects;
-
-runTestCycle(function() {
-  target = document.getElementById("target");
-  effects = document.getElementById("effects");
-  assert_true(!!target, "target exists");
-  assert_true(!!effects, "effects exists");
-  var observer = new IntersectionObserver(function(changes) {
-    entries = entries.concat(changes)
-  }, {trackVisibility: true, delay: delay});
-  observer.observe(target);
-  entries = entries.concat(observer.takeRecords());
-  assert_equals(entries.length, 0, "No initial notifications.");
-  runTestCycle(step0, "First rAF.", delay);
-}, "IntersectionObserverV2 in a single document using the implicit root, with a non-zero opacity ancestor.", delay);
-
-function step0() {
-  effects.style.opacity = "0.99";
-  runTestCycle(step1, "effects.style.opacity = 0.99", delay);
-  checkLastEntry(entries, 0, [0, 100, 0, 100, 0, 100, 0, 100, 0, 800, 0, 600, true, true]);
-}
-
-function step1() {
-  effects.style.opacity = "1";
-  runTestCycle(step2, "effects.style.opacity = 1", delay);
-  checkLastEntry(entries, 1, [0, 100, 0, 100, 0, 100, 0, 100, 0, 800, 0, 600, true, false]);
-}
-
-function step2() {
-  effects.style.filter = "grayscale(50%)";
-  runTestCycle(step3, "effects.style.filter = grayscale(50%)", delay);
-  checkLastEntry(entries, 2, [0, 100, 0, 100, 0, 100, 0, 100, 0, 800, 0, 600, true, true]);
-}
-
-function step3() {
-  checkLastEntry(entries, 3, [0, 100, 0, 100, 0, 100, 0, 100, 0, 800, 0, 600, true, false]);
-}
-</script>
diff --git a/testing/web-platform/tests/intersection-observer/v2/simple-occlusion-svg-foreign-object.html b/testing/web-platform/tests/intersection-observer/v2/simple-occlusion-svg-foreign-object.html
deleted file mode 100644
index fcdff67a4892..000000000000
--- a/testing/web-platform/tests/intersection-observer/v2/simple-occlusion-svg-foreign-object.html
+++ /dev/null
@@ -1,70 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../resources/intersection-observer-test-utils.js"></script>
-
-<style>
-body, html {
-  margin: 0;
-}
-pre, #log {
-  position: absolute;
-  top: 0;
-  left: 200px;
-}
-#target {
-  width: 100px;
-  height: 100px;
-  background-color: green;
-}
-#occluder {
-  width: 100px;
-  height: 100px;
-  background-color: blue;
-}
-</style>
-
-<div id="target"></div>
-<svg id="svg" style="display: block">
-  <foreignObject>
-    <div id="occluder"></div>
-  </foreignObject>
-</svg>
-
-<script>
-var delay = 100;
-var entries = [];
-var target;
-var occluder;
-
-runTestCycle(function() {
-  target = document.getElementById("target");
-  occluder = document.getElementById("occluder");
-  assert_true(!!target, "target exists");
-  assert_true(!!occluder, "occluder exists");
-  var observer = new IntersectionObserver(function(changes) {
-    entries = entries.concat(changes)
-  }, {trackVisibility: true, delay: delay});
-  observer.observe(target);
-  entries = entries.concat(observer.takeRecords());
-  assert_equals(entries.length, 0, "No initial notifications.");
-  runTestCycle(step0, "First rAF.", delay);
-}, "IntersectionObserverV2 in a single document using the implicit root, with an occluding element.", delay);
-
-function step0() {
-  svg.style.marginTop = "-10px";
-  runTestCycle(step1, "svg.style.marginTop = '-10px'", delay);
-  checkLastEntry(entries, 0, [0, 100, 0, 100, 0, 100, 0, 100, 0, 800, 0, 600, true, true]);
-}
-
-function step1() {
-  // Occluding elements with opacity=0 should not affect target visibility.
-  svg.style.opacity = "0";
-  runTestCycle(step2, "occluder.style.opacity = 0", delay);
-  checkLastEntry(entries, 1, [0, 100, 0, 100, 0, 100, 0, 100, 0, 800, 0, 600, true, false]);
-}
-
-function step2() {
-  checkLastEntry(entries, 2, [0, 100, 0, 100, 0, 100, 0, 100, 0, 800, 0, 600, true, true]);
-}
-</script>
diff --git a/testing/web-platform/tests/intersection-observer/v2/simple-occlusion.html b/testing/web-platform/tests/intersection-observer/v2/simple-occlusion.html
deleted file mode 100644
index ea1ee31ebe45..000000000000
--- a/testing/web-platform/tests/intersection-observer/v2/simple-occlusion.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../resources/intersection-observer-test-utils.js"></script>
-
-<style>
-body, html {
-  margin: 0;
-}
-pre, #log {
-  position: absolute;
-  top: 0;
-  left: 200px;
-}
-#target {
-  width: 100px;
-  height: 100px;
-  background-color: green;
-}
-#occluder {
-  width: 100px;
-  height: 100px;
-  background-color: blue;
-}
-</style>
-
-<div id="target"></div>
-<div id="occluder"></div>
-
-<script>
-var delay = 100;
-var entries = [];
-var target;
-var occluder;
-
-runTestCycle(function() {
-  target = document.getElementById("target");
-  occluder = document.getElementById("occluder");
-  assert_true(!!target, "target exists");
-  assert_true(!!occluder, "occluder exists");
-  var observer = new IntersectionObserver(function(changes) {
-    entries = entries.concat(changes)
-  }, {trackVisibility: true, delay: delay});
-  observer.observe(target);
-  entries = entries.concat(observer.takeRecords());
-  assert_equals(entries.length, 0, "No initial notifications.");
-  runTestCycle(step0, "First rAF.", delay);
-}, "IntersectionObserverV2 in a single document using the implicit root, with an occluding element.", delay);
-
-function step0() {
-  occluder.style.marginTop = "-10px";
-  runTestCycle(step1, "occluder.style.marginTop = '-10px'", delay);
-  checkLastEntry(entries, 0, [0, 100, 0, 100, 0, 100, 0, 100, 0, 800, 0, 600, true, true]);
-}
-
-function step1() {
-  // Occluding elements with opacity=0 should not affect target visibility.
-  occluder.style.opacity = "0";
-  runTestCycle(step2, "occluder.style.opacity = 0", delay);
-  checkLastEntry(entries, 1, [0, 100, 0, 100, 0, 100, 0, 100, 0, 800, 0, 600, true, false]);
-}
-
-function step2() {
-  checkLastEntry(entries, 2, [0, 100, 0, 100, 0, 100, 0, 100, 0, 800, 0, 600, true, true]);
-}
-</script>
diff --git a/testing/web-platform/tests/intersection-observer/v2/text-shadow.html b/testing/web-platform/tests/intersection-observer/v2/text-shadow.html
deleted file mode 100644
index c6445c514eec..000000000000
--- a/testing/web-platform/tests/intersection-observer/v2/text-shadow.html
+++ /dev/null
@@ -1,69 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../resources/intersection-observer-test-utils.js"></script>
-
-<style>
-body, html {
-  margin: 0;
-}
-pre, #log {
-  position: absolute;
-  top: 0;
-  left: 200px;
-}
-iframe {
-  width: 100px;
-  height: 100px;
-  border: 0;
-}
-#text-shadow {
-  display: inline-block;
-  font-size: 144px;
-  font-weight: 1000;
-  color: rgba(0, 0, 0, 0);
-  text-shadow: -100px 0 0 rgba(255, 0, 0, .7);
-}
-</style>
-
-<iframe id=target srcdoc="<!DOCTYPE html><div>Lorem ipsum. Lorem ipsum. Lorem ipsum. Lorem ipsum. Lorem ipsum. Lorem ipsum. Lorem ipsum. Lorem ipsum. Lorem ipsum. Lorem ipsum.</div>"></iframe><div id=text-shadow>O</div>
-
-<script>
-var delay = 100;
-var entries = [];
-var target;
-var occluder;
-
-runTestCycle(function() {
-  target = document.getElementById("target");
-  occluder = document.getElementById("text-shadow");
-  assert_true(!!target, "target exists");
-  assert_true(!!occluder, "occluder exists");
-  let observer = new IntersectionObserver(function(changes) {
-    entries = entries.concat(changes)
-  }, {trackVisibility: true, delay: delay});
-  observer.observe(target);
-  entries = entries.concat(observer.takeRecords());
-  assert_equals(entries.length, 0, "No initial notifications.");
-  runTestCycle(step0, "First rAF.", delay);
-}, "IntersectionObserverV2 observing an iframe element.", delay);
-
-function step0() {
-  occluder.style.textShadow = "none";
-  runTestCycle(step1, 'occluder.style.textShadow = "none"', delay);
-  assert_equals(entries.length, 1, "Initial notification.");
-  assert_equals(entries[0].isVisible, false, "Initially occluded.");
-}
-
-function step1() {
-  occluder.style.textShadow = "";
-  runTestCycle(step2, 'occluder.style.textShadow = ""', delay);
-  assert_equals(entries.length, 2, "Notification after removing text shadow.");
-  assert_equals(entries[1].isVisible, true, "Visible when text shadow removed.");
-}
-
-function step2() {
-  assert_equals(entries.length, 3, "Notification after re-adding text shadow.");
-  assert_equals(entries[2].isVisible, false, "Occluded when text shadow re-added.");
-}
-</script>
diff --git a/testing/web-platform/tests/kv-storage/backingstore.https.html b/testing/web-platform/tests/kv-storage/backingstore.https.html
deleted file mode 100644
index 44e634d85bbc..000000000000
--- a/testing/web-platform/tests/kv-storage/backingstore.https.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>KV Storage: backingStore getter</title>
-<!-- See https://github.com/WICG/kv-storage/issues/45 -->
-
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-
-<script type="module">
-import { storage } from "std:kv-storage";
-
-test(() => {
-  assert_equals(storage.backingStore, storage.backingStore);
-}, "backingStore must return the same object each time");
-
-test(() => {
-  assert_true(Object.isFrozen(storage.backingStore));
-}, "backingStore must be a frozen object");
-
-test(() => {
-  const { backingStore } = storage;
-  assert_array_equals(Object.keys(backingStore), ["database", "store", "version"], "property names");
-  assert_array_equals(Object.getOwnPropertySymbols(backingStore), [], "no symbols")
-  assert_own_property(backingStore, "database");
-  assert_own_property(backingStore, "store");
-  assert_own_property(backingStore, "version");
-  assert_equals(Object.getPrototypeOf(backingStore), Object.prototype);
-
-  assert_equals(backingStore.database, "kv-storage:default");
-  assert_equals(backingStore.store, "store");
-  assert_equals(backingStore.version, 1);
-}, "backingStore object must have the right shape");
-</script>
diff --git a/testing/web-platform/tests/kv-storage/cause-errors-via-idb.https.html b/testing/web-platform/tests/kv-storage/cause-errors-via-idb.https.html
index d77e56621e03..21fe36b36cb1 100644
--- a/testing/web-platform/tests/kv-storage/cause-errors-via-idb.https.html
+++ b/testing/web-platform/tests/kv-storage/cause-errors-via-idb.https.html
@@ -7,7 +7,7 @@
 <script src="/IndexedDB/support-promises.js"></script>
 
 <script type="module">
-import { testWithArea, testWithAreaNoCleanup } from "./helpers/kvs-tests.js";
+import { testWithArea } from "./helpers/kvs-tests.js";
 
 const mustFail = {
   "set()": area => area.set(1, "value 1"),
@@ -29,7 +29,7 @@ const mustFail = {
 
 for (const [method, testFn] of Object.entries(mustFail)) {
   testWithArea(async (area, t) => {
-    const { database, version } = area.backingStore;
+    const { database, store, version } = area.backingStore;
     const db = await migrateNamedDatabase(t, database, version + 1, () => {});
 
     const result = testFn(area);
@@ -37,8 +37,8 @@ for (const [method, testFn] of Object.entries(mustFail)) {
     await promise_rejects(t, "VersionError", result);
   }, `${method}: upgrading the database must cause a "VersionError" DOMException`);
 
-  testWithAreaNoCleanup(async (area, t) => {
-    const { database } = area.backingStore;
+  testWithArea(async (area, t) => {
+    const { database, store } = area.backingStore;
 
     // Set up a new database with that name, but with no object stores!
     // NB: this depends on the fact that createNameDatabase sets the initial version to 1, which is
@@ -47,69 +47,7 @@ for (const [method, testFn] of Object.entries(mustFail)) {
 
     const result = testFn(area);
 
-    await promise_rejects(t, "InvalidStateError", result);
-  }, `${method}: creating a same-named database with no object store must cause an "InvalidStateError" DOMException`);
-
-  testWithAreaNoCleanup(async (area, t) => {
-    const { database } = area.backingStore;
-
-    const db = await createNamedDatabase(t, database, db => {
-      db.createObjectStore("wrongName");
-    });
-
-    const result = testFn(area);
-
-    await promise_rejects(t, "InvalidStateError", result);
-  }, `${method}: creating a same-named database with a single object store with the wrong name must cause an "InvalidStateError" DOMException`);
-
-  testWithAreaNoCleanup(async (area, t) => {
-    const { database, store } = area.backingStore;
-
-    const db = await createNamedDatabase(t, database, db => {
-      db.createObjectStore(store);
-      db.createObjectStore("wrongName");
-    });
-
-    const result = testFn(area);
-
-    await promise_rejects(t, "InvalidStateError", result);
-  }, `${method}: creating a same-named database with more than one object store must cause an "InvalidStateError" DOMException`);
-
-  testWithAreaNoCleanup(async (area, t) => {
-    const { database, store } = area.backingStore;
-
-    const db = await createNamedDatabase(t, database, db => {
-      db.createObjectStore(store, { autoIncrement: true });
-    });
-
-    const result = testFn(area);
-
-    await promise_rejects(t, "InvalidStateError", result);
-  }, `${method}: creating a same-named database the right object store but a bad schema (autoIncrement = true) must cause an "InvalidStateError" DOMException`);
-
-  testWithAreaNoCleanup(async (area, t) => {
-    const { database, store } = area.backingStore;
-
-    const db = await createNamedDatabase(t, database, db => {
-      db.createObjectStore(store, { keyPath: "somekey" });
-    });
-
-    const result = testFn(area);
-
-    await promise_rejects(t, "InvalidStateError", result);
-  }, `${method}: creating a same-named database the right object store but a bad schema (keyPath != null) must cause an "InvalidStateError" DOMException`);
-
-  testWithAreaNoCleanup(async (area, t) => {
-    const { database, store } = area.backingStore;
-
-    const db = await createNamedDatabase(t, database, db => {
-      const s = db.createObjectStore(store);
-      s.createIndex("index", "indexKey");
-    });
-
-    const result = testFn(area);
-
-    await promise_rejects(t, "InvalidStateError", result);
-  }, `${method}: creating a same-named database the right object store but a bad schema (has indices) must cause an "InvalidStateError" DOMException`);
+    await promise_rejects(t, "NotFoundError", result);
+  }, `${method}: creating a same-named database with no object store must cause a "NotFoundError" DOMException`);
 }
 </script>
diff --git a/testing/web-platform/tests/kv-storage/helpers/kvs-tests.js b/testing/web-platform/tests/kv-storage/helpers/kvs-tests.js
index 0cf4c2fd3d5f..a6c4d58dfa5e 100644
--- a/testing/web-platform/tests/kv-storage/helpers/kvs-tests.js
+++ b/testing/web-platform/tests/kv-storage/helpers/kvs-tests.js
@@ -1,17 +1,6 @@
 import { StorageArea, storage as defaultArea } from "std:kv-storage";
 import { assertAsyncIteratorEquals, assertAsyncIteratorCustomEquals } from "./equality-asserters.js";
 
-// Used when we're manually creating the database, and so the IDB helpers also want to clean it up.
-// If we used testWithArea, then the IDB helpers would time out in their cleanup steps when they
-// fail to delete the already-deleted database.
-export function testWithAreaNoCleanup(testFn, description) {
-  promise_test(t => {
-    const area = new StorageArea(description);
-
-    return testFn(area, t);
-  }, description);
-}
-
 export function testWithArea(testFn, description) {
   promise_test(t => {
     const area = new StorageArea(description);
diff --git a/testing/web-platform/tests/kv-storage/storage-smoke-test.https.html b/testing/web-platform/tests/kv-storage/storage-smoke-test.https.html
index da48dc7cf13c..df6fd8c8181f 100644
--- a/testing/web-platform/tests/kv-storage/storage-smoke-test.https.html
+++ b/testing/web-platform/tests/kv-storage/storage-smoke-test.https.html
@@ -9,6 +9,19 @@
 import { testVariousMethodsWithDefaultArea } from "./helpers/kvs-tests.js";
 import { storage } from "std:kv-storage";
 
+test(() => {
+  const { backingStore } = storage;
+  assert_array_equals(Object.keys(backingStore), ["database", "store", "version"]);
+  assert_own_property(backingStore, "database");
+  assert_own_property(backingStore, "store");
+  assert_own_property(backingStore, "version");
+  assert_equals(Object.getPrototypeOf(backingStore), Object.prototype);
+
+  assert_equals(backingStore.database, "kv-storage:default");
+  assert_equals(backingStore.store, "store");
+  assert_equals(backingStore.version, 1);
+}, "backingStore returns the correct object");
+
 testVariousMethodsWithDefaultArea(
   "Storage methods smoke test with string key and value", "key", "value", assert_equals
 );
diff --git a/testing/web-platform/tests/layout-stability/buffer-layout-jank.html b/testing/web-platform/tests/layout-stability/buffer-layout-jank.html
deleted file mode 100644
index f5818cfbc64e..000000000000
--- a/testing/web-platform/tests/layout-stability/buffer-layout-jank.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE HTML>
-<meta charset=utf-8>
-<title>Layout Jank: query jank via the performance timeline</title>
-<body>
-<style>
-#myDiv { position: relative; width: 300px; height: 100px; }
-</style>
-<div id='myDiv'></div>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<!-- Delay onload by inserting a slow image.-->
-<img src="resources/slow-image.py">
-<script>
-  async_test(function (t) {
-    // Modify the position of the div.
-    document.getElementById('myDiv').style = "top: 60px";
-    function testBufferedEntry() {
-      if (performance.getEntriesByType('layoutJank').length === 0) {
-        t.step_timeout(testBufferedEntry, 0);
-        return;
-      }
-      assert_equals(performance.getEntriesByType('layoutJank').length, 1);
-      assert_equals(performance.getEntries().filter(
-        entry => entry.entryType === 'layoutJank').length, 1);
-      const entry = performance.getEntriesByType('layoutJank')[0];
-      assert_equals(entry.entryType, "layoutJank");
-      assert_equals(entry.name, "");
-      assert_equals(entry.startTime, 0.0);
-      assert_equals(entry.duration, 0.0);
-      // The layout jank fraction should be: 300 * (100 + 60) / viewport size.
-      assert_equals(entry.fraction, 300 * (100 + 60) /
-        (document.documentElement.clientWidth * document.documentElement.clientHeight));
-      t.done();
-    }
-    t.step(testBufferedEntry);
-  }, 'LayoutJank before onload is buffered into the performance timeline.');
-</script>
-
-</body>
diff --git a/testing/web-platform/tests/layout-stability/observe-layoutjank.html b/testing/web-platform/tests/layout-stability/observe-layoutjank.html
deleted file mode 100644
index 1a0533ac703e..000000000000
--- a/testing/web-platform/tests/layout-stability/observe-layoutjank.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML>
-<meta charset=utf-8>
-<title>Layout Jank: observe jank fraction via PerformanceObserver</title>
-<body>
-<style>
-#myDiv { position: relative; width: 300px; height: 100px; }
-</style>
-<div id='myDiv'></div>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script>
-  async_test(function (t) {
-    const observer = new PerformanceObserver(
-      t.step_func_done(function(entryList) {
-        assert_equals(entryList.getEntries().length, 1);
-        const entry = entryList.getEntries()[0];
-        assert_equals(entry.entryType, "layoutJank");
-        assert_equals(entry.name, "");
-        assert_equals(entry.startTime, 0.0);
-        assert_equals(entry.duration, 0.0);
-        // The layout jank fraction should be: 300 * (100 + 60) / viewport size.
-        assert_equals(entry.fraction, 300 * (100 + 60) /
-          (document.documentElement.clientWidth * document.documentElement.clientHeight));
-      })
-    );
-    observer.observe({entryTypes: ['layoutJank']});
-    window.onload = () => {
-      // Modify the position of the div.
-      document.getElementById('myDiv').style = "top: 60px";
-    };
-  }, 'LayoutJank is observable via PerformanceObserver.');
-</script>
-
-</body>
diff --git a/testing/web-platform/tests/layout-stability/resources/slow-image.py b/testing/web-platform/tests/layout-stability/resources/slow-image.py
deleted file mode 100644
index ee7988c551f6..000000000000
--- a/testing/web-platform/tests/layout-stability/resources/slow-image.py
+++ /dev/null
@@ -1,6 +0,0 @@
-import time
-
-def main(request, response):
-    # Sleep for 3s to delay onload.
-    time.sleep(3)
-    return [], ""
\ No newline at end of file
diff --git a/testing/web-platform/tests/layout-stability/supported-layout-type.html b/testing/web-platform/tests/layout-stability/supported-layout-type.html
deleted file mode 100644
index e3204b52f788..000000000000
--- a/testing/web-platform/tests/layout-stability/supported-layout-type.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<head>
-<title>PerformanceObserver.supportedEntryTypes contains "layoutJank"</title>
-</head>
-<body>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script>
-test(() => {
-  if (typeof PerformanceObserver.supportedEntryTypes === "undefined")
-    assert_unreached("supportedEntryTypes is not supported.");
-  assert_greater_than(PerformanceObserver.supportedEntryTypes.indexOf("layoutJank"), -1,
-    "There should be an entry 'layoutJank' in PerformanceObserver.supportedEntryTypes");
-}, "supportedEntryTypes contains 'layoutJank'.");
-</script>
-</body>
-</html>
diff --git a/testing/web-platform/tests/lint.whitelist b/testing/web-platform/tests/lint.whitelist
index 0d066ac741fe..64ff0296a46f 100644
--- a/testing/web-platform/tests/lint.whitelist
+++ b/testing/web-platform/tests/lint.whitelist
@@ -174,7 +174,6 @@ SET TIMEOUT: html/webappapis/scripting/events/event-handler-processing-algorithm
 SET TIMEOUT: html/webappapis/scripting/processing-model-2/*
 SET TIMEOUT: IndexedDB/*
 SET TIMEOUT: infrastructure/*
-SET TIMEOUT: intersection-observer/resources/v2-subframe.html
 SET TIMEOUT: intersection-observer/target-in-different-window.html
 SET TIMEOUT: media-source/mediasource-util.js
 SET TIMEOUT: media-source/URL-createObjectURL-revoke.html
diff --git a/testing/web-platform/tests/longtask-timing/longtask-in-sibling-iframe.html b/testing/web-platform/tests/longtask-timing/longtask-in-sibling-iframe.html
index 16f0998c2234..b8a4270163a1 100644
--- a/testing/web-platform/tests/longtask-timing/longtask-in-sibling-iframe.html
+++ b/testing/web-platform/tests/longtask-timing/longtask-in-sibling-iframe.html
@@ -14,10 +14,6 @@
     }
     window.addEventListener('message', t.step_func(e => {
       assert_equals(e.data['entryType'], 'longtask');
-      // Ignore any long task that may be produced by the top-level frame.
-      if (e.data['frame-attribution'] === 'same-origin-ancestor')
-        return;
-
       assert_equals(e.data['frame-attribution'], 'same-origin');
       assert_equals(e.data['task-attribution'], 'unknown');
       assert_equals(e.data['containerId'], 'longtask-iframe-id');
diff --git a/testing/web-platform/tests/mathml/META.yml b/testing/web-platform/tests/mathml/META.yml
index 5aea9088d744..a410f582f0a9 100644
--- a/testing/web-platform/tests/mathml/META.yml
+++ b/testing/web-platform/tests/mathml/META.yml
@@ -1,3 +1,3 @@
-spec: https://mathml-refresh.github.io/mathml-core/
+spec: http://www.mathml-association.org/MathMLinHTML5/
 suggested_reviewers:
   - fred-wang
diff --git a/testing/web-platform/tests/mathml/README.md b/testing/web-platform/tests/mathml/README.md
index 9524d275e479..bab35474dd57 100644
--- a/testing/web-platform/tests/mathml/README.md
+++ b/testing/web-platform/tests/mathml/README.md
@@ -1,7 +1,13 @@
-# Tests for the MathML Core specification
+# MathML: Tests for the MathML in HTML5 implementation note
 
 This directory contains tests for the
-[MathML Core specification](https://mathml-refresh.github.io/mathml-core/).
+[MathML in HTML5 implementation note](http://www.mathml-association.org/MathMLinHTML5/)
+which is itself based on the
+[HTML5 W3C recommendation](https://www.w3.org/TR/html5/),
+on the [MathML3 W3C recommendation](https://www.w3.org/TR/MathML3/)
+and on the
+[Open Font Format 3](http://www.iso.org/iso/home/store/catalogue_ics/catalogue_detail_ics.htm?csnumber=66391) standard.
+
 Many of the tests verify OpenType features and require specific Web fonts for
 that purpose. WOFF fonts are generated by scripts in the `tools/` folder using
 the Python API of
diff --git a/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-1.html b/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-1.html
index 6b9fb2844298..848eb5b144ce 100644
--- a/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-1.html
+++ b/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-1.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8">
 <title>Fraction</title>
-<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#mfrac">
+<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S3.html#SS3.SSS2">
 <meta name="assert" content="Verify fraction metrics for different sizes of numerator and denominator.">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff --git a/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-bar-001-ref.html b/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-bar-001-ref.html
deleted file mode 100644
index 5b7a8dff47e9..000000000000
--- a/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-bar-001-ref.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>fractions bar</title>
-    <style type="text/css">
-      #container {
-          position: absolute;
-          left: 10px;
-          top: 50px;
-          width: 150px;
-          height: 150px;
-          background: green;
-      }
-    </style>
-  </head>
-  <body>
-    <p>This test passes if you see a green square.</p>
-    <div id="container"></div>
-  </body>
-</html>
diff --git a/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-bar-001.html b/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-bar-001.html
deleted file mode 100644
index d6151f621907..000000000000
--- a/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-bar-001.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-wait">
-  <head>
-    <meta charset="utf-8">
-    <title>fractions bar</title>
-    <link rel="help" href="https://mathml-refresh.github.io/mathml-core/#mfrac">
-    <meta name="assert" content="Verifies painting of the fraction bar">
-    <link rel="match" href="frac-bar-001-ref.html">
-    <style type="text/css">
-      @font-face {
-        font-family: TestFont;
-        src: url("/fonts/math/fraction-rulethickness10000.woff");
-      }
-      math {
-        /* FractionRuleThickness = 10000 * 1 / 1000 = 10px; */
-        /* The gap / shift / axisheight parameters are set to 0. */
-        font-family: "TestFont";
-        font-size: 1px;
-      }
-      #container {
-          position: absolute;
-          left: 0;
-          top: 0;
-      }
-    </style>
-    <script src="/common/reftest-wait.js"></script>
-    <script>
-      window.addEventListener("load", () => {
-        // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
-        requestAnimationFrame(() => { document.fonts.ready.then(adjustPositionOfFraction); });
-      });
-      function adjustPositionOfFraction()
-      {
-        requestAnimationFrame(() => {
-          var container = document.getElementById("container");
-          var numeratorBox = document.getElementById("numerator").getBoundingClientRect();
-          container.style.left = (10 - numeratorBox.left) + "px";
-          container.style.top = (50 - numeratorBox.top) + "px";
-          requestAnimationFrame(takeScreenshot);
-        });
-      }
-    </script>
-  </head>
-  <body>
-    <p>This test passes if you see a green square.</p>
-    <div id="container">
-      <math>
-        <mfrac style="color: green; font-size: 15em">
-          <mspace id="numerator" width="150px"></mspace>
-          <mspace></mspace>
-        </mfrac>
-      </math>
-    </div>
-  </body>
-</html>
diff --git a/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-color-001-notref.html b/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-color-001-notref.html
deleted file mode 100644
index 498d6277a325..000000000000
--- a/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-color-001-notref.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>Fraction bar color</title>
-  </head>
-  <body style="font-size: 20pt;">
-    <p>This test passes if you see a fraction with a blue fraction bar.</p>
-    <math>
-      <mfrac>
-        <mspace width="200px" height="20px" style="background: black"></mspace>
-        <mspace width="200px" height="20px" style="background: black"></mspace>
-      </mfrac>
-    </math>
-  </body>
-</html>
diff --git a/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-color-001.html b/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-color-001.html
deleted file mode 100644
index d1a3e6eac41f..000000000000
--- a/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-color-001.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>Fraction bar color</title>
-    <link rel="help" href="https://mathml-refresh.github.io/mathml-core/#mfrac">
-    <meta name="assert" content="The CSS color property has an effect on the fraction bar.">
-    <link rel="mismatch" href="frac-color-001-notref.html">
-  </head>
-  <body style="font-size: 20pt;">
-    <p>This test passes if you see a fraction with a blue fraction bar.</p>
-    <math>
-      <mfrac style="color: blue;">
-        <mspace width="200px" height="20px" style="background: black"></mspace>
-        <mspace width="200px" height="20px" style="background: black"></mspace>
-      </mfrac>
-    </math>
-  </body>
-</html>
diff --git a/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-color-002-ref.html b/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-color-002-ref.html
deleted file mode 100644
index fe2f4fa7b189..000000000000
--- a/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-color-002-ref.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>fractions color</title>
-  </head>
-  <body>
-    <p>This test passes if you see a green square and a blue square.</p>
-    <div style="background: green; width: 200px; height: 200px;">
-    </div>
-    <div style="background: blue; width: 200px; height: 200px;">
-    </div>
-  </body>
-</html>
diff --git a/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-color-002.html b/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-color-002.html
deleted file mode 100644
index 597acab652c4..000000000000
--- a/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-color-002.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>fractions color</title>
-    <link rel="help" href="https://mathml-refresh.github.io/mathml-core/#mfrac">
-    <meta name="assert" content="Verifies the color attribute affects the fraction bar">
-    <link rel="match" href="frac-color-002-ref.html">
-  </head>
-  <body>
-    <p>This test passes if you see a green square and a blue square.</p>
-    <div style="background: green; width: 200px; height: 200px;">
-      <math>
-        <mspace width="10px"></mspace>
-        <mfrac style="color: green">
-          <mspace width="150px" height="20px"></mspace>
-          <mspace width="150px" height="20px"></mspace>
-        </mfrac>
-      </math>
-    </div>
-    <div style="background: blue; width: 200px; height: 200px;">
-      <math>
-        <mspace width="10px"></mspace>
-        <mfrac style="color: blue">
-          <mspace width="150px" height="20px"></mspace>
-          <mspace width="150px" height="20px"></mspace>
-        </mfrac>
-      </math>
-    </div>
-  </body>
-</html>
diff --git a/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-linethickness-001-ref.html b/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-linethickness-001-ref.html
deleted file mode 100644
index c703edb764fe..000000000000
--- a/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-linethickness-001-ref.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>fractions linethickness</title>
-    <style type="text/css">
-      @font-face {
-        font-family: TestFont;
-        src: url("/fonts/math/fraction-rulethickness10000.woff");
-      }
-      math {
-        /* FractionRuleThickness = 10000 * 1 / 1000 = 10px; */
-        font-family: "TestFont";
-        font-size: 1px;
-      }
-    </style>
-  </head>
-  <body>
-    <p>This test passes if you see fractions with line thickness equal to the height of their blue numerator and cyan denominator.</p>
-    <math>
-      <mfrac linethickness="5px">
-        <mspace width="20px" height="5px" style="background: blue"></mspace>
-        <mspace width="20px" height="5px" style="background: cyan"></mspace>
-      </mfrac>
-      <mfrac linethickness="10px">
-        <mspace width="20px" height="10px" style="background: blue"></mspace>
-        <mspace width="20px" height="10px" style="background: cyan"></mspace>
-      </mfrac>
-      <mfrac linethickness="20px">
-        <mspace width="20px" height="20px" style="background: blue"></mspace>
-        <mspace width="20px" height="20px" style="background: cyan"></mspace>
-      </mfrac>
-      <mfrac linethickness="50px">
-        <mspace width="20px" height="50px" style="background: blue"></mspace>
-        <mspace width="20px" height="50px" style="background: cyan"></mspace>
-      </mfrac>
-    </math>
-  </body>
-</html>
diff --git a/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-linethickness-001.html b/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-linethickness-001.html
deleted file mode 100644
index 83e15c83dc0b..000000000000
--- a/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-linethickness-001.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>fractions linethickness</title>
-    <link rel="help" href="https://mathml-refresh.github.io/mathml-core/#mfrac">
-    <meta name="assert" content="Verifies 'thin', 'medium', 'thick' and unitless values for the linethickness attribute of the mfrac element">
-    <link rel="match" href="frac-linethickness-001-ref.html">
-    <style type="text/css">
-      @font-face {
-        font-family: TestFont;
-        src: url("/fonts/math/fraction-rulethickness10000.woff");
-      }
-      math {
-        /* FractionRuleThickness = 10000 * 1 / 1000 = 10px; */
-        font-family: "TestFont";
-        font-size: 1px;
-      }
-    </style>
-  </head>
-  <body>
-    <p>This test passes if you see fractions with line thickness equal to the height of their blue numerator and cyan denominator.</p>
-    <math>
-      <mfrac linethickness="thin">
-        <mspace width="20px" height="5px" style="background: blue"></mspace>
-        <mspace width="20px" height="5px" style="background: cyan"></mspace>
-      </mfrac>
-      <mfrac linethickness="medium">
-        <mspace width="20px" height="10px" style="background: blue"></mspace>
-        <mspace width="20px" height="10px" style="background: cyan"></mspace>
-      </mfrac>
-      <mfrac linethickness="thick">
-        <mspace width="20px" height="20px" style="background: blue"></mspace>
-        <mspace width="20px" height="20px" style="background: cyan"></mspace>
-      </mfrac>
-      <mfrac linethickness="5">
-        <mspace width="20px" height="50px" style="background: blue"></mspace>
-        <mspace width="20px" height="50px" style="background: cyan"></mspace>
-      </mfrac>
-    </math>
-  </body>
-</html>
diff --git a/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-linethickness-002-ref.html b/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-linethickness-002-ref.html
deleted file mode 100644
index 69663938c195..000000000000
--- a/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-linethickness-002-ref.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>fractions linethickness</title>
-    <style type="text/css">
-      @font-face {
-        font-family: TestFont;
-        src: url("/fonts/math/fraction-rulethickness10000.woff");
-      }
-      math {
-        /* FractionRuleThickness = 10000 * 1 / 1000 = 10px; */
-        font-family: "TestFont";
-        font-size: 1px;
-      }
-    </style>
-  </head>
-  <body>
-    <p>This test passes if you see fraction with a cyan denominator and
-      a blue numerator as tall as its black bar.</p>
-    <math>
-      <mfrac linethickness="0px">
-        <mspace width="20px" height="0px" style="background: blue"></mspace>
-        <mspace width="20px" height="10px" style="background: cyan"></mspace>
-      </mfrac>
-    </math>
-    <math>
-      <mfrac linethickness="50px">
-        <mspace width="20px" height="50px" style="background: blue"></mspace>
-        <mspace width="20px" height="10px" style="background: cyan"></mspace>
-      </mfrac>
-    </math>
-    <math style="font-size: 180px">
-      <mfrac linethickness="0.3888888888888889em">
-        <mspace width="20px" height="70px" style="background: blue"></mspace>
-        <mspace width="20px" height="10px" style="background: cyan"></mspace>
-      </mfrac>
-    </math>
-  </body>
-</html>
diff --git a/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-linethickness-002.html b/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-linethickness-002.html
deleted file mode 100644
index fd4599464693..000000000000
--- a/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-linethickness-002.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>fractions linethickness</title>
-    <link rel="help" href="https://mathml-refresh.github.io/mathml-core/#mfrac">
-    <meta name="assert" content="Verifies fraction with negative, percent and named space linethickness values.">
-    <link rel="match" href="frac-linethickness-002-ref.html">
-    <style type="text/css">
-      @font-face {
-        font-family: TestFont;
-        src: url("/fonts/math/fraction-rulethickness10000.woff");
-      }
-      math {
-        /* FractionRuleThickness = 10000 * 1 / 1000 = 10px; */
-        font-family: "TestFont";
-        font-size: 1px;
-      }
-    </style>
-  </head>
-  <body>
-    <p>This test passes if you see fraction with a cyan denominator and
-      a blue numerator as tall as its black bar.</p>
-    <math>
-      <mfrac linethickness="-1.23em">
-        <mspace width="20px" height="0px" style="background: blue"></mspace>
-        <mspace width="20px" height="10px" style="background: cyan"></mspace>
-      </mfrac>
-    </math>
-    <math>
-      <mfrac linethickness="500%">
-        <mspace width="20px" height="50px" style="background: blue"></mspace>
-        <mspace width="20px" height="10px" style="background: cyan"></mspace>
-      </mfrac>
-    </math>
-    <math style="font-size: 180px">
-      <mfrac linethickness="veryverythickmathspace">
-        <mspace width="20px" height="70px" style="background: blue"></mspace>
-        <mspace width="20px" height="10px" style="background: cyan"></mspace>
-      </mfrac>
-    </math>
-  </body>
-</html>
diff --git a/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-linethickness-003-notref.html b/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-linethickness-003-notref.html
deleted file mode 100644
index 934d66633397..000000000000
--- a/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-linethickness-003-notref.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>fractions linethickness</title>
-  </head>
-  <body>
-    <p>This test passes if you see a fraction without fraction bar.</p>
-    <math>
-      <mfrac>
-        <mspace width="20px" height="5px" style="background: blue"></mspace>
-        <mspace width="20px" height="5px" style="background: cyan"></mspace>
-      </mfrac>
-    </math>
-  </body>
-</html>
diff --git a/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-linethickness-003.html b/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-linethickness-003.html
deleted file mode 100644
index b23cce80be40..000000000000
--- a/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-linethickness-003.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>fractions linethickness</title>
-    <link rel="help" href="https://mathml-refresh.github.io/mathml-core/#mfrac">
-    <meta name="assert" content="Verifies fraction with 0px bar.">
-    <link rel="mismatch" href="frac-linethickness-003-notref.html">
-  </head>
-  <body>
-    <p>This test passes if you see a fraction without fraction bar.</p>
-    <math>
-      <mfrac linethickness="0px">
-        <mspace width="20px" height="5px" style="background: blue"></mspace>
-        <mspace width="20px" height="5px" style="background: cyan"></mspace>
-      </mfrac>
-    </math>
-  </body>
-</html>
diff --git a/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-mrow-001-ref.html b/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-mrow-001-ref.html
deleted file mode 100644
index e42cb96fe838..000000000000
--- a/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-mrow-001-ref.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>Fraction mrow</title>
-  </head>
-  <body style="font-size: 20pt;">
-    <p>This test passes if you see a fraction with a blue square as numerator and a cyan square as denominator.</p>
-    <math>
-      <mfrac>
-        <mspace width="60px" height="60px" style="background: blue"></mspace>
-        <mspace width="60px" height="60px" style="background: cyan"></mspace>
-      </mfrac>
-    </math>
-  </body>
-</html>
diff --git a/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-mrow-001.html b/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-mrow-001.html
deleted file mode 100644
index 144764500085..000000000000
--- a/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-mrow-001.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>Fraction mrow</title>
-    <link rel="help" href="https://mathml-refresh.github.io/mathml-core/#mfrac">
-    <link rel="help" href="https://mathml-refresh.github.io/mathml-core/#mrow">
-    <meta name="assert" content="This test that <mrow> elements can be used as numerator and denominator of fractions.">
-    <link rel="match" href="frac-mrow-001-ref.html">
-  </head>
-  <body style="font-size: 20pt;">
-    <p>This test passes if you see a fraction with a blue square as numerator and a cyan square as denominator.</p>
-    <math>
-      <mfrac>
-        <mrow>
-          <mspace width="30px" height="60px" style="background: blue"></mspace>
-          <mspace width="30px" height="60px" style="background: blue "></mspace>
-        </mrow>
-        <mrow>
-          <mspace width="30px" height="60px" style="background: cyan"></mspace>
-          <mspace width="30px" height="60px" style="background: cyan "></mspace>
-        </mrow>
-      </mfrac>
-    </math>
-  </body>
-</html>
diff --git a/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-numalign-denomalign-001-ref.html b/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-numalign-denomalign-001-ref.html
deleted file mode 100644
index 2fa978624dc2..000000000000
--- a/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-numalign-denomalign-001-ref.html
+++ /dev/null
@@ -1,73 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>Fraction numalign denomalign</title>
-  </head>
-  <body>
-    <p>This test passes if you see 3 fractions with a numerator respectively
-      aligned left/center/right with respect to the denominator ;
-      followed by 3 fractions with a denominator respectively aligned
-      left/center/right with respect to the numerator.</p>
-    <p>
-      <math>
-        <mfrac>
-          <mrow>
-            <mspace width="10px" height="20px" style="background: blue;"></mspace>
-            <mspace width="20px" height="20px"></mspace>
-          </mrow>
-          <mspace width="30px" height="20px" style="background: cyan;"></mspace>
-        </mfrac>
-      </math>
-      <math>
-        <mfrac>
-          <mrow>
-            <mspace width="10px" height="20px"></mspace>
-            <mspace width="10px" height="20px" style="background: blue;"></mspace>
-            <mspace width="10px" height="20px"></mspace>
-          </mrow>
-          <mspace width="30px" height="20px" style="background: cyan;"></mspace>
-        </mfrac>
-      </math>
-      <math>
-        <mfrac>
-          <mrow>
-            <mspace width="20px" height="20px"></mspace>
-            <mspace width="10px" height="20px" style="background: blue;"></mspace>
-          </mrow>
-          <mspace width="30px" height="20px" style="background: cyan;"></mspace>
-        </mfrac>
-      </math>
-    </p>
-    <p>
-      <math>
-        <mfrac>
-          <mspace width="30px" height="20px" style="background: cyan;"></mspace>
-          <mrow>
-            <mspace width="10px" height="20px" style="background: blue;"></mspace>
-            <mspace width="20px" height="20px"></mspace>
-          </mrow>
-        </mfrac>
-      </math>
-      <math>
-        <mfrac>
-          <mspace width="30px" height="20px" style="background: cyan;"></mspace>
-          <mrow>
-            <mspace width="10px" height="20px"></mspace>
-            <mspace width="10px" height="20px" style="background: blue;"></mspace>
-            <mspace width="10px" height="20px"></mspace>
-          </mrow>
-        </mfrac>
-      </math>
-      <math>
-        <mfrac>
-          <mspace width="30px" height="20px" style="background: cyan;"></mspace>
-          <mrow>
-            <mspace width="20px" height="20px"></mspace>
-            <mspace width="10px" height="20px" style="background: blue;"></mspace>
-          </mrow>
-        </mfrac>
-      </math>
-    </p>
-  </body>
-</html>
diff --git a/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-numalign-denomalign-001.html b/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-numalign-denomalign-001.html
deleted file mode 100644
index d734f1d1f339..000000000000
--- a/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-numalign-denomalign-001.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>Fraction numalign denomalign</title>
-    <link rel="help" href="https://mathml-refresh.github.io/mathml-core/#mfrac">
-    <meta name="assert" content="This fraction alignment with the numalign/denomalign attributes.">
-    <link rel="match" href="frac-numalign-denomalign-001-ref.html">
-  </head>
-  <body>
-    <p>This test passes if you see 3 fractions with a numerator respectively
-      aligned left/center/right with respect to the denominator ;
-      followed by 3 fractions with a denominator respectively aligned
-      left/center/right with respect to the numerator.</p>
-    <p>
-      <math>
-        <mfrac numalign="left">
-          <mspace width="10px" height="20px" style="background: blue;"></mspace>
-          <mspace width="30px" height="20px" style="background: cyan;"></mspace>
-        </mfrac>
-      </math>
-      <math>
-        <mfrac numalign="center">
-          <mspace width="10px" height="20px" style="background: blue;"></mspace>
-          <mspace width="30px" height="20px" style="background: cyan;"></mspace>
-        </mfrac>
-      </math>
-      <math>
-        <mfrac numalign="right">
-          <mspace width="10px" height="20px" style="background: blue;"></mspace>
-          <mspace width="30px" height="20px" style="background: cyan;"></mspace>
-        </mfrac>
-      </math>
-    </p>
-    <p>
-      <math>
-        <mfrac denomalign="left">
-          <mspace width="30px" height="20px" style="background: cyan;"></mspace>
-          <mspace width="10px" height="20px" style="background: blue;"></mspace>
-        </mfrac>
-      </math>
-      <math>
-        <mfrac denomalign="center">
-          <mspace width="30px" height="20px" style="background: cyan;"></mspace>
-          <mspace width="10px" height="20px" style="background: blue;"></mspace>
-        </mfrac>
-      </math>
-      <math>
-        <mfrac denomalign="right">
-          <mspace width="30px" height="20px" style="background: cyan;"></mspace>
-          <mspace width="10px" height="20px" style="background: blue;"></mspace>
-        </mfrac>
-      </math>
-    </p>
-  </body>
-</html>
diff --git a/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-parameters-1.html b/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-parameters-1.html
index 59e335ae5a3d..543017e19006 100644
--- a/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-parameters-1.html
+++ b/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-parameters-1.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8">
 <title>Fraction parameters</title>
-<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#mfrac">
+<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S3.html#SS3.SSS2">
 <meta name="assert" content="Element mfrac correctly uses the fraction parameters from the MATH table.">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff --git a/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-parameters-2.html b/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-parameters-2.html
index b1ee502ccdae..75074875c9e6 100644
--- a/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-parameters-2.html
+++ b/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-parameters-2.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8">
 <title>Stack parameters</title>
-<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#mfrac">
+<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S3.html#SS3.SSS2">
 <meta name="assert" content="Element mfrac correctly uses the stack parameters from the MATH table.">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff --git a/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-visibility-001-ref.html b/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-visibility-001-ref.html
deleted file mode 100644
index 41a262d51119..000000000000
--- a/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-visibility-001-ref.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>Fraction bar visibility</title>
-  </head>
-  <body>
-    <p>This test passes if you see a green square and no red.</p>
-    <div style="background: green; width: 200px; height: 200px;">
-    </div>
-  </body>
-</html>
diff --git a/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-visibility-001.html b/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-visibility-001.html
deleted file mode 100644
index 8fbf5ac806e6..000000000000
--- a/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-visibility-001.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>Fraction bar visibility</title>
-    <link rel="help" href="https://mathml-refresh.github.io/mathml-core/#mfrac">
-    <meta name="assert" content="The CSS visible property affects the rendering of the fraction bar.">
-    <link rel="match" href="frac-visibility-001-ref.html">
-  </head>
-  <body>
-    <p>This test passes if you see a green square and no red.</p>
-    <div style="background: green; width: 200px; height: 200px;">
-      <math>
-        <mfrac style="visibility: hidden; color: red">
-          <mspace width="200px" height="20px"></mspace>
-          <mspace width="200px" height="20px"></mspace>
-        </mfrac>
-      </math>
-    </div>
-  </body>
-</html>
diff --git a/testing/web-platform/tests/mathml/presentation-markup/operators/mo-axis-height-1.html b/testing/web-platform/tests/mathml/presentation-markup/operators/mo-axis-height-1.html
index c88484b9d59a..7b0031ac1ed6 100644
--- a/testing/web-platform/tests/mathml/presentation-markup/operators/mo-axis-height-1.html
+++ b/testing/web-platform/tests/mathml/presentation-markup/operators/mo-axis-height-1.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8">
 <title>mo axis height</title>
-<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#tokenmo">
+<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S3.html#SS2.SSS4">
 <meta name="assert" content="Element mo correctly uses the axis height parameter from the MATH table.">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff --git a/testing/web-platform/tests/mathml/presentation-markup/radicals/root-parameters-1.html b/testing/web-platform/tests/mathml/presentation-markup/radicals/root-parameters-1.html
index 51d4713d4ea1..8ffcbe4a22d1 100644
--- a/testing/web-platform/tests/mathml/presentation-markup/radicals/root-parameters-1.html
+++ b/testing/web-platform/tests/mathml/presentation-markup/radicals/root-parameters-1.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8">
 <title>Radical parameters</title>
-<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#msqrt">
+<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S3.html#SS3.SSS3">
 <meta name="assert" content="Elements msqrt and mroot correctly use the radical parameters from the MATH table.">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff --git a/testing/web-platform/tests/mathml/presentation-markup/scripts/subsup-1.html b/testing/web-platform/tests/mathml/presentation-markup/scripts/subsup-1.html
index 447aa66d4a30..39768315e72d 100644
--- a/testing/web-platform/tests/mathml/presentation-markup/scripts/subsup-1.html
+++ b/testing/web-platform/tests/mathml/presentation-markup/scripts/subsup-1.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8">
 <title>Subscripts and Superscripts metrics</title>
-<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#msubmsup">
+<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S3.html#SS4">
 <meta name="assert" content="Basic metrics for elements msub, msup and msubsup.">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff --git a/testing/web-platform/tests/mathml/presentation-markup/scripts/subsup-2.html b/testing/web-platform/tests/mathml/presentation-markup/scripts/subsup-2.html
index 9e2b6dbef790..26fa5de780b0 100644
--- a/testing/web-platform/tests/mathml/presentation-markup/scripts/subsup-2.html
+++ b/testing/web-platform/tests/mathml/presentation-markup/scripts/subsup-2.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8">
 <title>Subscripts and Superscripts metrics</title>
-<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#msubmsup">
+<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S3.html#SS4">
 <meta name="assert" content="Basic metrics for the mmultiscript element.">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff --git a/testing/web-platform/tests/mathml/presentation-markup/scripts/subsup-3.html b/testing/web-platform/tests/mathml/presentation-markup/scripts/subsup-3.html
index 742fa8cbce64..231f65ab4f46 100644
--- a/testing/web-platform/tests/mathml/presentation-markup/scripts/subsup-3.html
+++ b/testing/web-platform/tests/mathml/presentation-markup/scripts/subsup-3.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8">
 <title>Subscripts and Superscripts metrics</title>
-<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#msubmsup">
+<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S3.html#SS4">
 <meta name="assert" content="Basic metrics for the mmultiscript element with many scripts.">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff --git a/testing/web-platform/tests/mathml/presentation-markup/scripts/subsup-4.html b/testing/web-platform/tests/mathml/presentation-markup/scripts/subsup-4.html
index fc70fef9b801..c4bf4382f8ed 100644
--- a/testing/web-platform/tests/mathml/presentation-markup/scripts/subsup-4.html
+++ b/testing/web-platform/tests/mathml/presentation-markup/scripts/subsup-4.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8">
 <title>Subscripts and Superscripts metrics</title>
-<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#msubmsup">
+<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S3.html#SS4">
 <meta name="assert" content="Verify metrics of scripted elements for bases of different heights.">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff --git a/testing/web-platform/tests/mathml/presentation-markup/scripts/subsup-5.html b/testing/web-platform/tests/mathml/presentation-markup/scripts/subsup-5.html
index a67d68d5e031..005ceea40199 100644
--- a/testing/web-platform/tests/mathml/presentation-markup/scripts/subsup-5.html
+++ b/testing/web-platform/tests/mathml/presentation-markup/scripts/subsup-5.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8">
 <title>Subscripts and Superscripts metrics</title>
-<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#msubmsup">
+<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S3.html#SS4">
 <meta name="assert" content="Verify metrics of scripted elements with tall scripts.">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff --git a/testing/web-platform/tests/mathml/presentation-markup/scripts/subsup-parameters-1.html b/testing/web-platform/tests/mathml/presentation-markup/scripts/subsup-parameters-1.html
index 208a0a870d6e..b0ebaceb4355 100644
--- a/testing/web-platform/tests/mathml/presentation-markup/scripts/subsup-parameters-1.html
+++ b/testing/web-platform/tests/mathml/presentation-markup/scripts/subsup-parameters-1.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8">
 <title>Subscripts and Superscripts parameters</title>
-<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#msubmsup">
+<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S3.html#SS4">
 <meta name="assert" content="Elements msub, msup, subsup and msubsup correctly use the subscript and superscript parameters from the MATH table.">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff --git a/testing/web-platform/tests/mathml/presentation-markup/scripts/subsup-parameters-2.html b/testing/web-platform/tests/mathml/presentation-markup/scripts/subsup-parameters-2.html
index 4a9db6618bcc..5ba66b86c3da 100644
--- a/testing/web-platform/tests/mathml/presentation-markup/scripts/subsup-parameters-2.html
+++ b/testing/web-platform/tests/mathml/presentation-markup/scripts/subsup-parameters-2.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8">
 <title>Subscripts and Superscripts parameters</title>
-<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#msubmsup">
+<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S3.html#SS4">
 <meta name="assert" content="Elements msub, msup, subsup and msubsup correctly use the italic correction from the MATH table.">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff --git a/testing/web-platform/tests/mathml/presentation-markup/scripts/underover-1.html b/testing/web-platform/tests/mathml/presentation-markup/scripts/underover-1.html
index 45367e3541b2..6dcdbb7b388b 100644
--- a/testing/web-platform/tests/mathml/presentation-markup/scripts/underover-1.html
+++ b/testing/web-platform/tests/mathml/presentation-markup/scripts/underover-1.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8">
 <title>Underscripts and Overscripts parameters</title>
-<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#mundermover">
+<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S3.html#SS4">
 <meta name="assert" content="Elements munder, mover, munderover correctly .">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff --git a/testing/web-platform/tests/mathml/presentation-markup/scripts/underover-parameters-1.html b/testing/web-platform/tests/mathml/presentation-markup/scripts/underover-parameters-1.html
index cc09abb899ad..802293829fd8 100644
--- a/testing/web-platform/tests/mathml/presentation-markup/scripts/underover-parameters-1.html
+++ b/testing/web-platform/tests/mathml/presentation-markup/scripts/underover-parameters-1.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8">
 <title>Underscripts and Overscripts parameters</title>
-<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#mundermover">
+<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S3.html#SS4">
 <meta name="assert" content="Elements munder, mover, munderover correctly use the limit parameters from the MATH table.">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff --git a/testing/web-platform/tests/mathml/presentation-markup/scripts/underover-parameters-2.html b/testing/web-platform/tests/mathml/presentation-markup/scripts/underover-parameters-2.html
index d6d9185cc961..e9d6af4901e1 100644
--- a/testing/web-platform/tests/mathml/presentation-markup/scripts/underover-parameters-2.html
+++ b/testing/web-platform/tests/mathml/presentation-markup/scripts/underover-parameters-2.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8">
 <title>Underscripts and Overscripts parameters</title>
-<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#mundermover">
+<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S3.html#SS4">
 <meta name="assert" content="Elements munder, mover, munderover correctly use the stretch stack parameters from the MATH table.">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff --git a/testing/web-platform/tests/mathml/presentation-markup/scripts/underover-parameters-3.html b/testing/web-platform/tests/mathml/presentation-markup/scripts/underover-parameters-3.html
index 23c7dfa74455..373d6d4d06ec 100644
--- a/testing/web-platform/tests/mathml/presentation-markup/scripts/underover-parameters-3.html
+++ b/testing/web-platform/tests/mathml/presentation-markup/scripts/underover-parameters-3.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8">
 <title>Underscripts and Overscripts parameters</title>
-<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#mundermover">
+<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S3.html#SS4">
 <meta name="assert" content="Elements munder, mover, munderover correctly use underbar/overbar and AccentBaseHeight parameters from the MATH table.">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff --git a/testing/web-platform/tests/mathml/presentation-markup/scripts/underover-parameters-4.html b/testing/web-platform/tests/mathml/presentation-markup/scripts/underover-parameters-4.html
index bfc3cafa913f..3b1fa575f724 100644
--- a/testing/web-platform/tests/mathml/presentation-markup/scripts/underover-parameters-4.html
+++ b/testing/web-platform/tests/mathml/presentation-markup/scripts/underover-parameters-4.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8">
 <title>Underscripts and Overscripts parameters</title>
-<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#mundermover">
+<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S3.html#SS4">
 <meta name="assert" content="Elements munder, mover, munderover correctly use underbar/overbar and AccentBaseHeight parameters from the MATH table.">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff --git a/testing/web-platform/tests/mathml/presentation-markup/spaces/space-1.html b/testing/web-platform/tests/mathml/presentation-markup/spaces/space-1.html
index 7bc5b8e5128d..cb9dd9e9acbd 100644
--- a/testing/web-platform/tests/mathml/presentation-markup/spaces/space-1.html
+++ b/testing/web-platform/tests/mathml/presentation-markup/spaces/space-1.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8">
 <title>Space</title>
-<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#mspace">
+<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S3.html#SS2.SSS6">
 <meta name="assert" content="Verify mspace metrics for different values of height, depth and width">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff --git a/testing/web-platform/tests/mathml/presentation-markup/spaces/space-2.html b/testing/web-platform/tests/mathml/presentation-markup/spaces/space-2.html
index 5b8351a1ed00..072f2bda542f 100644
--- a/testing/web-platform/tests/mathml/presentation-markup/spaces/space-2.html
+++ b/testing/web-platform/tests/mathml/presentation-markup/spaces/space-2.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8">
 <title>space</title>
-<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#mspace">
+<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S3.html#SS2.SSS6">
 <link rel="match" href="space-2-ref.html"/>
 <meta name="assert" content="Verify mspace visual rendering for different values of height, depth and width">
 </head>
diff --git a/testing/web-platform/tests/mathml/presentation-markup/tables/table-axis-height.html b/testing/web-platform/tests/mathml/presentation-markup/tables/table-axis-height.html
index e723008b4103..024bdd29b116 100644
--- a/testing/web-platform/tests/mathml/presentation-markup/tables/table-axis-height.html
+++ b/testing/web-platform/tests/mathml/presentation-markup/tables/table-axis-height.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8">
 <title>table axis height</title>
-<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#tables">
+<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S3.html#SS5">
 <meta name="assert" content="Element mtable correctly uses the axis height parameter from the MATH table.">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff --git a/testing/web-platform/tests/mathml/relations/css-styling/color-1.html b/testing/web-platform/tests/mathml/relations/css-styling/color-1.html
index 8158cec6a864..4ef821340d22 100644
--- a/testing/web-platform/tests/mathml/relations/css-styling/color-1.html
+++ b/testing/web-platform/tests/mathml/relations/css-styling/color-1.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8">
 <title>color</title>
-<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#cssstyling">
+<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS3.SSS1">
 <link rel="match" href="color-1-ref.html"/>
 <meta name="assert" content="Verify that the color is used for text and graphical elements.">
 </head>
diff --git a/testing/web-platform/tests/mathml/relations/css-styling/display-1.html b/testing/web-platform/tests/mathml/relations/css-styling/display-1.html
index 9ae6fe0b84f4..a7d6277d70d1 100644
--- a/testing/web-platform/tests/mathml/relations/css-styling/display-1.html
+++ b/testing/web-platform/tests/mathml/relations/css-styling/display-1.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8">
 <title>display</title>
-<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#cssstyling">
+<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS3.SSS1">
 <link rel="match" href="display-1-ref.html"/>
 <meta name="assert" content="Verify that the 'display: none' property works on MathML elements.">
 </head>
diff --git a/testing/web-platform/tests/mathml/relations/css-styling/displaystyle-1.html b/testing/web-platform/tests/mathml/relations/css-styling/displaystyle-1.html
index ddb2173a2e01..3143343da7e3 100644
--- a/testing/web-platform/tests/mathml/relations/css-styling/displaystyle-1.html
+++ b/testing/web-platform/tests/mathml/relations/css-styling/displaystyle-1.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8">
 <title>displaystyle</title>
-<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#cssstyling">
+<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS3.SSS1">
 <meta name="assert" content="Verify that the correct inheritance of the displaystyle value by measuring the size of large operators.">
 <style>
   @font-face {
diff --git a/testing/web-platform/tests/mathml/relations/css-styling/lengths-1.html b/testing/web-platform/tests/mathml/relations/css-styling/lengths-1.html
index 0e3a74d46f99..e5864ccc2aca 100644
--- a/testing/web-platform/tests/mathml/relations/css-styling/lengths-1.html
+++ b/testing/web-platform/tests/mathml/relations/css-styling/lengths-1.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8"/>
 <title>MathML lengths</title>
-<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#cssstyling"/>
+<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS3.SSS1"/>
 <link rel="match" href="lengths-1-ref.html"/>
 <meta name="assert" content="Verify whether the different units are accepted for MathML lengths.">
 <style>
diff --git a/testing/web-platform/tests/mathml/relations/css-styling/lengths-2.html b/testing/web-platform/tests/mathml/relations/css-styling/lengths-2.html
index 37cc640b3078..e88111aa537c 100644
--- a/testing/web-platform/tests/mathml/relations/css-styling/lengths-2.html
+++ b/testing/web-platform/tests/mathml/relations/css-styling/lengths-2.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8"/>
 <title>MathML lengths</title>
-<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#cssstyling"/>
+<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS3.SSS1"/>
 <link rel="match" href="lengths-2-ref.html"/>
 <meta name="assert" content="Verify whether the different namedspaces are accepted for MathML lengths.">
 <style>
diff --git a/testing/web-platform/tests/mathml/relations/css-styling/lengths-3.html b/testing/web-platform/tests/mathml/relations/css-styling/lengths-3.html
index aa38e9729de8..68a144aca69c 100644
--- a/testing/web-platform/tests/mathml/relations/css-styling/lengths-3.html
+++ b/testing/web-platform/tests/mathml/relations/css-styling/lengths-3.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8">
 <title>MathML lengths</title>
-<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#cssstyling"/>
+<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS3.SSS1"/>
 <meta name="assert" content="Verify various cases of the MathML length syntax.">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff --git a/testing/web-platform/tests/mathml/relations/css-styling/mathvariant-bold-fraktur.html b/testing/web-platform/tests/mathml/relations/css-styling/mathvariant-bold-fraktur.html
index f41418108205..487d61d7d852 100644
--- a/testing/web-platform/tests/mathml/relations/css-styling/mathvariant-bold-fraktur.html
+++ b/testing/web-platform/tests/mathml/relations/css-styling/mathvariant-bold-fraktur.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8"/>
 <title>mathvariant bold-fraktur</title>
-<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#cssproperties"/>
+<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS3.SSS1.tab2"/>
 <link rel="match" href="mathvariant-bold-fraktur-ref.html"/>
 <meta name="assert" content="Verify that a single-char <mtext> with a bold-fraktur mathvariant is equivalent to an <mtext> with the transformed unicode character.">
 <style>
diff --git a/testing/web-platform/tests/mathml/relations/css-styling/mathvariant-bold-italic.html b/testing/web-platform/tests/mathml/relations/css-styling/mathvariant-bold-italic.html
index 7b53e986d4f0..640baf34da88 100644
--- a/testing/web-platform/tests/mathml/relations/css-styling/mathvariant-bold-italic.html
+++ b/testing/web-platform/tests/mathml/relations/css-styling/mathvariant-bold-italic.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8"/>
 <title>mathvariant bold-italic</title>
-<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#cssproperties"/>
+<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS3.SSS1.tab2"/>
 <link rel="match" href="mathvariant-bold-italic-ref.html"/>
 <meta name="assert" content="Verify that a single-char <mtext> with a bold-italic mathvariant is equivalent to an <mtext> with the transformed unicode character.">
 <style>
diff --git a/testing/web-platform/tests/mathml/relations/css-styling/mathvariant-bold-sans-serif.html b/testing/web-platform/tests/mathml/relations/css-styling/mathvariant-bold-sans-serif.html
index 544db02f2eed..1cab2372ba34 100644
--- a/testing/web-platform/tests/mathml/relations/css-styling/mathvariant-bold-sans-serif.html
+++ b/testing/web-platform/tests/mathml/relations/css-styling/mathvariant-bold-sans-serif.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8"/>
 <title>mathvariant bold-sans-serif</title>
-<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#cssproperties"/>
+<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS3.SSS1.tab2"/>
 <link rel="match" href="mathvariant-bold-sans-serif-ref.html"/>
 <meta name="assert" content="Verify that a single-char <mtext> with a bold-sans-serif mathvariant is equivalent to an <mtext> with the transformed unicode character.">
 <style>
diff --git a/testing/web-platform/tests/mathml/relations/css-styling/mathvariant-bold-script.html b/testing/web-platform/tests/mathml/relations/css-styling/mathvariant-bold-script.html
index dc48fbeaaf54..9083afa801d7 100644
--- a/testing/web-platform/tests/mathml/relations/css-styling/mathvariant-bold-script.html
+++ b/testing/web-platform/tests/mathml/relations/css-styling/mathvariant-bold-script.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8"/>
 <title>mathvariant bold-script</title>
-<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#cssproperties"/>
+<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS3.SSS1.tab2"/>
 <link rel="match" href="mathvariant-bold-script-ref.html"/>
 <meta name="assert" content="Verify that a single-char <mtext> with a bold-script mathvariant is equivalent to an <mtext> with the transformed unicode character.">
 <style>
diff --git a/testing/web-platform/tests/mathml/relations/css-styling/mathvariant-bold.html b/testing/web-platform/tests/mathml/relations/css-styling/mathvariant-bold.html
index a51be7b23fd2..b3fe917d23c6 100644
--- a/testing/web-platform/tests/mathml/relations/css-styling/mathvariant-bold.html
+++ b/testing/web-platform/tests/mathml/relations/css-styling/mathvariant-bold.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8"/>
 <title>mathvariant bold</title>
-<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#cssproperties"/>
+<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS3.SSS1.tab2"/>
 <link rel="match" href="mathvariant-bold-ref.html"/>
 <meta name="assert" content="Verify that a single-char <mtext> with a bold mathvariant is equivalent to an <mtext> with the transformed unicode character.">
 <style>
diff --git a/testing/web-platform/tests/mathml/relations/css-styling/mathvariant-double-struck.html b/testing/web-platform/tests/mathml/relations/css-styling/mathvariant-double-struck.html
index 3090fdc85c04..e51908e1ea39 100644
--- a/testing/web-platform/tests/mathml/relations/css-styling/mathvariant-double-struck.html
+++ b/testing/web-platform/tests/mathml/relations/css-styling/mathvariant-double-struck.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8"/>
 <title>mathvariant double-struck</title>
-<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#cssproperties"/>
+<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS3.SSS1.tab2"/>
 <link rel="match" href="mathvariant-double-struck-ref.html"/>
 <meta name="assert" content="Verify that a single-char <mtext> with a double-struck mathvariant is equivalent to an <mtext> with the transformed unicode character.">
 <style>
diff --git a/testing/web-platform/tests/mathml/relations/css-styling/mathvariant-fraktur.html b/testing/web-platform/tests/mathml/relations/css-styling/mathvariant-fraktur.html
index 8bd15a558bf7..124891727cd4 100644
--- a/testing/web-platform/tests/mathml/relations/css-styling/mathvariant-fraktur.html
+++ b/testing/web-platform/tests/mathml/relations/css-styling/mathvariant-fraktur.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8"/>
 <title>mathvariant fraktur</title>
-<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#cssproperties"/>
+<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS3.SSS1.tab2"/>
 <link rel="match" href="mathvariant-fraktur-ref.html"/>
 <meta name="assert" content="Verify that a single-char <mtext> with a fraktur mathvariant is equivalent to an <mtext> with the transformed unicode character.">
 <style>
diff --git a/testing/web-platform/tests/mathml/relations/css-styling/mathvariant-initial.html b/testing/web-platform/tests/mathml/relations/css-styling/mathvariant-initial.html
index 58751bd12669..df9e0af7fc53 100644
--- a/testing/web-platform/tests/mathml/relations/css-styling/mathvariant-initial.html
+++ b/testing/web-platform/tests/mathml/relations/css-styling/mathvariant-initial.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8"/>
 <title>mathvariant initial</title>
-<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#cssproperties"/>
+<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS3.SSS1.tab2"/>
 <link rel="match" href="mathvariant-initial-ref.html"/>
 <meta name="assert" content="Verify that a single-char <mtext> with a initial mathvariant is equivalent to an <mtext> with the transformed unicode character.">
 <style>
diff --git a/testing/web-platform/tests/mathml/relations/css-styling/mathvariant-italic.html b/testing/web-platform/tests/mathml/relations/css-styling/mathvariant-italic.html
index 5bcbd322de85..e1612a528c89 100644
--- a/testing/web-platform/tests/mathml/relations/css-styling/mathvariant-italic.html
+++ b/testing/web-platform/tests/mathml/relations/css-styling/mathvariant-italic.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8"/>
 <title>mathvariant italic</title>
-<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#cssproperties"/>
+<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS3.SSS1.tab2"/>
 <link rel="match" href="mathvariant-italic-ref.html"/>
 <meta name="assert" content="Verify that a single-char <mtext> with a italic mathvariant is equivalent to an <mtext> with the transformed unicode character.">
 <style>
diff --git a/testing/web-platform/tests/mathml/relations/css-styling/mathvariant-looped.html b/testing/web-platform/tests/mathml/relations/css-styling/mathvariant-looped.html
index 0326e86e8f4f..81206e1facff 100644
--- a/testing/web-platform/tests/mathml/relations/css-styling/mathvariant-looped.html
+++ b/testing/web-platform/tests/mathml/relations/css-styling/mathvariant-looped.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8"/>
 <title>mathvariant looped</title>
-<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#cssproperties"/>
+<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS3.SSS1.tab2"/>
 <link rel="match" href="mathvariant-looped-ref.html"/>
 <meta name="assert" content="Verify that a single-char <mtext> with a looped mathvariant is equivalent to an <mtext> with the transformed unicode character.">
 <style>
diff --git a/testing/web-platform/tests/mathml/relations/css-styling/mathvariant-monospace.html b/testing/web-platform/tests/mathml/relations/css-styling/mathvariant-monospace.html
index 8d9a5d3df27c..8d4a4ad92343 100644
--- a/testing/web-platform/tests/mathml/relations/css-styling/mathvariant-monospace.html
+++ b/testing/web-platform/tests/mathml/relations/css-styling/mathvariant-monospace.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8"/>
 <title>mathvariant monospace</title>
-<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#cssproperties"/>
+<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS3.SSS1.tab2"/>
 <link rel="match" href="mathvariant-monospace-ref.html"/>
 <meta name="assert" content="Verify that a single-char <mtext> with a monospace mathvariant is equivalent to an <mtext> with the transformed unicode character.">
 <style>
diff --git a/testing/web-platform/tests/mathml/relations/css-styling/mathvariant-sans-serif-bold-italic.html b/testing/web-platform/tests/mathml/relations/css-styling/mathvariant-sans-serif-bold-italic.html
index 21401bc84ac9..70207367e058 100644
--- a/testing/web-platform/tests/mathml/relations/css-styling/mathvariant-sans-serif-bold-italic.html
+++ b/testing/web-platform/tests/mathml/relations/css-styling/mathvariant-sans-serif-bold-italic.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8"/>
 <title>mathvariant sans-serif-bold-italic</title>
-<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#cssproperties"/>
+<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS3.SSS1.tab2"/>
 <link rel="match" href="mathvariant-sans-serif-bold-italic-ref.html"/>
 <meta name="assert" content="Verify that a single-char <mtext> with a sans-serif-bold-italic mathvariant is equivalent to an <mtext> with the transformed unicode character.">
 <style>
diff --git a/testing/web-platform/tests/mathml/relations/css-styling/mathvariant-sans-serif-italic.html b/testing/web-platform/tests/mathml/relations/css-styling/mathvariant-sans-serif-italic.html
index 257387231914..0576236dbf99 100644
--- a/testing/web-platform/tests/mathml/relations/css-styling/mathvariant-sans-serif-italic.html
+++ b/testing/web-platform/tests/mathml/relations/css-styling/mathvariant-sans-serif-italic.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8"/>
 <title>mathvariant sans-serif-italic</title>
-<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#cssproperties"/>
+<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS3.SSS1.tab2"/>
 <link rel="match" href="mathvariant-sans-serif-italic-ref.html"/>
 <meta name="assert" content="Verify that a single-char <mtext> with a sans-serif-italic mathvariant is equivalent to an <mtext> with the transformed unicode character.">
 <style>
diff --git a/testing/web-platform/tests/mathml/relations/css-styling/mathvariant-sans-serif.html b/testing/web-platform/tests/mathml/relations/css-styling/mathvariant-sans-serif.html
index 513e0351cc3f..fc880b99aff3 100644
--- a/testing/web-platform/tests/mathml/relations/css-styling/mathvariant-sans-serif.html
+++ b/testing/web-platform/tests/mathml/relations/css-styling/mathvariant-sans-serif.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8"/>
 <title>mathvariant sans-serif</title>
-<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#cssproperties"/>
+<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS3.SSS1.tab2"/>
 <link rel="match" href="mathvariant-sans-serif-ref.html"/>
 <meta name="assert" content="Verify that a single-char <mtext> with a sans-serif mathvariant is equivalent to an <mtext> with the transformed unicode character.">
 <style>
diff --git a/testing/web-platform/tests/mathml/relations/css-styling/mathvariant-script.html b/testing/web-platform/tests/mathml/relations/css-styling/mathvariant-script.html
index efd3f7e8ff69..5725ed510331 100644
--- a/testing/web-platform/tests/mathml/relations/css-styling/mathvariant-script.html
+++ b/testing/web-platform/tests/mathml/relations/css-styling/mathvariant-script.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8"/>
 <title>mathvariant script</title>
-<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#cssproperties"/>
+<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS3.SSS1.tab2"/>
 <link rel="match" href="mathvariant-script-ref.html"/>
 <meta name="assert" content="Verify that a single-char <mtext> with a script mathvariant is equivalent to an <mtext> with the transformed unicode character.">
 <style>
diff --git a/testing/web-platform/tests/mathml/relations/css-styling/mathvariant-stretched.html b/testing/web-platform/tests/mathml/relations/css-styling/mathvariant-stretched.html
index 20c5a39a83a7..603cfe704fd0 100644
--- a/testing/web-platform/tests/mathml/relations/css-styling/mathvariant-stretched.html
+++ b/testing/web-platform/tests/mathml/relations/css-styling/mathvariant-stretched.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8"/>
 <title>mathvariant stretched</title>
-<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#cssproperties"/>
+<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS3.SSS1.tab2"/>
 <link rel="match" href="mathvariant-stretched-ref.html"/>
 <meta name="assert" content="Verify that a single-char <mtext> with a stretched mathvariant is equivalent to an <mtext> with the transformed unicode character.">
 <style>
diff --git a/testing/web-platform/tests/mathml/relations/css-styling/mathvariant-tailed.html b/testing/web-platform/tests/mathml/relations/css-styling/mathvariant-tailed.html
index c88d433ce5f4..c00417d8d6ac 100644
--- a/testing/web-platform/tests/mathml/relations/css-styling/mathvariant-tailed.html
+++ b/testing/web-platform/tests/mathml/relations/css-styling/mathvariant-tailed.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8"/>
 <title>mathvariant tailed</title>
-<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#cssproperties"/>
+<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS3.SSS1.tab2"/>
 <link rel="match" href="mathvariant-tailed-ref.html"/>
 <meta name="assert" content="Verify that a single-char <mtext> with a tailed mathvariant is equivalent to an <mtext> with the transformed unicode character.">
 <style>
diff --git a/testing/web-platform/tests/mathml/relations/css-styling/visibility-1.html b/testing/web-platform/tests/mathml/relations/css-styling/visibility-1.html
index c84f97aeeb84..be8da3b00a2a 100644
--- a/testing/web-platform/tests/mathml/relations/css-styling/visibility-1.html
+++ b/testing/web-platform/tests/mathml/relations/css-styling/visibility-1.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8">
 <title>visibility</title>
-<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#cssstyling">
+<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS3.SSS1">
 <link rel="match" href="visibility-1-ref.html"/>
 <meta name="assert" content="Verify that visibility=hidden is used for text and graphical elements.">
 </head>
diff --git a/testing/web-platform/tests/mathml/relations/html5-tree/class-1.html b/testing/web-platform/tests/mathml/relations/html5-tree/class-1.html
index ee4b4b50d3f4..654852329b4a 100644
--- a/testing/web-platform/tests/mathml/relations/html5-tree/class-1.html
+++ b/testing/web-platform/tests/mathml/relations/html5-tree/class-1.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8"/>
 <title>Class</title>
-<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#mathmltree"/>
+<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS1.SSS2"/>
 <link rel="match" href="class-1-ref.html"/>
 <meta name="assert" content="Verify that the class attribute affects CSS selectors.">
 <style>
diff --git a/testing/web-platform/tests/mathml/relations/html5-tree/class-2.html b/testing/web-platform/tests/mathml/relations/html5-tree/class-2.html
index 4e1ae6b70740..707500de37fc 100644
--- a/testing/web-platform/tests/mathml/relations/html5-tree/class-2.html
+++ b/testing/web-platform/tests/mathml/relations/html5-tree/class-2.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8">
 <title>Class</title>
-<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#mathmltree">
+<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS1.SSS2">
 <meta name="assert" content="Verify whether the getElementsByClassName() works for MathML elements.">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff --git a/testing/web-platform/tests/mathml/relations/html5-tree/color-attributes-1.html b/testing/web-platform/tests/mathml/relations/html5-tree/color-attributes-1.html
index 6f9f93721a2a..b7bdf723e381 100644
--- a/testing/web-platform/tests/mathml/relations/html5-tree/color-attributes-1.html
+++ b/testing/web-platform/tests/mathml/relations/html5-tree/color-attributes-1.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8"/>
 <title>Color Attributes</title>
-<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#mathmltree"/>
+<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS1.SSS2"/>
 <meta name="assert" content="Verify that the mathcolor and mathbackground attributes are supported on the math element.">
 <link rel="match" href="color-attributes-1-ref.html"/>
 <style>
diff --git a/testing/web-platform/tests/mathml/relations/html5-tree/display-1.html b/testing/web-platform/tests/mathml/relations/html5-tree/display-1.html
index 77038ee223c5..64d862cf7614 100644
--- a/testing/web-platform/tests/mathml/relations/html5-tree/display-1.html
+++ b/testing/web-platform/tests/mathml/relations/html5-tree/display-1.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8"/>
 <title>MathML display attribute</title>
-<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#mathmltree">
+<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS1.SSS2">
 <meta name="assert" content="Verify that the display attribute on the math element is supported and impacts centering and line breaking with surrounding content.">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff --git a/testing/web-platform/tests/mathml/relations/html5-tree/dynamic-1.html b/testing/web-platform/tests/mathml/relations/html5-tree/dynamic-1.html
index 48fdd2591559..ab22ad13cdbd 100644
--- a/testing/web-platform/tests/mathml/relations/html5-tree/dynamic-1.html
+++ b/testing/web-platform/tests/mathml/relations/html5-tree/dynamic-1.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8"/>
 <title>Dynamic MathML DOM</title>
-<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#dom"/>
+<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS1.SSS1"/>
 <link rel="match" href="dynamic-1-ref.html"/>
 <meta name="assert" content="Verify that the MathML DOM tree can be modified via javascript and that the rendering is correctly updated.">
 <style>
diff --git a/testing/web-platform/tests/mathml/relations/html5-tree/href-click-1.html b/testing/web-platform/tests/mathml/relations/html5-tree/href-click-1.html
index dd6b7990a3c1..6164346dc079 100644
--- a/testing/web-platform/tests/mathml/relations/html5-tree/href-click-1.html
+++ b/testing/web-platform/tests/mathml/relations/html5-tree/href-click-1.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8"/>
 <title>href click</title>
-<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#mathmltree">
+<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS1.SSS2">
 <link rel="match" href="href-click-1-ref.html"/>
 <meta name="assert" content="Verify that a click on a link moves to the target.">
 <script type="text/javascript">
diff --git a/testing/web-platform/tests/mathml/relations/html5-tree/href-click-2.html b/testing/web-platform/tests/mathml/relations/html5-tree/href-click-2.html
index 4c5253df1596..6e5049392bd9 100644
--- a/testing/web-platform/tests/mathml/relations/html5-tree/href-click-2.html
+++ b/testing/web-platform/tests/mathml/relations/html5-tree/href-click-2.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8"/>
 <title>href click</title>
-<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#mathmltree">
+<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS1.SSS2">
 <link rel="match" href="href-click-2-ref.html"/>
 <meta name="assert" content="Verify that a click on an element bubbles to an ancestor link.">
 <script type="text/javascript">
diff --git a/testing/web-platform/tests/mathml/relations/html5-tree/href-click-3.html b/testing/web-platform/tests/mathml/relations/html5-tree/href-click-3.html
deleted file mode 100644
index f2863febc1f1..000000000000
--- a/testing/web-platform/tests/mathml/relations/html5-tree/href-click-3.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="utf-8">
-<title>href click</title>
-<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#mathmltree">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/resources/testdriver.js"></script>
-<script src="/resources/testdriver-vendor.js"></script>
-</head>
-<body>
-  <p>To test manually, click the blue rectangle.</p>
-  <p>
-    <math>
-      <mspace width="50px" height="10px" style="background: gray"></mspace>
-      <mspace id="target" href="javascript:handler()" width="50px" height="10px" style="background: blue"></mspace>
-      <mspace width="50px" height="10px" style="background: gray"></mspace>
-    </math>
-  </p>
-  <script>
-    var t = async_test("Click element with href");
-    function handler() { t.done(); }
-    test_driver.click(document.getElementById("target"));
-  </script>
-</body>
-</html>
diff --git a/testing/web-platform/tests/mathml/relations/html5-tree/href-manual.html b/testing/web-platform/tests/mathml/relations/html5-tree/href-manual.html
new file mode 100644
index 000000000000..7f24f20f4f2b
--- /dev/null
+++ b/testing/web-platform/tests/mathml/relations/html5-tree/href-manual.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>Manual click on a link</title>
+<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS1.SSS2">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+setup({explicit_timeout: true})
+function handler() {
+document.body.insertAdjacentHTML("beforeend",
+  "<span style='background: green; color: white;'>PASS</span>");
+}
+</script>
+</head>
+<body>
+  <p>Click on the one asterisk which is a link. If a "PASS" result appears the
+    test passes, otherwise it fails.</p>
+  <p>
+    <math style="font-size: 3em;">
+      <mtext>*****</mtext>
+      <mtext href="javascript:handler()">*</mtext>
+      <mtext>*****</mtext>
+    </math>
+  </p>
+</body>
+</html>
diff --git a/testing/web-platform/tests/mathml/relations/html5-tree/integration-point-1.html b/testing/web-platform/tests/mathml/relations/html5-tree/integration-point-1.html
index 3221a67503bc..b3ab19c77387 100644
--- a/testing/web-platform/tests/mathml/relations/html5-tree/integration-point-1.html
+++ b/testing/web-platform/tests/mathml/relations/html5-tree/integration-point-1.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8"/>
 <title>MathML inside foreignObject</title>
-<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#dom"/>
+<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS1.SSS1"/>
 <link rel="match" href="integration-point-1-ref.html"/>
 <meta name="assert" content="Verify that MathML can be used inside a foreignObject element.">
 </head>
diff --git a/testing/web-platform/tests/mathml/relations/html5-tree/integration-point-2.html b/testing/web-platform/tests/mathml/relations/html5-tree/integration-point-2.html
index d42eeb03ed21..e970f9ec8053 100644
--- a/testing/web-platform/tests/mathml/relations/html5-tree/integration-point-2.html
+++ b/testing/web-platform/tests/mathml/relations/html5-tree/integration-point-2.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8"/>
 <title>MathML as a phrasing content</title>
-<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#dom"/>
+<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS1.SSS1"/>
 <link rel="match" href="integration-point-2-ref.html"/>
 <meta name="assert" content="Verify that MathML can be used at positions where phrasing content is accepted.">
 <style type="text/css">
diff --git a/testing/web-platform/tests/mathml/relations/html5-tree/integration-point-3.html b/testing/web-platform/tests/mathml/relations/html5-tree/integration-point-3.html
index 1feb8317ff12..8132acc6d7c2 100644
--- a/testing/web-platform/tests/mathml/relations/html5-tree/integration-point-3.html
+++ b/testing/web-platform/tests/mathml/relations/html5-tree/integration-point-3.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8"/>
 <title>phrasing content inside mtext</title>
-<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#dom"/>
+<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS1.SSS1"/>
 <link rel="match" href="integration-point-3-ref.html"/>
 <meta name="assert" content="Verify that <mtext> can contain phrasing content">
 <style type="text/css">
diff --git a/testing/web-platform/tests/mathml/relations/html5-tree/required-extensions-1.html b/testing/web-platform/tests/mathml/relations/html5-tree/required-extensions-1.html
index 3dd7f168ec1e..795f516671a6 100644
--- a/testing/web-platform/tests/mathml/relations/html5-tree/required-extensions-1.html
+++ b/testing/web-platform/tests/mathml/relations/html5-tree/required-extensions-1.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
 <title>SVG requiredExtensions</title>
-<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#dom">
+<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS1">
 <meta name="assert" content="Verify whether the MathML namespace is recognized as a required extensions of SVG foreignObject when using the hasExtension javascript function.">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff --git a/testing/web-platform/tests/mathml/relations/html5-tree/required-extensions-2.html b/testing/web-platform/tests/mathml/relations/html5-tree/required-extensions-2.html
index 1d7af04d9edc..b49bddaa69d4 100644
--- a/testing/web-platform/tests/mathml/relations/html5-tree/required-extensions-2.html
+++ b/testing/web-platform/tests/mathml/relations/html5-tree/required-extensions-2.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8"/>
 <title>SVG requiredExtensions</title>
-<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#dom"/>
+<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS1.SSS1"/>
 <link rel="match" href="required-extensions-2-ref.html"/>
 <meta name="assert" content="Verify that a foreignObject with MathML used as a requiredExtensions value is selected for display in a SVG switch element.">
 </head>
diff --git a/testing/web-platform/tests/mathml/relations/html5-tree/unique-identifier-1.html b/testing/web-platform/tests/mathml/relations/html5-tree/unique-identifier-1.html
index 42a547ac218f..39c49a6b56b4 100644
--- a/testing/web-platform/tests/mathml/relations/html5-tree/unique-identifier-1.html
+++ b/testing/web-platform/tests/mathml/relations/html5-tree/unique-identifier-1.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8"/>
 <title>Unique identifier</title>
-<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#mathmltree"/>
+<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS1.SSS2"/>
 <link rel="match" href="unique-identifier-1-ref.html"/>
 <meta name="assert" content="Verify that the id on a MathML element can be used as a fragment identifier in order to force initial scrolling.">
 </head>
diff --git a/testing/web-platform/tests/mathml/relations/html5-tree/unique-identifier-2.html b/testing/web-platform/tests/mathml/relations/html5-tree/unique-identifier-2.html
index 421ad7a86d03..97e04a91ef13 100644
--- a/testing/web-platform/tests/mathml/relations/html5-tree/unique-identifier-2.html
+++ b/testing/web-platform/tests/mathml/relations/html5-tree/unique-identifier-2.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8">
 <title>Unique Identifier</title>
-<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#mathmltree">
+<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS1.SSS2">
 <meta name="assert" content="Verify whether the getElementById() works for MathML elements.">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff --git a/testing/web-platform/tests/mathml/relations/html5-tree/unique-identifier-3.html b/testing/web-platform/tests/mathml/relations/html5-tree/unique-identifier-3.html
index c58e5026cfad..5d66e133ab08 100644
--- a/testing/web-platform/tests/mathml/relations/html5-tree/unique-identifier-3.html
+++ b/testing/web-platform/tests/mathml/relations/html5-tree/unique-identifier-3.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8"/>
 <title>Unique Identifier</title>
-<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#mathmltree"/>
+<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS1.SSS2"/>
 <link rel="match" href="unique-identifier-3-ref.html"/>
 <meta name="assert" content="Verify that the id attribute affects CSS selectors.">
 <style>
diff --git a/testing/web-platform/tests/mathml/relations/text-and-math/use-typo-metrics-1.html b/testing/web-platform/tests/mathml/relations/text-and-math/use-typo-metrics-1.html
index 3797aef5fc0f..081d66b63212 100644
--- a/testing/web-platform/tests/mathml/relations/text-and-math/use-typo-metrics-1.html
+++ b/testing/web-platform/tests/mathml/relations/text-and-math/use-typo-metrics-1.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <meta charset="utf-8"/>
 <title>Open Font Format: USE_TYPO_METRICS</title>
-<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#openfontformat"/>
+<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS2.SSS1"/>
 <link rel="match" href="use-typo-metrics-1-ref.html"/>
 <meta name="assert" content="Verify that the USE_TYPO_METRICS flag from the OS/2 table is taken into account to calculate line height.">
 <style>
diff --git a/testing/web-platform/tests/mathml/tools/mathvariant-transforms.py b/testing/web-platform/tests/mathml/tools/mathvariant-transforms.py
index ba99b595f0aa..6094a74491d3 100644
--- a/testing/web-platform/tests/mathml/tools/mathvariant-transforms.py
+++ b/testing/web-platform/tests/mathml/tools/mathvariant-transforms.py
@@ -81,7 +81,7 @@ for mathvariant in mathvariantTransforms:
     reftest.write(source % mathvariant)
     reftestReference.write(source % ("%s (reference)" % mathvariant))
     source ='\
-<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#cssproperties"/>\n\
+<link rel="help" href="http://www.mathml-association.org/MathMLinHTML5/S2.html#SS3.SSS1.tab2"/>\n\
 <link rel="match" href="mathvariant-%s-ref.html"/>\n\
 <meta name="assert" content="Verify that a single-char <mtext> with a %s mathvariant is equivalent to an <mtext> with the transformed unicode character.">\n'
     reftest.write(source % (mathvariant, mathvariant))
diff --git a/testing/web-platform/tests/mixed-content/audio-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/audio-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
index cb58cbcd9c98..ac620c1075b7 100644
--- a/testing/web-platform/tests/mixed-content/audio-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/audio-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/audio-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/audio-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
index 815d926629c2..abc81b30191f 100644
--- a/testing/web-platform/tests/mixed-content/audio-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/audio-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/audio-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/audio-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
index 3a9ba21f0b18..27c67b081ddd 100644
--- a/testing/web-platform/tests/mixed-content/audio-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/audio-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/audio-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/audio-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
index 163b1dcb6129..5fd63aa6d0b5 100644
--- a/testing/web-platform/tests/mixed-content/audio-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/audio-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/audio-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/audio-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
index 4dbbc6c424a0..e6f742213cc0 100644
--- a/testing/web-platform/tests/mixed-content/audio-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/audio-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/audio-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/audio-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
index c3bc943e1db9..522e94420724 100644
--- a/testing/web-platform/tests/mixed-content/audio-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/audio-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/audio-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/audio-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index 2c8a8cc34625..5e6b8cbe168b 100644
--- a/testing/web-platform/tests/mixed-content/audio-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/audio-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/audio-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/audio-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index d97aaba240a4..0adc65f828b2 100644
--- a/testing/web-platform/tests/mixed-content/audio-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/audio-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/audio-tag/meta-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/audio-tag/meta-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
index c04597dc71ec..283c34207bf4 100644
--- a/testing/web-platform/tests/mixed-content/audio-tag/meta-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/audio-tag/meta-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/audio-tag/meta-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/audio-tag/meta-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
index 5b0987b3a0c8..1c65507b4cef 100644
--- a/testing/web-platform/tests/mixed-content/audio-tag/meta-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/audio-tag/meta-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/audio-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/audio-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 0253efc82392..a29157047a6e 100644
--- a/testing/web-platform/tests/mixed-content/audio-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/audio-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/audio-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html b/testing/web-platform/tests/mixed-content/audio-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
index 238565ff7267..15fe5d2afc1c 100644
--- a/testing/web-platform/tests/mixed-content/audio-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
+++ b/testing/web-platform/tests/mixed-content/audio-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/audio-tag/no-opt-in/cross-origin-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html b/testing/web-platform/tests/mixed-content/audio-tag/no-opt-in/cross-origin-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html
index 8ddc972ca6ba..2da4a2b9361c 100644
--- a/testing/web-platform/tests/mixed-content/audio-tag/no-opt-in/cross-origin-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html
+++ b/testing/web-platform/tests/mixed-content/audio-tag/no-opt-in/cross-origin-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/audio-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html b/testing/web-platform/tests/mixed-content/audio-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
index 09ffb26b9483..8b610ada7db6 100644
--- a/testing/web-platform/tests/mixed-content/audio-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
+++ b/testing/web-platform/tests/mixed-content/audio-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/audio-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html b/testing/web-platform/tests/mixed-content/audio-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
index b17073db2e3c..cd4d8a52e76a 100644
--- a/testing/web-platform/tests/mixed-content/audio-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
+++ b/testing/web-platform/tests/mixed-content/audio-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/audio-tag/no-opt-in/same-host-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html b/testing/web-platform/tests/mixed-content/audio-tag/no-opt-in/same-host-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html
index 6e86a30890fe..20d31cf690ed 100644
--- a/testing/web-platform/tests/mixed-content/audio-tag/no-opt-in/same-host-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html
+++ b/testing/web-platform/tests/mixed-content/audio-tag/no-opt-in/same-host-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/audio-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html b/testing/web-platform/tests/mixed-content/audio-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
index 1aae605aa8f9..2ed233dc8856 100644
--- a/testing/web-platform/tests/mixed-content/audio-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
+++ b/testing/web-platform/tests/mixed-content/audio-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/audio-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/audio-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index b8ef228f54c9..b30f28b2aab6 100644
--- a/testing/web-platform/tests/mixed-content/audio-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/audio-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/audio-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/audio-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 51302745cbf4..c13fd88e47e9 100644
--- a/testing/web-platform/tests/mixed-content/audio-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/audio-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/beacon-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/beacon-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index 52aef359f770..f0c5ae172baf 100644
--- a/testing/web-platform/tests/mixed-content/beacon-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/beacon-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/beacon-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/beacon-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 44fb9c586a2d..e592db53c3c8 100644
--- a/testing/web-platform/tests/mixed-content/beacon-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/beacon-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/beacon-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/beacon-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index bd211c00f5da..ee9c3c6d22dd 100644
--- a/testing/web-platform/tests/mixed-content/beacon-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/beacon-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/beacon-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/beacon-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index fbb550269e50..e050885df3b0 100644
--- a/testing/web-platform/tests/mixed-content/beacon-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/beacon-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/beacon-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/beacon-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 3392d1ba1c25..369044ff69e6 100644
--- a/testing/web-platform/tests/mixed-content/beacon-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/beacon-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/beacon-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/beacon-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index 5ea4cd975702..aea84f71e64f 100644
--- a/testing/web-platform/tests/mixed-content/beacon-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/beacon-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/beacon-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/beacon-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index 2ea1e3729f7b..83d425c58ebb 100644
--- a/testing/web-platform/tests/mixed-content/beacon-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/beacon-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/beacon-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/beacon-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 89d7b827a4bf..728e6ce73ff2 100644
--- a/testing/web-platform/tests/mixed-content/beacon-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/beacon-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/beacon-request/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/beacon-request/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index ac20526946f9..4753bb3208d2 100644
--- a/testing/web-platform/tests/mixed-content/beacon-request/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/beacon-request/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/beacon-request/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/beacon-request/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 9cf67c8e15b0..e82c6cfdc188 100644
--- a/testing/web-platform/tests/mixed-content/beacon-request/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/beacon-request/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/beacon-request/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/beacon-request/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index ce86221c298d..d9c87b30c541 100644
--- a/testing/web-platform/tests/mixed-content/beacon-request/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/beacon-request/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/beacon-request/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/beacon-request/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index e331f5772f5b..2a4f6a5e4593 100644
--- a/testing/web-platform/tests/mixed-content/beacon-request/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/beacon-request/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/beacon-request/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/beacon-request/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index bb5d94c95e74..6b9d9b4f8266 100644
--- a/testing/web-platform/tests/mixed-content/beacon-request/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/beacon-request/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/beacon-request/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/beacon-request/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index f3cddf53e74d..a3f302ae60b8 100644
--- a/testing/web-platform/tests/mixed-content/beacon-request/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/beacon-request/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/beacon-request/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/beacon-request/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index ccbaeb971ecb..0a507e5b1096 100644
--- a/testing/web-platform/tests/mixed-content/beacon-request/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/beacon-request/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/beacon-request/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/beacon-request/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index 6b0daa222412..5375ae50b97e 100644
--- a/testing/web-platform/tests/mixed-content/beacon-request/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/beacon-request/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/beacon-request/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/beacon-request/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index adffe353e344..c6afc29050c0 100644
--- a/testing/web-platform/tests/mixed-content/beacon-request/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/beacon-request/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/beacon-request/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/beacon-request/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index f0353c39fc75..2b83f31198b1 100644
--- a/testing/web-platform/tests/mixed-content/beacon-request/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/beacon-request/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/beacon-request/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/beacon-request/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 2cfc38016f21..efc6ce6881d3 100644
--- a/testing/web-platform/tests/mixed-content/beacon-request/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/beacon-request/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index af17b7ebd7f9..a6c8fe82b59e 100644
--- a/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 2fff8e851a3d..035904520990 100644
--- a/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index d654f3b89e01..3772f3b64ae2 100644
--- a/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index af004635d1dc..92d7db06f96e 100644
--- a/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index bd45fa9035b3..bd51356e2f9a 100644
--- a/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index 6258bc9564d6..51b84997e39f 100644
--- a/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index ce000b18cfa9..eff7b592dbb1 100644
--- a/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 84342c028907..1b7257dc8612 100644
--- a/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index d77d38640b97..b3bb1383564f 100644
--- a/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 433477730362..eb3b0a9eb511 100644
--- a/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 1de38b5a7a14..9c7b75354009 100644
--- a/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 6b811116fbd4..61288bb8c772 100644
--- a/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index 35a7e584f689..4b326660bbb9 100644
--- a/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index e69505d7f07e..031a3728534a 100644
--- a/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index b56a6baa1163..253234f3b3ef 100644
--- a/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index 4ae4cb83ae33..61ef1c2d3bc0 100644
--- a/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 919e992cc557..d4dd6daccf5b 100644
--- a/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index e56db94fa07a..9b28a62a9a98 100644
--- a/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index e5110a44c393..c1496d038023 100644
--- a/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/fetch-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/fetch-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index a84f29e51b62..012bd3540a1a 100644
--- a/testing/web-platform/tests/mixed-content/fetch-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/fetch-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/fetch-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/fetch-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 4de2f75f0225..54fbe3a8477b 100644
--- a/testing/web-platform/tests/mixed-content/fetch-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/fetch-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/fetch-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/fetch-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index 3e0fb529f04f..f95554558076 100644
--- a/testing/web-platform/tests/mixed-content/fetch-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/fetch-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/fetch-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/fetch-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index 542a1866c79e..c03b96f01fa1 100644
--- a/testing/web-platform/tests/mixed-content/fetch-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/fetch-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/fetch-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/fetch-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 39ccde3c1546..a7ce2a53055c 100644
--- a/testing/web-platform/tests/mixed-content/fetch-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/fetch-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/fetch-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/fetch-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index 4c9d38ea1920..1eec54d3b2c8 100644
--- a/testing/web-platform/tests/mixed-content/fetch-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/fetch-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/fetch-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/fetch-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index fa4e8f2ac311..260fb14b0424 100644
--- a/testing/web-platform/tests/mixed-content/fetch-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/fetch-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/fetch-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/fetch-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index f05c4b9e694d..9b18ebb78b21 100644
--- a/testing/web-platform/tests/mixed-content/fetch-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/fetch-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/fetch-request/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/fetch-request/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index a1e69a67b968..a1b37ef1ee7b 100644
--- a/testing/web-platform/tests/mixed-content/fetch-request/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/fetch-request/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/fetch-request/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/fetch-request/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index b9599b28fcc2..0fb506de19f4 100644
--- a/testing/web-platform/tests/mixed-content/fetch-request/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/fetch-request/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/fetch-request/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/fetch-request/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 256fca634112..825fb2441b4f 100644
--- a/testing/web-platform/tests/mixed-content/fetch-request/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/fetch-request/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/fetch-request/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/fetch-request/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 1ebe92316fb4..f35fd03dae8e 100644
--- a/testing/web-platform/tests/mixed-content/fetch-request/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/fetch-request/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/fetch-request/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/fetch-request/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index 250bbd4f2e75..3b2d158d6317 100644
--- a/testing/web-platform/tests/mixed-content/fetch-request/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/fetch-request/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/fetch-request/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/fetch-request/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 98b12d213e1c..24a1e8671d88 100644
--- a/testing/web-platform/tests/mixed-content/fetch-request/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/fetch-request/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/fetch-request/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/fetch-request/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index a63a7940c0a3..d7aa3899bfaa 100644
--- a/testing/web-platform/tests/mixed-content/fetch-request/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/fetch-request/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/fetch-request/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/fetch-request/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index 43a6499938c0..55c768525d1b 100644
--- a/testing/web-platform/tests/mixed-content/fetch-request/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/fetch-request/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/fetch-request/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/fetch-request/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index b1534c877760..13de80df73c3 100644
--- a/testing/web-platform/tests/mixed-content/fetch-request/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/fetch-request/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/fetch-request/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/fetch-request/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index bbc089ba473f..9045019de11f 100644
--- a/testing/web-platform/tests/mixed-content/fetch-request/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/fetch-request/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/fetch-request/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/fetch-request/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 704042109cce..d4b8292af324 100644
--- a/testing/web-platform/tests/mixed-content/fetch-request/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/fetch-request/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/common/security-features/resources/common.js b/testing/web-platform/tests/mixed-content/generic/common.js
similarity index 63%
rename from testing/web-platform/tests/common/security-features/resources/common.js
rename to testing/web-platform/tests/mixed-content/generic/common.js
index 678d2a0d8fa7..63383f87e3a2 100644
--- a/testing/web-platform/tests/common/security-features/resources/common.js
+++ b/testing/web-platform/tests/mixed-content/generic/common.js
@@ -5,10 +5,6 @@
  *     method's JSDoc.
  */
 
-function timeoutPromise(t, ms) {
-  return new Promise(resolve => { t.step_timeout(resolve, ms); });
-}
-
 /**
  * Normalizes the target port for use in a URL. For default ports, this is the
  *     empty string (omitted port), otherwise it's a colon followed by the port
@@ -74,66 +70,27 @@ function setAttributes(el, attrs) {
     el.setAttribute(attr, attrs[attr]);
 }
 
+
 /**
  * Binds to success and error events of an object wrapping them into a promise
  *     available through {@code element.eventPromise}. The success event
  *     resolves and error event rejects.
- * This method adds event listeners, and then removes all the added listeners
- * when one of listened event is fired.
  * @param {object} element An object supporting events on which to bind the
  *     promise.
  * @param {string} resolveEventName [="load"] The event name to bind resolve to.
  * @param {string} rejectEventName [="error"] The event name to bind reject to.
  */
 function bindEvents(element, resolveEventName, rejectEventName) {
-  element.eventPromise =
-      bindEvents2(element, resolveEventName, element, rejectEventName);
-}
-
-// Returns a promise wrapping success and error events of objects.
-// This is a variant of bindEvents that can accept separate objects for each
-// events and two events to reject, and doesn't set `eventPromise`.
-//
-// When `resolveObject`'s `resolveEventName` event (default: "load") is
-// fired, the promise is resolved with the event.
-//
-// When `rejectObject`'s `rejectEventName` event (default: "error") or
-// `rejectObject2`'s `rejectEventName2` event (default: "error") is
-// fired, the promise is rejected.
-//
-// `rejectObject2` is optional.
-function bindEvents2(resolveObject, resolveEventName, rejectObject, rejectEventName, rejectObject2, rejectEventName2) {
-  return new Promise(function(resolve, reject) {
-    const actualResolveEventName = resolveEventName || "load";
-    const actualRejectEventName = rejectEventName || "error";
-    const actualRejectEventName2 = rejectEventName2 || "error";
-
-    const resolveHandler = function(event) {
-      cleanup();
-      resolve(event);
-    };
-
-    const rejectHandler = function(event) {
+  element.eventPromise = new Promise(function(resolve, reject) {
+    element.addEventListener(resolveEventName  || "load", function (e) {
+      resolve(e);
+    });
+    element.addEventListener(rejectEventName || "error", function(e) {
       // Chromium starts propagating errors from worker.onerror to
       // window.onerror. This handles the uncaught exceptions in tests.
-      event.preventDefault();
-      cleanup();
-      reject(event);
-    };
-
-    const cleanup = function() {
-      resolveObject.removeEventListener(actualResolveEventName, resolveHandler);
-      rejectObject.removeEventListener(actualRejectEventName, rejectHandler);
-      if (rejectObject2) {
-        rejectObject2.removeEventListener(actualRejectEventName2, rejectHandler);
-      }
-    };
-
-    resolveObject.addEventListener(actualResolveEventName, resolveHandler);
-    rejectObject.addEventListener(actualRejectEventName, rejectHandler);
-    if (rejectObject2) {
-      rejectObject2.addEventListener(actualRejectEventName2, rejectHandler);
-    }
+      e.preventDefault();
+      reject(e);
+    });
   });
 }
 
@@ -192,35 +149,14 @@ function createHelperIframe(name, doBindEvents) {
                        doBindEvents);
 }
 
-/**
- * requestVia*() functions return promises that are resolved on successful
- * requests with objects of the same "type", i.e. objects that contains
- * the same sets of keys that are fixed within one category of tests (e.g.
- * within wpt/referrer-policy tests).
- * wrapResult() (that should be defined outside this file) is used to convert
- * the response bodies of subresources into the expected result objects in some
- * cases, and in other cases the result objects are constructed more directly.
- * TODO(https://crbug.com/906850): Clean up the semantics around this, e.g.
- * use (or not use) wrapResult() consistently, unify the arguments, etc.
- */
-
 /**
  * Creates a new iframe, binds load and error events, sets the src attribute and
  *     appends it to {@code document.body} .
  * @param {string} url The src for the iframe.
  * @return {Promise} The promise for success/error events.
  */
-function requestViaIframe(url, additionalAttributes) {
-  const iframe = createElement(
-      "iframe",
-      Object.assign({"src": url}, additionalAttributes),
-      document.body,
-      false);
-  return bindEvents2(window, "message", iframe, "error", window, "error")
-      .then(event => {
-          assert_equals(event.source, iframe.contentWindow);
-          return event.data;
-        });
+function requestViaIframe(url) {
+  return createRequestViaElement("iframe", {"src": url}, document.body);
 }
 
 /**
@@ -233,122 +169,13 @@ function requestViaImage(url) {
   return createRequestViaElement("img", {"src": url}, document.body);
 }
 
-// Helpers for requestViaImageForReferrerPolicy().
-function loadImageInWindow(src, attributes, w) {
-  return new Promise((resolve, reject) => {
-    var image = new w.Image();
-    image.crossOrigin = "Anonymous";
-    image.onload = function() {
-      resolve(image);
-    };
-
-    // Extend element with attributes. (E.g. "referrerPolicy" or "rel")
-    if (attributes) {
-      for (var attr in attributes) {
-        image[attr] = attributes[attr];
-      }
-    }
-
-    image.src = src;
-    w.document.body.appendChild(image)
-  });
-}
-
-function extractImageData(img) {
-    var canvas = document.createElement("canvas");
-    var context = canvas.getContext('2d');
-    context.drawImage(img, 0, 0);
-    var imgData = context.getImageData(0, 0, img.clientWidth, img.clientHeight);
-    return imgData.data;
-}
-
-function decodeImageData(rgba) {
-  var rgb = new Uint8ClampedArray(rgba.length);
-
-  // RGBA -> RGB.
-  var rgb_length = 0;
-  for (var i = 0; i < rgba.length; ++i) {
-    // Skip alpha component.
-    if (i % 4 == 3)
-      continue;
-
-    // Zero is the string terminator.
-    if (rgba[i] == 0)
-      break;
-
-    rgb[rgb_length++] = rgba[i];
-  }
-
-  // Remove trailing nulls from data.
-  rgb = rgb.subarray(0, rgb_length);
-  var string_data = (new TextDecoder("ascii")).decode(rgb);
-
-  return JSON.parse(string_data);
-}
-
-// A variant of requestViaImage for referrer policy tests.
-// This tests many patterns of <iframe>s to test referrer policy inheritance.
-// TODO(https://crbug.com/906850): Merge this into requestViaImage().
-// <iframe>-related code should be moved outside requestViaImage*().
-function requestViaImageForReferrerPolicy(url, attributes, referrerPolicy) {
-  // For images, we'll test:
-  // - images in a `srcdoc` frame to ensure that it uses the referrer
-  //   policy of its parent,
-  // - images in a top-level document,
-  // - and images in a `srcdoc` frame with its own referrer policy to
-  //   override its parent.
-
-  var iframeWithoutOwnPolicy = document.createElement('iframe');
-  var noSrcDocPolicy = new Promise((resolve, reject) => {
-        iframeWithoutOwnPolicy.srcdoc = "Hello, world.";
-        iframeWithoutOwnPolicy.onload = resolve;
-        document.body.appendChild(iframeWithoutOwnPolicy);
-      })
-    .then(() => {
-        var nextUrl = url + "&cache_destroyer2=" + (new Date()).getTime();
-        return loadImageInWindow(nextUrl, attributes,
-                                 iframeWithoutOwnPolicy.contentWindow);
-      })
-    .then(function (img) {
-        return decodeImageData(extractImageData(img));
-      });
-
-  // Give a srcdoc iframe a referrer policy different from the top-level page's policy.
-  var iframePolicy = (referrerPolicy === "no-referrer") ? "unsafe-url" : "no-referrer";
-  var iframeWithOwnPolicy = document.createElement('iframe');
-  var srcDocPolicy = new Promise((resolve, reject) => {
-        iframeWithOwnPolicy.srcdoc = "<meta name='referrer' content='" + iframePolicy + "'>Hello world.";
-        iframeWithOwnPolicy.onload = resolve;
-        document.body.appendChild(iframeWithOwnPolicy);
-      })
-    .then(() => {
-        var nextUrl = url + "&cache_destroyer3=" + (new Date()).getTime();
-        return loadImageInWindow(nextUrl, null,
-                                 iframeWithOwnPolicy.contentWindow);
-      })
-    .then(function (img) {
-        return decodeImageData(extractImageData(img));
-      });
-
-  var pagePolicy = loadImageInWindow(url, attributes, window)
-    .then(function (img) {
-        return decodeImageData(extractImageData(img));
-      });
-
-  return Promise.all([noSrcDocPolicy, srcDocPolicy, pagePolicy]).then(values => {
-    assert_equals(values[0].headers.referer, values[2].headers.referer, "Referrer inside 'srcdoc' without its own policy should be the same as embedder's referrer.");
-    assert_equals((iframePolicy === "no-referrer" ? undefined : document.location.href), values[1].headers.referer, "Referrer inside 'srcdoc' should use the iframe's policy if it has one");
-    return wrapResult(values[2]);
-  });
-}
-
 /**
  * Initiates a new XHR GET request to provided URL.
  * @param {string} url The endpoint URL for the XHR.
  * @return {Promise} The promise for success/error events.
  */
 function requestViaXhr(url) {
-  return xhrRequest(url).then(result => wrapResult(result));
+  return xhrRequest(url);
 }
 
 /**
@@ -357,9 +184,7 @@ function requestViaXhr(url) {
  * @return {Promise} The promise for success/error events.
  */
 function requestViaFetch(url) {
-  return fetch(url)
-    .then(res => res.json())
-    .then(j => wrapResult(j));
+  return fetch(url);
 }
 
 function dedicatedWorkerUrlThatFetches(url) {
@@ -388,22 +213,10 @@ function requestViaDedicatedWorker(url, options) {
   } catch (e) {
     return Promise.reject(e);
   }
+  bindEvents(worker, "message", "error");
   worker.postMessage('');
-  return bindEvents2(worker, "message", worker, "error")
-    .then(event => wrapResult(event.data));
-}
 
-function requestViaSharedWorker(url) {
-  var worker;
-  try {
-    worker = new SharedWorker(url);
-  } catch(e) {
-    return Promise.reject(e);
-  }
-  const promise = bindEvents2(worker.port, "message", worker, "error")
-    .then(event => wrapResult(event.data));
-  worker.port.start();
-  return promise;
+  return worker.eventPromise;
 }
 
 // Returns a reference to a worklet object corresponding to a given type.
@@ -438,19 +251,13 @@ function requestViaWorklet(type, url) {
  * @return {Promise} The promise for success/error events.
  */
 function requestViaNavigable(navigableElement, url) {
-  var iframe = createHelperIframe(guid(), false);
+  var iframe = createHelperIframe(guid(), true);
   setAttributes(navigableElement,
                 {"href": url,
                  "target": iframe.name});
-
-  const promise =
-    bindEvents2(window, "message", iframe, "error", window, "error")
-      .then(event => {
-          assert_equals(event.source, iframe.contentWindow, "event.source");
-          return event.data;
-        });
   navigableElement.click();
-  return promise;
+
+  return iframe.eventPromise;
 }
 
 /**
@@ -459,11 +266,8 @@ function requestViaNavigable(navigableElement, url) {
  * @param {string} url The URL to navigate to.
  * @return {Promise} The promise for success/error events.
  */
-function requestViaAnchor(url, additionalAttributes) {
-  var a = createElement(
-      "a",
-      Object.assign({"innerHTML": "Link to resource"}, additionalAttributes),
-      document.body);
+function requestViaAnchor(url) {
+  var a = createElement("a", {"innerHTML": "Link to resource"}, document.body);
 
   return requestViaNavigable(a, url);
 }
@@ -474,13 +278,9 @@ function requestViaAnchor(url, additionalAttributes) {
  * @param {string} url The URL to navigate to.
  * @return {Promise} The promise for success/error events.
  */
-function requestViaArea(url, additionalAttributes) {
-  var area = createElement(
-      "area",
-      Object.assign({}, additionalAttributes),
-      document.body);
+function requestViaArea(url) {
+  var area = createElement("area", {}, document.body);
 
-  // TODO(kristijanburnik): Append to map and add image.
   return requestViaNavigable(area, url);
 }
 
@@ -490,15 +290,8 @@ function requestViaArea(url, additionalAttributes) {
  * @param {string} url The src URL.
  * @return {Promise} The promise for success/error events.
  */
-function requestViaScript(url, additionalAttributes) {
-  const script = createElement(
-      "script",
-      Object.assign({"src": url}, additionalAttributes),
-      document.body,
-      false);
-
-  return bindEvents2(window, "message", script, "error", window, "error")
-    .then(event => wrapResult(event.data));
+function requestViaScript(url) {
+  return createRequestViaElement("script", {"src": url}, document.body);
 }
 
 /**
@@ -665,7 +458,7 @@ function requestViaWebSocket(url) {
     var websocket = new WebSocket(url);
 
     websocket.addEventListener("message", function(e) {
-      resolve(e.data);
+      resolve(JSON.parse(e.data));
     });
 
     websocket.addEventListener("open", function(e) {
@@ -675,10 +468,7 @@ function requestViaWebSocket(url) {
     websocket.addEventListener("error", function(e) {
       reject(e)
     });
-  })
-  .then(data => {
-      return JSON.parse(data);
-    });
+  });
 }
 
 // SanityChecker does nothing in release mode. See sanity-checker.js for debug
@@ -686,4 +476,3 @@ function requestViaWebSocket(url) {
 function SanityChecker() {}
 SanityChecker.prototype.checkScenario = function() {};
 SanityChecker.prototype.setFailTimeout = function(test, timeout) {};
-SanityChecker.prototype.checkSubresourceResult = function() {};
diff --git a/testing/web-platform/tests/mixed-content/generic/expect.py b/testing/web-platform/tests/mixed-content/generic/expect.py
index 2c360c1d9315..672a54c3a6eb 100644
--- a/testing/web-platform/tests/mixed-content/generic/expect.py
+++ b/testing/web-platform/tests/mixed-content/generic/expect.py
@@ -83,11 +83,6 @@ def main(request, response):
                                                   "mixed-content",
                                                   "generic",
                                                   "worker.js"), "rb").read()
-            elif content_type == "text/javascript":
-                response_data = open(os.path.join(request.doc_root,
-                                                  "mixed-content",
-                                                  "generic",
-                                                  "script.js"), "rb").read()
             else:
                 response_data = "/* purged */"
         elif action == "take":
diff --git a/testing/web-platform/tests/mixed-content/generic/mixed-content-test-case.js b/testing/web-platform/tests/mixed-content/generic/mixed-content-test-case.js
index b2c0bcdea1ee..8708f5a9357d 100644
--- a/testing/web-platform/tests/mixed-content/generic/mixed-content-test-case.js
+++ b/testing/web-platform/tests/mixed-content/generic/mixed-content-test-case.js
@@ -3,11 +3,6 @@
  * @author burnik@google.com (Kristijan Burnik)
  */
 
-function wrapResult(server_data) {
-  // Currently the returned value is not used in mixed-content tests.
-  return null;
-}
-
 /**
  * MixedContentTestCase exercises all the tests for checking browser behavior
  * when resources regarded as mixed-content are requested. A single run covers
diff --git a/testing/web-platform/tests/mixed-content/generic/script.js b/testing/web-platform/tests/mixed-content/generic/script.js
deleted file mode 100644
index 2d1cdf0a4bbd..000000000000
--- a/testing/web-platform/tests/mixed-content/generic/script.js
+++ /dev/null
@@ -1 +0,0 @@
-postMessage("", "*");
diff --git a/testing/web-platform/tests/mixed-content/generic/template/test.debug.html.template b/testing/web-platform/tests/mixed-content/generic/template/test.debug.html.template
index 77f62ef1da36..013bb6250279 100644
--- a/testing/web-platform/tests/mixed-content/generic/template/test.debug.html.template
+++ b/testing/web-platform/tests/mixed-content/generic/template/test.debug.html.template
@@ -9,7 +9,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <!-- Common global functions for mixed-content tests. -->
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <!-- The original specification JSON for validating the scenario. -->
     <script src="/mixed-content/spec_json.js"></script>
     <!-- Internal checking of the tests -->
diff --git a/testing/web-platform/tests/mixed-content/generic/template/test.release.html.template b/testing/web-platform/tests/mixed-content/generic/template/test.release.html.template
index 188e32fde4bc..ca77389cc682 100644
--- a/testing/web-platform/tests/mixed-content/generic/template/test.release.html.template
+++ b/testing/web-platform/tests/mixed-content/generic/template/test.release.html.template
@@ -10,7 +10,7 @@
     <meta name="assert" content="%(test_description)s">%(meta_opt_in)s
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/img-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/img-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
index 9b3b46ff0122..1816b4231bd5 100644
--- a/testing/web-platform/tests/mixed-content/img-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/img-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/img-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/img-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
index f39f0c696531..509fc34750f8 100644
--- a/testing/web-platform/tests/mixed-content/img-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/img-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/img-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/img-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
index 149d0dc524a7..61baeee7944a 100644
--- a/testing/web-platform/tests/mixed-content/img-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/img-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/img-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/img-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
index d37a441016d4..ad615e9b23f2 100644
--- a/testing/web-platform/tests/mixed-content/img-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/img-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/img-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/img-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
index 49d3813b0490..b6f92431a3a1 100644
--- a/testing/web-platform/tests/mixed-content/img-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/img-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/img-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/img-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
index 9787e9c75bf4..580f4b5492f3 100644
--- a/testing/web-platform/tests/mixed-content/img-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/img-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/img-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/img-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index 740e202ce303..77adba6442ac 100644
--- a/testing/web-platform/tests/mixed-content/img-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/img-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/img-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/img-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index d45384ace058..b08d413e8ebb 100644
--- a/testing/web-platform/tests/mixed-content/img-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/img-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/img-tag/meta-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/img-tag/meta-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
index b1e4649e008c..684d2449a4ef 100644
--- a/testing/web-platform/tests/mixed-content/img-tag/meta-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/img-tag/meta-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/img-tag/meta-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/img-tag/meta-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
index 3c0bce6b72de..b05dff3b33d5 100644
--- a/testing/web-platform/tests/mixed-content/img-tag/meta-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/img-tag/meta-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/img-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/img-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index cc943fd1b501..e4ac20f4f089 100644
--- a/testing/web-platform/tests/mixed-content/img-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/img-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/img-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html b/testing/web-platform/tests/mixed-content/img-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
index 8cc7a82c3e86..5a7bdc3b538f 100644
--- a/testing/web-platform/tests/mixed-content/img-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
+++ b/testing/web-platform/tests/mixed-content/img-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/img-tag/no-opt-in/cross-origin-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html b/testing/web-platform/tests/mixed-content/img-tag/no-opt-in/cross-origin-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html
index fae9b1e4d708..6c0a9f5e6865 100644
--- a/testing/web-platform/tests/mixed-content/img-tag/no-opt-in/cross-origin-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html
+++ b/testing/web-platform/tests/mixed-content/img-tag/no-opt-in/cross-origin-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/img-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html b/testing/web-platform/tests/mixed-content/img-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
index 9273ac43c49f..c9ffbfd0c707 100644
--- a/testing/web-platform/tests/mixed-content/img-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
+++ b/testing/web-platform/tests/mixed-content/img-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/img-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html b/testing/web-platform/tests/mixed-content/img-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
index 030de7033a7c..aab662fc3ab3 100644
--- a/testing/web-platform/tests/mixed-content/img-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
+++ b/testing/web-platform/tests/mixed-content/img-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/img-tag/no-opt-in/same-host-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html b/testing/web-platform/tests/mixed-content/img-tag/no-opt-in/same-host-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html
index c9c20812db2f..6f0a8fdedefb 100644
--- a/testing/web-platform/tests/mixed-content/img-tag/no-opt-in/same-host-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html
+++ b/testing/web-platform/tests/mixed-content/img-tag/no-opt-in/same-host-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/img-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html b/testing/web-platform/tests/mixed-content/img-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
index dddd339fb034..f55cce437133 100644
--- a/testing/web-platform/tests/mixed-content/img-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
+++ b/testing/web-platform/tests/mixed-content/img-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/img-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/img-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index 3e78d29d5aa9..54bb60accf14 100644
--- a/testing/web-platform/tests/mixed-content/img-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/img-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/img-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/img-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 5d5e55ed578e..26d7d2390aee 100644
--- a/testing/web-platform/tests/mixed-content/img-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/img-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index 482accfd3445..7376626e2e19 100644
--- a/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 4db97176aa93..fc123d9638d8 100644
--- a/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index 90aa192e6055..f7fd32cbf9bf 100644
--- a/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index 3a8c8cfa9837..b93d17784229 100644
--- a/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index a44839fb874f..b23f9f0eb68c 100644
--- a/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index 7a8949053efb..122ee404dc74 100644
--- a/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index 585b54c738b9..606887e3dd52 100644
--- a/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index d6166d041af6..2f4f750de9fc 100644
--- a/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/link-css-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/link-css-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 9b6036b96a55..191b4a9ea664 100644
--- a/testing/web-platform/tests/mixed-content/link-css-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/link-css-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/link-css-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/link-css-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index dc18ca79c36b..5e71b99d4c61 100644
--- a/testing/web-platform/tests/mixed-content/link-css-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/link-css-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/link-css-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/link-css-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 5e74a770db8d..869c05abeca0 100644
--- a/testing/web-platform/tests/mixed-content/link-css-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/link-css-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/link-css-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/link-css-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index e6b3dedf6a9d..13c536f3eb58 100644
--- a/testing/web-platform/tests/mixed-content/link-css-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/link-css-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/link-css-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/link-css-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index 88f21d4bbff7..e941030043ee 100644
--- a/testing/web-platform/tests/mixed-content/link-css-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/link-css-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/link-css-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/link-css-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index ebd1747a8ce8..c9efe54e44a7 100644
--- a/testing/web-platform/tests/mixed-content/link-css-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/link-css-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/link-css-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/link-css-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 76b18d6f7e03..11d8f4877a76 100644
--- a/testing/web-platform/tests/mixed-content/link-css-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/link-css-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/link-css-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/link-css-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index 4449e58c1b67..ce383d9aacb9 100644
--- a/testing/web-platform/tests/mixed-content/link-css-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/link-css-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/link-css-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/link-css-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 1000359b175b..67b58e0096ca 100644
--- a/testing/web-platform/tests/mixed-content/link-css-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/link-css-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/link-css-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/link-css-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index e07e2fa5b41e..7d620f8da936 100644
--- a/testing/web-platform/tests/mixed-content/link-css-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/link-css-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/link-css-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/link-css-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index cbbfa0723d4c..f6d23405dd5e 100644
--- a/testing/web-platform/tests/mixed-content/link-css-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/link-css-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index 9f69cae481f5..bcb7abb7c0e2 100644
--- a/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 883cfde572e6..3c6de84218b6 100644
--- a/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index 13e9b46cac45..1fe904f138a2 100644
--- a/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index a806be7e0f10..2db9724a2ebb 100644
--- a/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 69cd3b29d5c1..ddad38792d40 100644
--- a/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index f337745eb43e..d2d15b98dce3 100644
--- a/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index 9e0ab39c5a9d..a047941dcd48 100644
--- a/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 819b543948da..bd24109afe28 100644
--- a/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/link-prefetch-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/link-prefetch-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index a9e57c17ce11..16c1e07a50eb 100644
--- a/testing/web-platform/tests/mixed-content/link-prefetch-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/link-prefetch-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/link-prefetch-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/link-prefetch-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index f2025dcee2a6..f3adaf6cec99 100644
--- a/testing/web-platform/tests/mixed-content/link-prefetch-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/link-prefetch-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/link-prefetch-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/link-prefetch-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index b787497cf92a..71ef6d359d1b 100644
--- a/testing/web-platform/tests/mixed-content/link-prefetch-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/link-prefetch-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/link-prefetch-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/link-prefetch-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 9317d5c73a78..6db10199649a 100644
--- a/testing/web-platform/tests/mixed-content/link-prefetch-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/link-prefetch-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/link-prefetch-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/link-prefetch-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index 8dc0000ba778..5c41820d55d5 100644
--- a/testing/web-platform/tests/mixed-content/link-prefetch-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/link-prefetch-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/link-prefetch-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/link-prefetch-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 64042683224f..afa70d38e963 100644
--- a/testing/web-platform/tests/mixed-content/link-prefetch-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/link-prefetch-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/link-prefetch-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/link-prefetch-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 1655a2eaec69..00241b622cda 100644
--- a/testing/web-platform/tests/mixed-content/link-prefetch-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/link-prefetch-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/link-prefetch-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/link-prefetch-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index a47869e4304e..f1be54283e04 100644
--- a/testing/web-platform/tests/mixed-content/link-prefetch-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/link-prefetch-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/link-prefetch-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/link-prefetch-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 1359609a6028..bc14146a24be 100644
--- a/testing/web-platform/tests/mixed-content/link-prefetch-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/link-prefetch-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/link-prefetch-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/link-prefetch-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index 853bd279af52..c3ea33fdb700 100644
--- a/testing/web-platform/tests/mixed-content/link-prefetch-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/link-prefetch-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/link-prefetch-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/link-prefetch-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index f450941427d3..4c5911153911 100644
--- a/testing/web-platform/tests/mixed-content/link-prefetch-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/link-prefetch-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index 0d0e79c5624f..ae4ebff13ced 100644
--- a/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 8f09c46e61b0..aa3fc778fc47 100644
--- a/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index 77e7aada13c1..c9d2d22c8a09 100644
--- a/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index adb8f0711bc4..5202090bc564 100644
--- a/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 39560f5eb4a1..2013b19c6b64 100644
--- a/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index 2a3781149b6f..fbe8606d6561 100644
--- a/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index 5b8b9ef95705..c6c56e0c9f4c 100644
--- a/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index ce6e20725289..c62ca1208dad 100644
--- a/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/module-data-worker-import/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/module-data-worker-import/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 5055e600a12d..349a3731fca6 100644
--- a/testing/web-platform/tests/mixed-content/module-data-worker-import/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/module-data-worker-import/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/module-data-worker-import/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/module-data-worker-import/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index f2e537b78544..6536bef9032b 100644
--- a/testing/web-platform/tests/mixed-content/module-data-worker-import/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/module-data-worker-import/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/module-data-worker-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/module-data-worker-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index acb39ccf4950..9632f6963f3b 100644
--- a/testing/web-platform/tests/mixed-content/module-data-worker-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/module-data-worker-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/module-data-worker-import/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/module-data-worker-import/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 9adb36a3c7c0..fde3d3ab49c9 100644
--- a/testing/web-platform/tests/mixed-content/module-data-worker-import/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/module-data-worker-import/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/module-data-worker-import/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/module-data-worker-import/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index 4124504484e4..4fe1a650df7a 100644
--- a/testing/web-platform/tests/mixed-content/module-data-worker-import/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/module-data-worker-import/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/module-data-worker-import/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/module-data-worker-import/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 20133bca3124..93d5a1b631bf 100644
--- a/testing/web-platform/tests/mixed-content/module-data-worker-import/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/module-data-worker-import/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/module-data-worker-import/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/module-data-worker-import/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 29010dfc2b4d..2810c3c159bb 100644
--- a/testing/web-platform/tests/mixed-content/module-data-worker-import/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/module-data-worker-import/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/module-data-worker-import/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/module-data-worker-import/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index fb989ecc2bd6..afb1ac17cec5 100644
--- a/testing/web-platform/tests/mixed-content/module-data-worker-import/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/module-data-worker-import/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/module-data-worker-import/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/module-data-worker-import/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index c4a8417f072f..e54f7ba9618b 100644
--- a/testing/web-platform/tests/mixed-content/module-data-worker-import/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/module-data-worker-import/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/module-data-worker-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/module-data-worker-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index 1f734b4618d3..7791db2e61f7 100644
--- a/testing/web-platform/tests/mixed-content/module-data-worker-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/module-data-worker-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/module-data-worker-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/module-data-worker-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 4c1717102128..d50981f6dad5 100644
--- a/testing/web-platform/tests/mixed-content/module-data-worker-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/module-data-worker-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index 48bd7e27934e..65c121204d4f 100644
--- a/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 905108ca2f94..29d56963e798 100644
--- a/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index 9992cf98607d..25bbcf1e9e8a 100644
--- a/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index 895b87587038..5d34ff67cc53 100644
--- a/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index ed488953ce2e..347c57cb3a66 100644
--- a/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index 4dacb3a7c43b..ab991d2c8d25 100644
--- a/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index e7e01df29825..775fcabb1beb 100644
--- a/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 1adac7769cd9..6a9a6437c8d1 100644
--- a/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/module-worker-top-level/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/module-worker-top-level/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index bff5398b2634..e873d4a73d12 100644
--- a/testing/web-platform/tests/mixed-content/module-worker-top-level/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/module-worker-top-level/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/module-worker-top-level/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/module-worker-top-level/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index ac623c71a454..ee6c6da0c3f6 100644
--- a/testing/web-platform/tests/mixed-content/module-worker-top-level/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/module-worker-top-level/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/module-worker-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/module-worker-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index ff7b496a197d..2393202ae06d 100644
--- a/testing/web-platform/tests/mixed-content/module-worker-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/module-worker-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/module-worker-top-level/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/module-worker-top-level/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index fd30ae973e55..64f777ea3d04 100644
--- a/testing/web-platform/tests/mixed-content/module-worker-top-level/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/module-worker-top-level/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/module-worker-top-level/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/module-worker-top-level/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index 2fa81d5b8a43..4950c32ae14f 100644
--- a/testing/web-platform/tests/mixed-content/module-worker-top-level/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/module-worker-top-level/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/module-worker-top-level/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/module-worker-top-level/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 7a9a84582d64..7301b826e84c 100644
--- a/testing/web-platform/tests/mixed-content/module-worker-top-level/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/module-worker-top-level/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/module-worker-top-level/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/module-worker-top-level/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 4f9e97917714..b9a59ad49348 100644
--- a/testing/web-platform/tests/mixed-content/module-worker-top-level/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/module-worker-top-level/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/module-worker-top-level/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/module-worker-top-level/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index 8d83c1f93eeb..f1d99109db61 100644
--- a/testing/web-platform/tests/mixed-content/module-worker-top-level/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/module-worker-top-level/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/module-worker-top-level/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/module-worker-top-level/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 5719538c0fd7..17e86bac43a9 100644
--- a/testing/web-platform/tests/mixed-content/module-worker-top-level/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/module-worker-top-level/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/module-worker-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/module-worker-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index 16c4d61aaaf6..744ad87bb24f 100644
--- a/testing/web-platform/tests/mixed-content/module-worker-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/module-worker-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/module-worker-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/module-worker-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 91db14633708..e04e9baeed86 100644
--- a/testing/web-platform/tests/mixed-content/module-worker-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/module-worker-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/object-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/object-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index 5e710368a6e1..8ebd99b0118e 100644
--- a/testing/web-platform/tests/mixed-content/object-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/object-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/object-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/object-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 242569e5bcc8..b7743daa64c8 100644
--- a/testing/web-platform/tests/mixed-content/object-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/object-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/object-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/object-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index d2fe8eaa661e..3fe162a2f7cb 100644
--- a/testing/web-platform/tests/mixed-content/object-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/object-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/object-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/object-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index 4959d44533e2..4c43f3aea647 100644
--- a/testing/web-platform/tests/mixed-content/object-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/object-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/object-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/object-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 45d70e8185c6..27da8b421be6 100644
--- a/testing/web-platform/tests/mixed-content/object-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/object-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/object-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/object-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index 119dda323ef8..01df78229ff9 100644
--- a/testing/web-platform/tests/mixed-content/object-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/object-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/object-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/object-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index 01cc0998c0ec..d1be723f15d5 100644
--- a/testing/web-platform/tests/mixed-content/object-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/object-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/object-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/object-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 72275f994622..3f8ec136a1c5 100644
--- a/testing/web-platform/tests/mixed-content/object-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/object-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/object-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/object-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 4cba2b547fa1..ee5cfea71922 100644
--- a/testing/web-platform/tests/mixed-content/object-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/object-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/object-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/object-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index ea3e1dc4e767..28fdc6f0887d 100644
--- a/testing/web-platform/tests/mixed-content/object-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/object-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/object-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/object-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index d8c0fda2bef7..662ac192a881 100644
--- a/testing/web-platform/tests/mixed-content/object-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/object-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/object-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/object-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 5ba57440bff7..23e6badf7ea7 100644
--- a/testing/web-platform/tests/mixed-content/object-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/object-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/object-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/object-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index 414ed3a0e5f4..482024535f9a 100644
--- a/testing/web-platform/tests/mixed-content/object-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/object-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/object-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/object-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index a9a07e7c6898..f91df5037e7f 100644
--- a/testing/web-platform/tests/mixed-content/object-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/object-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/object-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/object-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 36ee1133c4cb..190b66b0d62c 100644
--- a/testing/web-platform/tests/mixed-content/object-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/object-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/object-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/object-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index 32bf8286926e..c03d5036a385 100644
--- a/testing/web-platform/tests/mixed-content/object-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/object-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/object-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/object-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 57d8e55701ff..d9a166609816 100644
--- a/testing/web-platform/tests/mixed-content/object-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/object-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/object-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/object-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index 1fc9bd342471..ebfb5195eb17 100644
--- a/testing/web-platform/tests/mixed-content/object-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/object-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/object-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/object-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 66e4183460ad..f5ffcf3a8b2f 100644
--- a/testing/web-platform/tests/mixed-content/object-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/object-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/picture-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/picture-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index f4284d2710dd..6f71158c2160 100644
--- a/testing/web-platform/tests/mixed-content/picture-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/picture-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/picture-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/picture-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 81c5e313e1f3..48012dfe5504 100644
--- a/testing/web-platform/tests/mixed-content/picture-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/picture-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/picture-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/picture-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index 423d55b6b9e9..b76c48a658af 100644
--- a/testing/web-platform/tests/mixed-content/picture-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/picture-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/picture-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/picture-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index 265c22fef5c4..27e971ac49c1 100644
--- a/testing/web-platform/tests/mixed-content/picture-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/picture-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/picture-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/picture-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index e78b35af9b73..0fe505a4b05c 100644
--- a/testing/web-platform/tests/mixed-content/picture-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/picture-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/picture-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/picture-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index e71eca9f5210..d066d7f4af16 100644
--- a/testing/web-platform/tests/mixed-content/picture-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/picture-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/picture-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/picture-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index 60bb06333c80..3ae09e2e3f31 100644
--- a/testing/web-platform/tests/mixed-content/picture-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/picture-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/picture-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/picture-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 082a5d029175..883c0bbdf780 100644
--- a/testing/web-platform/tests/mixed-content/picture-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/picture-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/picture-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/picture-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index d240025aaaaf..abe50087f63e 100644
--- a/testing/web-platform/tests/mixed-content/picture-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/picture-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/picture-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/picture-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 545858eb23d9..9c484e398a2b 100644
--- a/testing/web-platform/tests/mixed-content/picture-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/picture-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/picture-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/picture-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 1722e18842ae..0d846777fab3 100644
--- a/testing/web-platform/tests/mixed-content/picture-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/picture-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/picture-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/picture-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 07b58b5e8f1c..09fadc8d3fb9 100644
--- a/testing/web-platform/tests/mixed-content/picture-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/picture-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/picture-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/picture-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index 7cd700532308..63505012881f 100644
--- a/testing/web-platform/tests/mixed-content/picture-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/picture-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/picture-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/picture-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 5109e5a031d4..c3bedd387d71 100644
--- a/testing/web-platform/tests/mixed-content/picture-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/picture-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/picture-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/picture-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 1005c627f67a..0b2a8c8ff5a3 100644
--- a/testing/web-platform/tests/mixed-content/picture-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/picture-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/picture-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/picture-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index 98bf20f362e7..532c97bf066c 100644
--- a/testing/web-platform/tests/mixed-content/picture-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/picture-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/picture-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/picture-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index a5b1bedb767f..662fc90485af 100644
--- a/testing/web-platform/tests/mixed-content/picture-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/picture-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/picture-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/picture-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index 76580a4deba1..57efd6f5ec43 100644
--- a/testing/web-platform/tests/mixed-content/picture-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/picture-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/picture-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/picture-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 7e6f59e33add..e3113a84c9f4 100644
--- a/testing/web-platform/tests/mixed-content/picture-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/picture-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/script-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/script-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index a1c58ee77b0e..61f10dfbff3c 100644
--- a/testing/web-platform/tests/mixed-content/script-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/script-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/script-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/script-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 53729bbbafdc..69210c6061d8 100644
--- a/testing/web-platform/tests/mixed-content/script-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/script-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/script-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/script-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index 3f6d76717c0c..a2201a2132a4 100644
--- a/testing/web-platform/tests/mixed-content/script-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/script-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/script-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/script-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index c89c2a58c793..011e515da176 100644
--- a/testing/web-platform/tests/mixed-content/script-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/script-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/script-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/script-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 84d81d603661..5c8d860a6957 100644
--- a/testing/web-platform/tests/mixed-content/script-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/script-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/script-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/script-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index 83110755a63d..123e53d2027f 100644
--- a/testing/web-platform/tests/mixed-content/script-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/script-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/script-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/script-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index e7b7bd4e5c8a..cb3528e03c90 100644
--- a/testing/web-platform/tests/mixed-content/script-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/script-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/script-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/script-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 1aaa44590e83..7bffa299c5dd 100644
--- a/testing/web-platform/tests/mixed-content/script-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/script-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/script-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/script-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index bcb3b05739df..7e9a2395a3cd 100644
--- a/testing/web-platform/tests/mixed-content/script-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/script-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/script-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/script-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index c6af6e42c53d..44b4795c91eb 100644
--- a/testing/web-platform/tests/mixed-content/script-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/script-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/script-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/script-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index df5aa5228da2..0d0eec01c366 100644
--- a/testing/web-platform/tests/mixed-content/script-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/script-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/script-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/script-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index d0048db30555..4c375acd1577 100644
--- a/testing/web-platform/tests/mixed-content/script-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/script-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/script-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/script-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index a1519d9c2aca..21d152557194 100644
--- a/testing/web-platform/tests/mixed-content/script-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/script-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/script-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/script-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 9e46278e860d..cd56451c5e4e 100644
--- a/testing/web-platform/tests/mixed-content/script-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/script-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/script-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/script-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index d92025d3d87c..cc1c051a364f 100644
--- a/testing/web-platform/tests/mixed-content/script-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/script-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/script-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/script-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index d84c70e54e30..23efca0a54c1 100644
--- a/testing/web-platform/tests/mixed-content/script-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/script-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/script-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/script-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index d4ee7953bf7c..69e151519bb2 100644
--- a/testing/web-platform/tests/mixed-content/script-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/script-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/script-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/script-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index d8b2161b7c8f..9dc0bb122c47 100644
--- a/testing/web-platform/tests/mixed-content/script-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/script-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/script-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/script-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 7b4423bee35d..bad7e7f21044 100644
--- a/testing/web-platform/tests/mixed-content/script-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/script-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/video-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/video-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
index 97d76b32ffe5..029d34c4f417 100644
--- a/testing/web-platform/tests/mixed-content/video-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/video-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/video-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/video-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
index 6d2d972ef94f..c72ca267fcbd 100644
--- a/testing/web-platform/tests/mixed-content/video-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/video-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/video-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/video-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
index 912f59015641..b50a7b70a01c 100644
--- a/testing/web-platform/tests/mixed-content/video-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/video-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/video-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/video-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
index a0957ec2cfc3..8b64104bd2f2 100644
--- a/testing/web-platform/tests/mixed-content/video-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/video-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/video-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/video-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
index a01f53a05714..abe3385b06a7 100644
--- a/testing/web-platform/tests/mixed-content/video-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/video-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/video-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/video-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
index fb3b6344bc44..78d9f8d5d4e2 100644
--- a/testing/web-platform/tests/mixed-content/video-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/video-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/video-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/video-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index 8bd2c9f60213..ce72664408e0 100644
--- a/testing/web-platform/tests/mixed-content/video-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/video-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/video-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/video-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 94a5e8e64019..b9ddc78ff18c 100644
--- a/testing/web-platform/tests/mixed-content/video-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/video-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/video-tag/meta-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/video-tag/meta-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
index 5910d534508f..a181ecd388a3 100644
--- a/testing/web-platform/tests/mixed-content/video-tag/meta-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/video-tag/meta-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/video-tag/meta-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/video-tag/meta-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
index 44fb60208295..05f1890c98dd 100644
--- a/testing/web-platform/tests/mixed-content/video-tag/meta-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/video-tag/meta-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/video-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/video-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 1cd1855b2ac5..cf84396315ef 100644
--- a/testing/web-platform/tests/mixed-content/video-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/video-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/video-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html b/testing/web-platform/tests/mixed-content/video-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
index 48687c66ba98..561a2f7c1b5f 100644
--- a/testing/web-platform/tests/mixed-content/video-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
+++ b/testing/web-platform/tests/mixed-content/video-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/video-tag/no-opt-in/cross-origin-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html b/testing/web-platform/tests/mixed-content/video-tag/no-opt-in/cross-origin-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html
index e39519b4bc85..e02134b4acfe 100644
--- a/testing/web-platform/tests/mixed-content/video-tag/no-opt-in/cross-origin-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html
+++ b/testing/web-platform/tests/mixed-content/video-tag/no-opt-in/cross-origin-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/video-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html b/testing/web-platform/tests/mixed-content/video-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
index 1075bb4110fe..f90575c137a6 100644
--- a/testing/web-platform/tests/mixed-content/video-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
+++ b/testing/web-platform/tests/mixed-content/video-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/video-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html b/testing/web-platform/tests/mixed-content/video-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
index e97fcd5278a8..68bfc2b84a81 100644
--- a/testing/web-platform/tests/mixed-content/video-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
+++ b/testing/web-platform/tests/mixed-content/video-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/video-tag/no-opt-in/same-host-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html b/testing/web-platform/tests/mixed-content/video-tag/no-opt-in/same-host-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html
index e74ae75d66f7..2e5eff5a74ef 100644
--- a/testing/web-platform/tests/mixed-content/video-tag/no-opt-in/same-host-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html
+++ b/testing/web-platform/tests/mixed-content/video-tag/no-opt-in/same-host-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/video-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html b/testing/web-platform/tests/mixed-content/video-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
index eaaf53bc36ac..8c5bd7b08061 100644
--- a/testing/web-platform/tests/mixed-content/video-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
+++ b/testing/web-platform/tests/mixed-content/video-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/video-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/video-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index 399566ff204a..f044783e62ba 100644
--- a/testing/web-platform/tests/mixed-content/video-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/video-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/video-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/video-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 2b51bd4cf896..fd0a1f923a78 100644
--- a/testing/web-platform/tests/mixed-content/video-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/video-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html b/testing/web-platform/tests/mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html
index 4f52562fa8f1..5f4facece9f5 100644
--- a/testing/web-platform/tests/mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html b/testing/web-platform/tests/mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html
index 20fc9b91116f..0d700202fcf8 100644
--- a/testing/web-platform/tests/mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html b/testing/web-platform/tests/mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html
index 3a67d126dc6c..22e930e20b4b 100644
--- a/testing/web-platform/tests/mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/websocket-request/http-csp/same-host-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html b/testing/web-platform/tests/mixed-content/websocket-request/http-csp/same-host-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html
index 0b1702a56e95..972d7f3d3494 100644
--- a/testing/web-platform/tests/mixed-content/websocket-request/http-csp/same-host-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/websocket-request/http-csp/same-host-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/websocket-request/http-csp/same-host-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html b/testing/web-platform/tests/mixed-content/websocket-request/http-csp/same-host-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html
index 087f54d287cb..66b20800ffa6 100644
--- a/testing/web-platform/tests/mixed-content/websocket-request/http-csp/same-host-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/websocket-request/http-csp/same-host-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/websocket-request/http-csp/same-host-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html b/testing/web-platform/tests/mixed-content/websocket-request/http-csp/same-host-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html
index 2491c5384185..664acc6fa8ef 100644
--- a/testing/web-platform/tests/mixed-content/websocket-request/http-csp/same-host-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/websocket-request/http-csp/same-host-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/websocket-request/http-csp/same-host-wss/top-level/keep-scheme-redirect/allowed/websocket-allowed.https.html b/testing/web-platform/tests/mixed-content/websocket-request/http-csp/same-host-wss/top-level/keep-scheme-redirect/allowed/websocket-allowed.https.html
index 727cc350f4a2..ff33c35d1698 100644
--- a/testing/web-platform/tests/mixed-content/websocket-request/http-csp/same-host-wss/top-level/keep-scheme-redirect/allowed/websocket-allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/websocket-request/http-csp/same-host-wss/top-level/keep-scheme-redirect/allowed/websocket-allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/websocket-request/http-csp/same-host-wss/top-level/no-redirect/allowed/websocket-allowed.https.html b/testing/web-platform/tests/mixed-content/websocket-request/http-csp/same-host-wss/top-level/no-redirect/allowed/websocket-allowed.https.html
index 5a10108a5d89..dabaab28cd62 100644
--- a/testing/web-platform/tests/mixed-content/websocket-request/http-csp/same-host-wss/top-level/no-redirect/allowed/websocket-allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/websocket-request/http-csp/same-host-wss/top-level/no-redirect/allowed/websocket-allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/websocket-request/meta-csp/cross-origin-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html b/testing/web-platform/tests/mixed-content/websocket-request/meta-csp/cross-origin-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html
index f2e264249821..1bc4b11d9a70 100644
--- a/testing/web-platform/tests/mixed-content/websocket-request/meta-csp/cross-origin-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/websocket-request/meta-csp/cross-origin-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/websocket-request/meta-csp/same-host-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html b/testing/web-platform/tests/mixed-content/websocket-request/meta-csp/same-host-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html
index e9442970783d..a3cb304e034f 100644
--- a/testing/web-platform/tests/mixed-content/websocket-request/meta-csp/same-host-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/websocket-request/meta-csp/same-host-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/websocket-request/meta-csp/same-host-wss/top-level/no-redirect/allowed/websocket-allowed.https.html b/testing/web-platform/tests/mixed-content/websocket-request/meta-csp/same-host-wss/top-level/no-redirect/allowed/websocket-allowed.https.html
index 45bf7d3bb213..f1cfed1984c6 100644
--- a/testing/web-platform/tests/mixed-content/websocket-request/meta-csp/same-host-wss/top-level/no-redirect/allowed/websocket-allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/websocket-request/meta-csp/same-host-wss/top-level/no-redirect/allowed/websocket-allowed.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/websocket-request/no-opt-in/cross-origin-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html b/testing/web-platform/tests/mixed-content/websocket-request/no-opt-in/cross-origin-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html
index 049e61b1ded9..ef959099b113 100644
--- a/testing/web-platform/tests/mixed-content/websocket-request/no-opt-in/cross-origin-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/websocket-request/no-opt-in/cross-origin-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/websocket-request/no-opt-in/cross-origin-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html b/testing/web-platform/tests/mixed-content/websocket-request/no-opt-in/cross-origin-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html
index 2a282084a1de..9a344137bb96 100644
--- a/testing/web-platform/tests/mixed-content/websocket-request/no-opt-in/cross-origin-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/websocket-request/no-opt-in/cross-origin-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/websocket-request/no-opt-in/cross-origin-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html b/testing/web-platform/tests/mixed-content/websocket-request/no-opt-in/cross-origin-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html
index 099056fb25b7..fad857a6ee1c 100644
--- a/testing/web-platform/tests/mixed-content/websocket-request/no-opt-in/cross-origin-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/websocket-request/no-opt-in/cross-origin-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/websocket-request/no-opt-in/same-host-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html b/testing/web-platform/tests/mixed-content/websocket-request/no-opt-in/same-host-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html
index c24e1d7ac99b..cc63690459aa 100644
--- a/testing/web-platform/tests/mixed-content/websocket-request/no-opt-in/same-host-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/websocket-request/no-opt-in/same-host-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/websocket-request/no-opt-in/same-host-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html b/testing/web-platform/tests/mixed-content/websocket-request/no-opt-in/same-host-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html
index 83120667aff0..4b7ae62fd4b2 100644
--- a/testing/web-platform/tests/mixed-content/websocket-request/no-opt-in/same-host-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/websocket-request/no-opt-in/same-host-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/websocket-request/no-opt-in/same-host-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html b/testing/web-platform/tests/mixed-content/websocket-request/no-opt-in/same-host-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html
index 5fb923f2b5e2..278819b938f6 100644
--- a/testing/web-platform/tests/mixed-content/websocket-request/no-opt-in/same-host-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/websocket-request/no-opt-in/same-host-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/websocket-request/no-opt-in/same-host-wss/top-level/keep-scheme-redirect/allowed/websocket-allowed.https.html b/testing/web-platform/tests/mixed-content/websocket-request/no-opt-in/same-host-wss/top-level/keep-scheme-redirect/allowed/websocket-allowed.https.html
index 09fd3e4259e7..52684b1a5015 100644
--- a/testing/web-platform/tests/mixed-content/websocket-request/no-opt-in/same-host-wss/top-level/keep-scheme-redirect/allowed/websocket-allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/websocket-request/no-opt-in/same-host-wss/top-level/keep-scheme-redirect/allowed/websocket-allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/websocket-request/no-opt-in/same-host-wss/top-level/no-redirect/allowed/websocket-allowed.https.html b/testing/web-platform/tests/mixed-content/websocket-request/no-opt-in/same-host-wss/top-level/no-redirect/allowed/websocket-allowed.https.html
index 4e104fb8519f..a32429b8866c 100644
--- a/testing/web-platform/tests/mixed-content/websocket-request/no-opt-in/same-host-wss/top-level/no-redirect/allowed/websocket-allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/websocket-request/no-opt-in/same-host-wss/top-level/no-redirect/allowed/websocket-allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worker-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worker-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index 3b1be17ec596..8fc3283a0acd 100644
--- a/testing/web-platform/tests/mixed-content/worker-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worker-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worker-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worker-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index e5c5a8603415..21f63bd73074 100644
--- a/testing/web-platform/tests/mixed-content/worker-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worker-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worker-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worker-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index f318d00b762d..d4c437147aa3 100644
--- a/testing/web-platform/tests/mixed-content/worker-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worker-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worker-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worker-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index 1e133c2a8ed3..735c267a88a8 100644
--- a/testing/web-platform/tests/mixed-content/worker-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worker-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worker-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worker-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 1d7c1ec1c4de..d70b85768974 100644
--- a/testing/web-platform/tests/mixed-content/worker-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worker-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worker-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worker-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index 3e31998cb632..bf77ac6d77ef 100644
--- a/testing/web-platform/tests/mixed-content/worker-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worker-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worker-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/worker-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index 2fa9e6b3f6d9..1a9053e4c3eb 100644
--- a/testing/web-platform/tests/mixed-content/worker-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/worker-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worker-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/worker-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index c4651834b129..0488b1337550 100644
--- a/testing/web-platform/tests/mixed-content/worker-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/worker-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worker-request/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worker-request/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 140133fcdfe4..63ba90454037 100644
--- a/testing/web-platform/tests/mixed-content/worker-request/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worker-request/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worker-request/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worker-request/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index f664dfc30070..22e7c6eac283 100644
--- a/testing/web-platform/tests/mixed-content/worker-request/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worker-request/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worker-request/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/worker-request/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index f639f30ee341..e5bf5ce95a82 100644
--- a/testing/web-platform/tests/mixed-content/worker-request/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/worker-request/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worker-request/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worker-request/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 7a8df78728cf..4feea4b7dc0a 100644
--- a/testing/web-platform/tests/mixed-content/worker-request/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worker-request/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worker-request/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worker-request/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index 99162059a7e1..2d4f15b13e20 100644
--- a/testing/web-platform/tests/mixed-content/worker-request/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worker-request/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worker-request/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worker-request/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 5b69f1594831..a6782c7e5b88 100644
--- a/testing/web-platform/tests/mixed-content/worker-request/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worker-request/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worker-request/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worker-request/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index f6bad6b76b75..065ff5ba526d 100644
--- a/testing/web-platform/tests/mixed-content/worker-request/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worker-request/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worker-request/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worker-request/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index e2f8a28561ad..3cd8a67482ca 100644
--- a/testing/web-platform/tests/mixed-content/worker-request/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worker-request/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worker-request/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worker-request/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 54b34e77788e..3b3e17c27774 100644
--- a/testing/web-platform/tests/mixed-content/worker-request/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worker-request/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worker-request/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/worker-request/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index a277471b5d06..d720fc4fa993 100644
--- a/testing/web-platform/tests/mixed-content/worker-request/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/worker-request/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worker-request/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/worker-request/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index db091027140c..bd69a14a9dee 100644
--- a/testing/web-platform/tests/mixed-content/worker-request/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/worker-request/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index 1db0a1e4436e..99c2795851f6 100644
--- a/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 30cf903d12fc..ea193eadbb0a 100644
--- a/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index 8840673a6302..f410e1cf8e8b 100644
--- a/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index fcb3ed1f3af2..cfda98f785f1 100644
--- a/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index e97d9ed90520..a85242a83345 100644
--- a/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index b9e6af0d6b3e..48d74bc30817 100644
--- a/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index 79ace7792930..7d0cdae613ee 100644
--- a/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 3a41ecf140b5..94f97850ea7e 100644
--- a/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-animation-data-import/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-animation-data-import/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 9bf5482526ad..1a895d0fd70a 100644
--- a/testing/web-platform/tests/mixed-content/worklet-animation-data-import/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-animation-data-import/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-animation-data-import/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-animation-data-import/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index a7d02739da22..ab90656e54ce 100644
--- a/testing/web-platform/tests/mixed-content/worklet-animation-data-import/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-animation-data-import/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-animation-data-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/worklet-animation-data-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 2e7aa0709909..113460364e35 100644
--- a/testing/web-platform/tests/mixed-content/worklet-animation-data-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-animation-data-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-animation-data-import/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-animation-data-import/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 4a97df5b5bab..a636eef658b9 100644
--- a/testing/web-platform/tests/mixed-content/worklet-animation-data-import/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-animation-data-import/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-animation-data-import/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-animation-data-import/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index 0358e5fb6beb..8aa7d05881f0 100644
--- a/testing/web-platform/tests/mixed-content/worklet-animation-data-import/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-animation-data-import/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-animation-data-import/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-animation-data-import/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index d59023de3847..5ef502f0c29f 100644
--- a/testing/web-platform/tests/mixed-content/worklet-animation-data-import/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-animation-data-import/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-animation-data-import/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-animation-data-import/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 13e9150460b2..34b6be42bb5e 100644
--- a/testing/web-platform/tests/mixed-content/worklet-animation-data-import/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-animation-data-import/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-animation-data-import/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-animation-data-import/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index 84b53d8f1ba9..1586df97fc5a 100644
--- a/testing/web-platform/tests/mixed-content/worklet-animation-data-import/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-animation-data-import/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-animation-data-import/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-animation-data-import/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 4b6dc464b46a..73f621edff11 100644
--- a/testing/web-platform/tests/mixed-content/worklet-animation-data-import/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-animation-data-import/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-animation-data-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/worklet-animation-data-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index ad35a459266b..2b32f598852c 100644
--- a/testing/web-platform/tests/mixed-content/worklet-animation-data-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-animation-data-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-animation-data-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/worklet-animation-data-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 2ca7129d2eec..35995bb976f0 100644
--- a/testing/web-platform/tests/mixed-content/worklet-animation-data-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-animation-data-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index 3ca94248773a..c858da0c4b60 100644
--- a/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 0ebfe517fd1b..0387b165e1b7 100644
--- a/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index 85f339a461fe..34a4e1e532aa 100644
--- a/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index 2ff42bf27e78..b683d8267eb6 100644
--- a/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 3e0fbbc95852..5655510609ff 100644
--- a/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index b12e3d7fbe24..0ccf4bc4229c 100644
--- a/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index 3877b4adf8c5..7c54048c0a9c 100644
--- a/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 1aeee584cff4..2d3eb78d6186 100644
--- a/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-animation-top-level/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-animation-top-level/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index f96210c1198f..989f1ad50780 100644
--- a/testing/web-platform/tests/mixed-content/worklet-animation-top-level/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-animation-top-level/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-animation-top-level/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-animation-top-level/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 86e8c0c4b5e0..46bca306999c 100644
--- a/testing/web-platform/tests/mixed-content/worklet-animation-top-level/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-animation-top-level/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-animation-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/worklet-animation-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index ef94f6df86a2..313f7755b482 100644
--- a/testing/web-platform/tests/mixed-content/worklet-animation-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-animation-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-animation-top-level/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-animation-top-level/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 557f3f78e3bb..033b1d9798f0 100644
--- a/testing/web-platform/tests/mixed-content/worklet-animation-top-level/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-animation-top-level/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-animation-top-level/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-animation-top-level/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index f9dd0619e04e..c4d4629746b3 100644
--- a/testing/web-platform/tests/mixed-content/worklet-animation-top-level/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-animation-top-level/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-animation-top-level/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-animation-top-level/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index f6e6751ed482..90ad6006617b 100644
--- a/testing/web-platform/tests/mixed-content/worklet-animation-top-level/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-animation-top-level/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-animation-top-level/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-animation-top-level/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 2b1b0b2d913b..5111667254f6 100644
--- a/testing/web-platform/tests/mixed-content/worklet-animation-top-level/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-animation-top-level/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-animation-top-level/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-animation-top-level/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index 159329a1ff0b..7d54c015391f 100644
--- a/testing/web-platform/tests/mixed-content/worklet-animation-top-level/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-animation-top-level/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-animation-top-level/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-animation-top-level/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 0e045e1bce01..e1a0ac5a997a 100644
--- a/testing/web-platform/tests/mixed-content/worklet-animation-top-level/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-animation-top-level/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-animation-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/worklet-animation-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index 6658abc73aea..812cec20e183 100644
--- a/testing/web-platform/tests/mixed-content/worklet-animation-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-animation-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-animation-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/worklet-animation-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 32ac8f2c932e..a36119761318 100644
--- a/testing/web-platform/tests/mixed-content/worklet-animation-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-animation-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index 189a25b2e6d3..81e57b110c0b 100644
--- a/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 3144aba7d7ab..ec537f579233 100644
--- a/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index 6e5dcc59a868..0b8ddb9cc929 100644
--- a/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index d78de561bb09..d2ab9e1e3251 100644
--- a/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index a1f5f72bec62..e3b0cb811797 100644
--- a/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index 85d1a1e95451..063c7b77c21c 100644
--- a/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index 00b5d6f7eb21..802b84c1899d 100644
--- a/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 9cae068af513..7e40482d496e 100644
--- a/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-audio-data-import/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-audio-data-import/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index c4846185f223..1c77b65b666a 100644
--- a/testing/web-platform/tests/mixed-content/worklet-audio-data-import/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-audio-data-import/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-audio-data-import/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-audio-data-import/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 5f10d56162a9..c5ec8343c905 100644
--- a/testing/web-platform/tests/mixed-content/worklet-audio-data-import/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-audio-data-import/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-audio-data-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/worklet-audio-data-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 502407cba75c..918aec37a419 100644
--- a/testing/web-platform/tests/mixed-content/worklet-audio-data-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-audio-data-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-audio-data-import/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-audio-data-import/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index c0f2fc7a1765..b801db0de2e4 100644
--- a/testing/web-platform/tests/mixed-content/worklet-audio-data-import/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-audio-data-import/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-audio-data-import/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-audio-data-import/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index 7b6e331e2b17..65d7c00892ce 100644
--- a/testing/web-platform/tests/mixed-content/worklet-audio-data-import/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-audio-data-import/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-audio-data-import/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-audio-data-import/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 94cfb964c6db..bd3afe9856e0 100644
--- a/testing/web-platform/tests/mixed-content/worklet-audio-data-import/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-audio-data-import/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-audio-data-import/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-audio-data-import/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 49b910332a53..45759c1b3177 100644
--- a/testing/web-platform/tests/mixed-content/worklet-audio-data-import/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-audio-data-import/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-audio-data-import/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-audio-data-import/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index 6f8ea0151178..5d2f67b7fff5 100644
--- a/testing/web-platform/tests/mixed-content/worklet-audio-data-import/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-audio-data-import/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-audio-data-import/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-audio-data-import/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 1b18de0c696c..fbf57e8b6479 100644
--- a/testing/web-platform/tests/mixed-content/worklet-audio-data-import/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-audio-data-import/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-audio-data-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/worklet-audio-data-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index dfdbae7cb0c9..e297efb9433c 100644
--- a/testing/web-platform/tests/mixed-content/worklet-audio-data-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-audio-data-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-audio-data-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/worklet-audio-data-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index c6ce305c5fac..6e1e6cba39cc 100644
--- a/testing/web-platform/tests/mixed-content/worklet-audio-data-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-audio-data-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index cba9bdc351cf..68329ff582ed 100644
--- a/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 13eb20d20b4a..862abf012b55 100644
--- a/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index 4df48a8f80f2..9e8ca3cd5731 100644
--- a/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index 9c796352a1d7..341e9584d94d 100644
--- a/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 176da0f4d48a..0bf45c0d5114 100644
--- a/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index 3ba97cc4af33..017a38884835 100644
--- a/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index 66857b1c2354..c7f37dee35c3 100644
--- a/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index e0b664bca097..84c5ae0d05ac 100644
--- a/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-audio-top-level/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-audio-top-level/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 6f688d70dd90..b7f5cdc9c9c5 100644
--- a/testing/web-platform/tests/mixed-content/worklet-audio-top-level/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-audio-top-level/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-audio-top-level/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-audio-top-level/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 63bb81d1b8ae..adb418f61a91 100644
--- a/testing/web-platform/tests/mixed-content/worklet-audio-top-level/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-audio-top-level/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-audio-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/worklet-audio-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index e9b11532395b..ce31e04d1b1c 100644
--- a/testing/web-platform/tests/mixed-content/worklet-audio-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-audio-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-audio-top-level/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-audio-top-level/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 6d72fbe85c2c..8197d981d8be 100644
--- a/testing/web-platform/tests/mixed-content/worklet-audio-top-level/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-audio-top-level/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-audio-top-level/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-audio-top-level/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index ddb4146a26fe..60a5b9ec6e24 100644
--- a/testing/web-platform/tests/mixed-content/worklet-audio-top-level/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-audio-top-level/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-audio-top-level/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-audio-top-level/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index f2e6058f0f2a..035fe3bb0b13 100644
--- a/testing/web-platform/tests/mixed-content/worklet-audio-top-level/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-audio-top-level/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-audio-top-level/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-audio-top-level/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 970723e66de3..56c5e14673e1 100644
--- a/testing/web-platform/tests/mixed-content/worklet-audio-top-level/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-audio-top-level/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-audio-top-level/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-audio-top-level/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index 49011184e6c8..f1e134adbed1 100644
--- a/testing/web-platform/tests/mixed-content/worklet-audio-top-level/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-audio-top-level/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-audio-top-level/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-audio-top-level/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index b0ea6b38a56e..ce5d3e1c0657 100644
--- a/testing/web-platform/tests/mixed-content/worklet-audio-top-level/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-audio-top-level/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-audio-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/worklet-audio-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index 4b1452782ea6..5c123ed6cb1a 100644
--- a/testing/web-platform/tests/mixed-content/worklet-audio-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-audio-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-audio-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/worklet-audio-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 4737340b7010..06aadc3c3ce3 100644
--- a/testing/web-platform/tests/mixed-content/worklet-audio-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-audio-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index 7e1db35ba002..bcc60543ae09 100644
--- a/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 617237da801b..e56443cb86bb 100644
--- a/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index 3a90c1da480b..40569b7188d9 100644
--- a/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index 3f2b4aa46c11..17226d674591 100644
--- a/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index f6201721afc8..034c2f727de6 100644
--- a/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index c96d2d4b2674..1ecd9d94e024 100644
--- a/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index 685bd1e4a136..a60c79d490ff 100644
--- a/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index aaa62a95e808..88efeaf09455 100644
--- a/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-layout-data-import/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-layout-data-import/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 37d3c51754a5..2e33579ee35b 100644
--- a/testing/web-platform/tests/mixed-content/worklet-layout-data-import/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-layout-data-import/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-layout-data-import/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-layout-data-import/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 8c1cecce2f93..7f1353c5477f 100644
--- a/testing/web-platform/tests/mixed-content/worklet-layout-data-import/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-layout-data-import/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-layout-data-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/worklet-layout-data-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index c766c5ed130a..5cc77dd2e6bd 100644
--- a/testing/web-platform/tests/mixed-content/worklet-layout-data-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-layout-data-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-layout-data-import/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-layout-data-import/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 408d01cdf7c5..6af86dd96b3a 100644
--- a/testing/web-platform/tests/mixed-content/worklet-layout-data-import/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-layout-data-import/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-layout-data-import/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-layout-data-import/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index bd5f1b0563e2..e6a9c4c426d2 100644
--- a/testing/web-platform/tests/mixed-content/worklet-layout-data-import/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-layout-data-import/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-layout-data-import/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-layout-data-import/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 006ee9d12bb9..400622006fcf 100644
--- a/testing/web-platform/tests/mixed-content/worklet-layout-data-import/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-layout-data-import/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-layout-data-import/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-layout-data-import/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 905856f6ceef..b4be536c9232 100644
--- a/testing/web-platform/tests/mixed-content/worklet-layout-data-import/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-layout-data-import/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-layout-data-import/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-layout-data-import/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index c031756b389e..0d7b7210a99f 100644
--- a/testing/web-platform/tests/mixed-content/worklet-layout-data-import/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-layout-data-import/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-layout-data-import/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-layout-data-import/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index c8c56c457f7a..708c0a5d75f2 100644
--- a/testing/web-platform/tests/mixed-content/worklet-layout-data-import/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-layout-data-import/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-layout-data-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/worklet-layout-data-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index a86f3b4429d3..2414d5f321c1 100644
--- a/testing/web-platform/tests/mixed-content/worklet-layout-data-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-layout-data-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-layout-data-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/worklet-layout-data-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index e0a437e26d6e..f0fa9aa60766 100644
--- a/testing/web-platform/tests/mixed-content/worklet-layout-data-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-layout-data-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index 89b2402ec544..440630b5c299 100644
--- a/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 5b01dbc1b700..51cf26bcc86d 100644
--- a/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index 55d23f9724e9..d38c0259e95b 100644
--- a/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index 64d45885ecd5..f32666f28ac9 100644
--- a/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 27bb9376848d..016ea765f53e 100644
--- a/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index 2bd8a109a029..47ba0d806743 100644
--- a/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index 8fec9a030fe9..6b339518948b 100644
--- a/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 4bd827703940..349d1ae1e630 100644
--- a/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-layout-top-level/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-layout-top-level/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index cc5688915fe5..ba7834dff565 100644
--- a/testing/web-platform/tests/mixed-content/worklet-layout-top-level/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-layout-top-level/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-layout-top-level/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-layout-top-level/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index f50bb1848c2e..d1514320a5c9 100644
--- a/testing/web-platform/tests/mixed-content/worklet-layout-top-level/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-layout-top-level/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-layout-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/worklet-layout-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 785bc579c25f..42b9de520ea1 100644
--- a/testing/web-platform/tests/mixed-content/worklet-layout-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-layout-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-layout-top-level/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-layout-top-level/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 2918d12dc193..3a03aeae6267 100644
--- a/testing/web-platform/tests/mixed-content/worklet-layout-top-level/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-layout-top-level/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-layout-top-level/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-layout-top-level/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index 63ce10a6b6cb..c087917e88dd 100644
--- a/testing/web-platform/tests/mixed-content/worklet-layout-top-level/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-layout-top-level/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-layout-top-level/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-layout-top-level/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 333b26e8db57..f4192c219a49 100644
--- a/testing/web-platform/tests/mixed-content/worklet-layout-top-level/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-layout-top-level/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-layout-top-level/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-layout-top-level/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 29edc68057dd..82713253b046 100644
--- a/testing/web-platform/tests/mixed-content/worklet-layout-top-level/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-layout-top-level/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-layout-top-level/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-layout-top-level/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index 12ea7f2dbdf7..35ad440c5285 100644
--- a/testing/web-platform/tests/mixed-content/worklet-layout-top-level/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-layout-top-level/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-layout-top-level/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-layout-top-level/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index ede2b9eb18f3..58227b988f35 100644
--- a/testing/web-platform/tests/mixed-content/worklet-layout-top-level/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-layout-top-level/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-layout-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/worklet-layout-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index b35999d891a7..e43a2542b1b3 100644
--- a/testing/web-platform/tests/mixed-content/worklet-layout-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-layout-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-layout-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/worklet-layout-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 5ad4fdc5cffe..4e0db8fc4486 100644
--- a/testing/web-platform/tests/mixed-content/worklet-layout-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-layout-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index 94dc4faaa08f..84345fb74a58 100644
--- a/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 163772364902..52595a63b0f0 100644
--- a/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index c0df2746529d..0844824ea72a 100644
--- a/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index 2e99652ac62d..8b5df2cacc71 100644
--- a/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 202b22c4be51..b03a99c5e6a2 100644
--- a/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index 3e4c570310d6..7180a72690d4 100644
--- a/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index df15dd97a6c3..f228ae5dc8e8 100644
--- a/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 23668777f15b..ca0a9f47db39 100644
--- a/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-paint-data-import/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-paint-data-import/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index a8b19ae720fe..7d38ae9f8d46 100644
--- a/testing/web-platform/tests/mixed-content/worklet-paint-data-import/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-paint-data-import/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-paint-data-import/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-paint-data-import/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index cfa30e472c24..c8bb0051668a 100644
--- a/testing/web-platform/tests/mixed-content/worklet-paint-data-import/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-paint-data-import/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-paint-data-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/worklet-paint-data-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 1c8391eb4cfa..e97507d57490 100644
--- a/testing/web-platform/tests/mixed-content/worklet-paint-data-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-paint-data-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-paint-data-import/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-paint-data-import/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index d33c7928abbf..a9b350b5c9df 100644
--- a/testing/web-platform/tests/mixed-content/worklet-paint-data-import/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-paint-data-import/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-paint-data-import/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-paint-data-import/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index 939f20f9dfd8..81db7898f321 100644
--- a/testing/web-platform/tests/mixed-content/worklet-paint-data-import/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-paint-data-import/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-paint-data-import/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-paint-data-import/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index be7e4ce7cce9..999411c6297b 100644
--- a/testing/web-platform/tests/mixed-content/worklet-paint-data-import/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-paint-data-import/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-paint-data-import/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-paint-data-import/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index f69486e70eb7..de2d00317561 100644
--- a/testing/web-platform/tests/mixed-content/worklet-paint-data-import/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-paint-data-import/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-paint-data-import/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-paint-data-import/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index 806b2ae13bb8..453c5cb95d01 100644
--- a/testing/web-platform/tests/mixed-content/worklet-paint-data-import/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-paint-data-import/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-paint-data-import/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-paint-data-import/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index f0b30f8f3ee3..fbf362903e17 100644
--- a/testing/web-platform/tests/mixed-content/worklet-paint-data-import/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-paint-data-import/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-paint-data-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/worklet-paint-data-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index 9ff4c3ce1cf8..a34698e9f7ad 100644
--- a/testing/web-platform/tests/mixed-content/worklet-paint-data-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-paint-data-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-paint-data-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/worklet-paint-data-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 0edffdf2502b..bbd268ab31c2 100644
--- a/testing/web-platform/tests/mixed-content/worklet-paint-data-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-paint-data-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index ab3439a3bd88..45472963891f 100644
--- a/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 3d17e69cb37c..6d519a352c42 100644
--- a/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index c060ab338495..2a317beae4e9 100644
--- a/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index 22760d90a955..44d4b3d88524 100644
--- a/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 9f3bc48ef900..f1af455623f2 100644
--- a/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index 95ef4692ed9d..6eb6e95ef68a 100644
--- a/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index 145cb040149e..9b5656b96138 100644
--- a/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 911051752d59..4fbf140e6603 100644
--- a/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-paint-top-level/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-paint-top-level/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 824341656477..d1b9d5d6139a 100644
--- a/testing/web-platform/tests/mixed-content/worklet-paint-top-level/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-paint-top-level/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-paint-top-level/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-paint-top-level/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index e8d26e88be17..c328f8fe8a52 100644
--- a/testing/web-platform/tests/mixed-content/worklet-paint-top-level/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-paint-top-level/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-paint-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/worklet-paint-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 9db55dc53548..dc7cd63dceab 100644
--- a/testing/web-platform/tests/mixed-content/worklet-paint-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-paint-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-paint-top-level/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-paint-top-level/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 4412335c4447..1c7d29835bb8 100644
--- a/testing/web-platform/tests/mixed-content/worklet-paint-top-level/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-paint-top-level/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-paint-top-level/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-paint-top-level/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index 7f7d6b2b4776..cea0a88bacb6 100644
--- a/testing/web-platform/tests/mixed-content/worklet-paint-top-level/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-paint-top-level/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-paint-top-level/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-paint-top-level/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 976645401490..224d7c767b5c 100644
--- a/testing/web-platform/tests/mixed-content/worklet-paint-top-level/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-paint-top-level/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-paint-top-level/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-paint-top-level/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 196f60ff46e6..b1432e78ac28 100644
--- a/testing/web-platform/tests/mixed-content/worklet-paint-top-level/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-paint-top-level/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-paint-top-level/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-paint-top-level/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index b2bf5c412b6e..ce845cb3d521 100644
--- a/testing/web-platform/tests/mixed-content/worklet-paint-top-level/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-paint-top-level/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-paint-top-level/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/worklet-paint-top-level/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index b931d339fdae..1e9acdf88e29 100644
--- a/testing/web-platform/tests/mixed-content/worklet-paint-top-level/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-paint-top-level/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-paint-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/worklet-paint-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index 0eeba32e2134..0ff9576d6038 100644
--- a/testing/web-platform/tests/mixed-content/worklet-paint-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-paint-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/worklet-paint-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/worklet-paint-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 1da3a8484ec5..d0e64b29b2dd 100644
--- a/testing/web-platform/tests/mixed-content/worklet-paint-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/worklet-paint-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/xhr-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/xhr-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index f70e0d714150..314f09789057 100644
--- a/testing/web-platform/tests/mixed-content/xhr-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/xhr-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/xhr-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/xhr-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index be74d7f085c2..d44e65bcd190 100644
--- a/testing/web-platform/tests/mixed-content/xhr-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/xhr-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/xhr-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/xhr-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index 39f508c2b165..973db8006fc6 100644
--- a/testing/web-platform/tests/mixed-content/xhr-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/xhr-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/xhr-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/xhr-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
index 703e0af29591..f8509416232c 100644
--- a/testing/web-platform/tests/mixed-content/xhr-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/xhr-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/xhr-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/xhr-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index a1323d428a38..0dd9e88e885f 100644
--- a/testing/web-platform/tests/mixed-content/xhr-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/xhr-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/xhr-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/xhr-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
index 0aa1bf3f82f2..eb7f7ea2c739 100644
--- a/testing/web-platform/tests/mixed-content/xhr-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/xhr-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/xhr-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/xhr-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index 61fe95dbd29e..23f0a1fc89d3 100644
--- a/testing/web-platform/tests/mixed-content/xhr-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/xhr-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/xhr-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/xhr-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 8a0c5b1a51ff..7baa3e54a98f 100644
--- a/testing/web-platform/tests/mixed-content/xhr-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/xhr-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/xhr-request/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/xhr-request/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index df3f8cc6f628..cf95677c7f6e 100644
--- a/testing/web-platform/tests/mixed-content/xhr-request/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/xhr-request/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/xhr-request/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/xhr-request/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
index 74261daf151a..80a633ab22fe 100644
--- a/testing/web-platform/tests/mixed-content/xhr-request/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/xhr-request/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/xhr-request/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/xhr-request/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index 45cd5ea84230..ebbc9ec0c675 100644
--- a/testing/web-platform/tests/mixed-content/xhr-request/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/xhr-request/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -17,7 +17,7 @@
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/xhr-request/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/xhr-request/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index ed8f550d8952..b2ee591a74aa 100644
--- a/testing/web-platform/tests/mixed-content/xhr-request/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/xhr-request/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/xhr-request/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/xhr-request/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index c14bc41c79e6..e49db79f3d38 100644
--- a/testing/web-platform/tests/mixed-content/xhr-request/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/xhr-request/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/xhr-request/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/xhr-request/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 1061f61fe383..ffd8aeb9c0b9 100644
--- a/testing/web-platform/tests/mixed-content/xhr-request/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/xhr-request/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/xhr-request/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/xhr-request/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
index 18a5a3e8b4d1..897354a798ac 100644
--- a/testing/web-platform/tests/mixed-content/xhr-request/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/xhr-request/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/xhr-request/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/xhr-request/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
index d47797aca231..ee787d05aa3c 100644
--- a/testing/web-platform/tests/mixed-content/xhr-request/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/xhr-request/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/xhr-request/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html b/testing/web-platform/tests/mixed-content/xhr-request/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
index ff17fa2abbb5..9a9085b86ebf 100644
--- a/testing/web-platform/tests/mixed-content/xhr-request/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
+++ b/testing/web-platform/tests/mixed-content/xhr-request/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
@@ -16,7 +16,7 @@
                                  expectation: blocked">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/xhr-request/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/xhr-request/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
index 76d5442339d4..9da0d9f98ecb 100644
--- a/testing/web-platform/tests/mixed-content/xhr-request/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/xhr-request/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/mixed-content/xhr-request/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html b/testing/web-platform/tests/mixed-content/xhr-request/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
index e6eba571c0e7..b0fff36eb946 100644
--- a/testing/web-platform/tests/mixed-content/xhr-request/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
+++ b/testing/web-platform/tests/mixed-content/xhr-request/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
@@ -16,7 +16,7 @@
                                  expectation: allowed">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/mixed-content/generic/common.js"></script>
     <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/network-error-logging/support/nel.sub.js b/testing/web-platform/tests/network-error-logging/support/nel.sub.js
index 8fa83505320c..759d0337fa67 100644
--- a/testing/web-platform/tests/network-error-logging/support/nel.sub.js
+++ b/testing/web-platform/tests/network-error-logging/support/nel.sub.js
@@ -55,7 +55,7 @@ function _getNELResourceURL(subdomain, suffix) {
  */
 
 function getURLForResourceWithBasicPolicy(subdomain) {
-  return _getNELResourceURL(subdomain, "pass.png?id="+reportID+"&success_fraction=1.0");
+  return _getNELResourceURL(subdomain, "pass.png?id="+reportID);
 }
 
 function fetchResourceWithBasicPolicy(subdomain) {
@@ -63,11 +63,6 @@ function fetchResourceWithBasicPolicy(subdomain) {
   return fetch(url, {mode: "no-cors"});
 }
 
-function fetchResourceWithZeroSuccessFractionPolicy(subdomain) {
-  const url = _getNELResourceURL(subdomain, "pass.png?id="+reportID+"&success_fraction=0.0");
-  return fetch(url, {mode: "no-cors"});
-}
-
 /*
  * Fetches a resource whose headers define an include_subdomains NEL policy.
  */
@@ -212,28 +207,3 @@ async function reportExists(expected) {
   }
   return false;
 }
-
-/*
- * Verifies that reports were uploaded that contains all of the fields in
- * expected.
- */
-
-async function reportsExist(expected_reports) {
-  const timeout = 10;
-  let reportLocation =
-    "/network-error-logging/support/report.py?op=retrieve_report&timeout=" +
-    timeout + "&reportID=" + reportID;
-  // There must be the report of pass.png, so adding 1.
-  const min_count = expected_reports.length + 1;
-  reportLocation += "&min_count=" + min_count;
-  const response = await fetch(reportLocation);
-  const json = await response.json();
-  for (const expected of expected_reports) {
-    const found = json.some((report) => {
-      return _isSubsetOf(expected, report);
-    });
-    if (!found)
-      return false;
-  }
-  return true;
-}
diff --git a/testing/web-platform/tests/network-error-logging/support/pass.png.sub.headers b/testing/web-platform/tests/network-error-logging/support/pass.png.sub.headers
index 15d246d8d9dd..70796e913ace 100644
--- a/testing/web-platform/tests/network-error-logging/support/pass.png.sub.headers
+++ b/testing/web-platform/tests/network-error-logging/support/pass.png.sub.headers
@@ -3,4 +3,4 @@ Cache-Control: no-store, no-cache, must-revalidate
 Cache-Control: post-check=0, pre-check=0, false
 Pragma: no-cache
 Report-To: { "group": "nel-group", "max_age": 10886400, "endpoints": [{ "url": "https://{{hosts[][www]}}:{{ports[https][0]}}/network-error-logging/support/report.py?op=put&reportID={{GET[id]}}" }] }
-NEL: {"report_to": "nel-group", "max_age": 10886400, "success_fraction": {{GET[success_fraction]}}}
+NEL: {"report_to": "nel-group", "max_age": 10886400, "success_fraction": 1.0}
diff --git a/testing/web-platform/tests/network-error-logging/support/report.py b/testing/web-platform/tests/network-error-logging/support/report.py
index 4bb7e3d248bb..49af9fe34cca 100644
--- a/testing/web-platform/tests/network-error-logging/support/report.py
+++ b/testing/web-platform/tests/network-error-logging/support/report.py
@@ -2,12 +2,12 @@ import time
 import json
 import re
 
-def retrieve_from_stash(request, key, timeout, min_count, default_value):
+def retrieve_from_stash(request, key, timeout, default_value):
   t0 = time.time()
   while time.time() - t0 < timeout:
     time.sleep(0.5)
     value = request.server.stash.take(key=key)
-    if value is not None and len(value) >= min_count:
+    if value is not None:
       request.server.stash.put(key=key, value=value)
       return json.dumps(value)
 
@@ -34,11 +34,7 @@ def main(request, response):
       timeout = float(request.GET.first("timeout"))
     except:
       timeout = 0.5
-    try:
-      min_count = int(request.GET.first("min_count"))
-    except:
-      min_count = 1
-    return [("Content-Type", "application/json")], retrieve_from_stash(request, key, timeout, min_count, '[]')
+    return [("Content-Type", "application/json")], retrieve_from_stash(request, key, timeout, '[]')
 
   # append new reports
   new_reports = json.loads(request.body)
diff --git a/testing/web-platform/tests/orientation-event/devicemotionevent-init.https.html b/testing/web-platform/tests/orientation-event/devicemotionevent-init.html
similarity index 100%
rename from testing/web-platform/tests/orientation-event/devicemotionevent-init.https.html
rename to testing/web-platform/tests/orientation-event/devicemotionevent-init.html
diff --git a/testing/web-platform/tests/orientation-event/deviceorientationabsoluteevent.https.html b/testing/web-platform/tests/orientation-event/deviceorientationabsoluteevent.html
similarity index 100%
rename from testing/web-platform/tests/orientation-event/deviceorientationabsoluteevent.https.html
rename to testing/web-platform/tests/orientation-event/deviceorientationabsoluteevent.html
diff --git a/testing/web-platform/tests/orientation-event/deviceorientationevent-init.https.html b/testing/web-platform/tests/orientation-event/deviceorientationevent-init.html
similarity index 100%
rename from testing/web-platform/tests/orientation-event/deviceorientationevent-init.https.html
rename to testing/web-platform/tests/orientation-event/deviceorientationevent-init.html
diff --git a/testing/web-platform/tests/orientation-event/ondeviceorientationabsolute.https.html b/testing/web-platform/tests/orientation-event/ondeviceorientationabsolute.html
similarity index 100%
rename from testing/web-platform/tests/orientation-event/ondeviceorientationabsolute.https.html
rename to testing/web-platform/tests/orientation-event/ondeviceorientationabsolute.html
diff --git a/testing/web-platform/tests/payment-method-basic-card/empty-data-manual.https.html b/testing/web-platform/tests/payment-method-basic-card/empty-data-manual.https.html
index ba881ee2366c..2392553ebd37 100644
--- a/testing/web-platform/tests/payment-method-basic-card/empty-data-manual.https.html
+++ b/testing/web-platform/tests/payment-method-basic-card/empty-data-manual.https.html
@@ -39,8 +39,8 @@ const visaCredit = {
 };
 
 async function getCardResponse(data) {
-  const payMethod = Object.assign({ data }, method);
-  const response = await new PaymentRequest([payMethod], details).show();
+  const method = Object.assign({ data }, methodCard);
+  const response = await new PaymentRequest([method], defaultDetails).show();
   await response.complete("success");
   return response.details;
 }
@@ -54,7 +54,7 @@ function runPromiseTest(button, data, expectedCard = visaCredit, expectedAddress
   promise_test(async () => {
     const card = await getCardResponse(data);
     for (const [member, expectedValue] of Object.entries(expectedCard)) {
-      const msg = `Expected "card.${member}" to equal "${expectedValue}".`;
+      const msg = `Expected card.${member} to equal ${expectedValue}.`;
       assert_equals(card[member], expectedValue, msg);
     }
     const { billingAddress } = card;
@@ -120,11 +120,6 @@ function runPromiseTest(button, data, expectedCard = visaCredit, expectedAddress
       Returns a card on any network, because zero length supportedNetworks.
     </button>
   </li>
-  <li>
-    <button onclick="done();">
-      Done!
-    </button>
-  </li>
 </ol>
 
 <small>
diff --git a/testing/web-platform/tests/payment-method-basic-card/payment-request-canmakepayment-method.https.html b/testing/web-platform/tests/payment-method-basic-card/payment-request-canmakepayment-method.https.html
index f1b0c28abb88..a89c63b1bbc8 100644
--- a/testing/web-platform/tests/payment-method-basic-card/payment-request-canmakepayment-method.https.html
+++ b/testing/web-platform/tests/payment-method-basic-card/payment-request-canmakepayment-method.https.html
@@ -33,7 +33,7 @@ promise_test(async t => {
 function* pmiGenerator(howMany = 256) {
   for (i = 0; i < howMany; i++) {
     yield {
-      supportedMethods: `this-is-not-supported`,
+      supportedMethods: `this-is-not-supported-${i}`,
       data: { key: "value" },
     };
   }
diff --git a/testing/web-platform/tests/payment-request/META.yml b/testing/web-platform/tests/payment-request/META.yml
index 558db3e088c1..227ca551dc2f 100644
--- a/testing/web-platform/tests/payment-request/META.yml
+++ b/testing/web-platform/tests/payment-request/META.yml
@@ -7,4 +7,3 @@ suggested_reviewers:
   - romandev
   - edenchuang
   - aestes
-  - danyao
diff --git a/testing/web-platform/tests/payment-request/payment-request-abort-method-manual.https.html b/testing/web-platform/tests/payment-request/payment-request-abort-method-manual.https.html
new file mode 100644
index 000000000000..a24bac864aad
--- /dev/null
+++ b/testing/web-platform/tests/payment-request/payment-request-abort-method-manual.https.html
@@ -0,0 +1,95 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Manual tests for PaymentRequest.abort() method</title>
+<link rel="help" href="https://w3c.github.io/payment-request/#abort-method">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+"use strict";
+setup({
+  explicit_done: true,
+  explicit_timeout: true,
+});
+const basicCard = Object.freeze({ supportedMethods: "basic-card" });
+const applePay = Object.freeze({
+  supportedMethods: "https://apple.com/apple-pay",
+  data: {
+    version: 3,
+    merchantIdentifier: "merchant.com.example",
+    countryCode: "US",
+    merchantCapabilities: ["supports3DS"],
+    supportedNetworks: ["visa"],
+  }
+});
+const defaultMethods = Object.freeze([basicCard, applePay]);
+const defaultDetails = Object.freeze({
+  total: {
+    label: "Total",
+    amount: {
+      currency: "USD",
+      value: "1.00",
+    },
+  },
+});
+
+function testShowSameRequestMultipleTimes() {
+  promise_test(async t => {
+    const request = new PaymentRequest(defaultMethods, defaultDetails);
+    const acceptPromise = request.show()
+    try {
+      await request.abort();
+    } catch (err) {
+      assert_unreached("Unexpected promise rejection: " + err.message);
+    }
+    await promise_rejects(t, "AbortError", acceptPromise);
+    // As request is now "closed", trying to show it will fail
+    await promise_rejects(t, "InvalidStateError", request.show());
+  }, "The same request cannot be shown multiple times.");
+}
+
+function testAbortBeforeShow() {
+  promise_test(async t => {
+    // request is in "created" state.
+    const request = new PaymentRequest(defaultMethods, defaultDetails);
+    await promise_rejects(t, "InvalidStateError", request.abort());
+    // Call it again, for good measure.
+    await promise_rejects(t, "InvalidStateError", request.abort());
+    // The request's state is "created", so let's show it
+    // which changes the state to "interactive.".
+    const acceptPromise = request.show()
+    // Let's set request the state to "closed" by calling .abort()
+    try {
+      await request.abort();
+    } catch (err) {
+      assert_unreached("Unexpected promise rejection: " + err.message);
+    }
+    // The request is now "closed", so...
+    await promise_rejects(t, "InvalidStateError", request.abort());
+    await promise_rejects(t, "AbortError", acceptPromise);
+  }, "Aborting a request before it is shown doesn't prevent it from being shown later.");
+}
+</script>
+<h2>Manual tests for PaymentRequest.abort() method</h2>
+<p>
+  Click on each button in sequence from top to bottom without refreshing the
+  page. Each button will bring up the Payment Request UI window and then will
+  close it automatically. (If a payment sheet stays open, the test has failed.)
+</p>
+<ol>
+  <li>
+    <button onclick="testShowSameRequestMultipleTimes()">
+      The same request cannot be shown multiple times.
+    </button>
+  </li>
+  <li>
+    <button onclick="testAbortBeforeShow()">
+      Aborting a request before it is shown doesn't prevent it from being shown
+      later.
+    </button>
+  </li>
+  <li><button onclick="done()">Done!</button></li>
+</ol>
+<small>
+  If you find a buggy test, please <a href="https://github.com/web-platform-tests/wpt/issues">file a bug</a>
+  and tag one of the <a href="https://github.com/web-platform-tests/wpt/blob/master/payment-request/META.yml">suggested reviewers</a>.
+</small>
diff --git a/testing/web-platform/tests/payment-request/payment-request-abort-method.https.html b/testing/web-platform/tests/payment-request/payment-request-abort-method.https.html
index a8a013165ee2..cf16401d0b0d 100644
--- a/testing/web-platform/tests/payment-request/payment-request-abort-method.https.html
+++ b/testing/web-platform/tests/payment-request/payment-request-abort-method.https.html
@@ -47,46 +47,6 @@ promise_test(async t => {
   const promises = new Set([request.abort(), request.abort(), request.abort()]);
   assert_equals(promises.size, 3, "Must have three unique objects");
 }, "Calling abort() multiple times is always a new object.");
-
-promise_test(async t => {
-  const request = new PaymentRequest(defaultMethods, defaultDetails);
-  const [abortPromise, acceptPromise] = await test_driver.bless(
-    "show payment request",
-    () => {
-      const acceptPromise = request.show()
-      acceptPromise.catch(() => {}); // no-op, just to silence unhandled rejection in devtools.
-      const abortPromise = request.abort();
-      return [abortPromise, acceptPromise];
-    });
-
-  await abortPromise;
-  await promise_rejects(t, "AbortError", acceptPromise);
-  // As request is now "closed", trying to show it will fail
-  await promise_rejects(t, "InvalidStateError", request.show());
-}, "The same request cannot be shown multiple times.");
-
-promise_test(async t => {
-  // request is in "created" state.
-  const request = new PaymentRequest(defaultMethods, defaultDetails);
-  await promise_rejects(t, "InvalidStateError", request.abort());
-  // Call it again, for good measure.
-  await promise_rejects(t, "InvalidStateError", request.abort());
-  // The request's state is "created", so let's show it
-  // which changes the state to "interactive.".
-  const [abortPromise, acceptPromise] = await test_driver.bless(
-    "show payment request",
-    () => {
-      const acceptPromise = request.show()
-      // Let's set request the state to "closed" by calling .abort()
-      const abortPromise = request.abort();
-      return [abortPromise, acceptPromise];
-    });
-
-  await abortPromise;
-  // The request is now "closed", so...
-  await promise_rejects(t, "InvalidStateError", request.abort());
-  await promise_rejects(t, "AbortError", acceptPromise);
-}, "Aborting a request before it is shown doesn't prevent it from being shown later.");
 </script>
 <small>
   If you find a buggy test, please <a href="https://github.com/web-platform-tests/wpt/issues">file a bug</a>
diff --git a/testing/web-platform/tests/payment-request/payment-request-canmakepayment-method-manual.https.html b/testing/web-platform/tests/payment-request/payment-request-canmakepayment-method-manual.https.html
new file mode 100644
index 000000000000..fea45500b18b
--- /dev/null
+++ b/testing/web-platform/tests/payment-request/payment-request-canmakepayment-method-manual.https.html
@@ -0,0 +1,105 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Manual tests for PaymentRequest.canMakePayment() method</title>
+<link rel="help" href="https://w3c.github.io/payment-request/#canmakepayment-method">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+setup({
+  explicit_done: true,
+  explicit_timeout: true,
+});
+
+const basicCard = Object.freeze({ supportedMethods: "basic-card" });
+const applePay = Object.freeze({
+  supportedMethods: "https://apple.com/apple-pay",
+  data: {
+    version: 3,
+    merchantIdentifier: "merchant.com.example",
+    countryCode: "US",
+    merchantCapabilities: ["supports3DS"],
+    supportedNetworks: ["visa"],
+  }
+});
+const defaultMethods = Object.freeze([basicCard, applePay]);
+const defaultDetails = Object.freeze({
+  total: {
+    label: "Total",
+    amount: {
+      currency: "USD",
+      value: "1.00",
+    },
+  },
+});
+
+function testInteractiveState() {
+  promise_test(async t => {
+    const request = new PaymentRequest(defaultMethods, defaultDetails);
+    const acceptPromise = request.show(); // Sets state to "interactive"
+    const canMakePaymentPromise = request.canMakePayment();
+    try {
+      const result = await canMakePaymentPromise;
+      assert_true(
+        false,
+        `canMakePaymentPromise should have thrown InvalidStateError`
+      );
+    } catch (err) {
+      await promise_rejects(t, "InvalidStateError", canMakePaymentPromise);
+    } finally {
+      await request.abort();
+      await promise_rejects(t, "AbortError", acceptPromise);
+    }
+    // The state should be "closed"
+    await promise_rejects(t, "InvalidStateError", request.canMakePayment());
+  }, 'If request.[[state]] is "interactive", then return a promise rejected with an "InvalidStateError" DOMException.');
+}
+
+function testClosedState() {
+  promise_test(async t => {
+    const request = new PaymentRequest(defaultMethods, defaultDetails);
+    const acceptPromise = request.show(); // Sets state to "interactive"
+    acceptPromise.catch(() => {}); // no-op, just to silence unhandled rejection in devtools.
+    await request.abort(); // The state is now "closed"
+    await promise_rejects(t, "InvalidStateError", request.canMakePayment());
+    try {
+      const result = await request.canMakePayment();
+      assert_true(
+        false,
+        `should have thrown InvalidStateError, but instead returned "${result}"`
+      );
+    } catch (err) {
+      assert_equals(
+        err.name,
+        "InvalidStateError",
+        "must be an InvalidStateError."
+      );
+    }
+  }, 'If request.[[state]] is "closed", then return a promise rejected with an "InvalidStateError" DOMException.');
+}
+</script>
+
+<h2>Manual tests for PaymentRequest.canMakePayment() method</h2>
+<p>
+  Click on each button in sequence from top to bottom without refreshing the
+  page. Each button will bring up the Payment Request UI window and then will
+  close it automatically. (If a payment sheet stays open, the test has failed.)
+</p>
+<ol>
+  <li>
+    <button onclick="testInteractiveState()">
+      If request.[[state]] is "interactive", then return a promise rejected with
+      an "InvalidStateError" DOMException.
+    </button>
+  </li>
+  <li>
+    <button onclick="testClosedState()">
+      If request.[[state]] is "closed", then return a promise rejected with an
+      "InvalidStateError" DOMException.
+    </button>
+  </li>
+  <li><button onclick="done()">Done!</button></li>
+</ol>
+<small>
+  If you find a buggy test, please <a href="https://github.com/web-platform-tests/wpt/issues">file a bug</a>
+  and tag one of the <a href="https://github.com/web-platform-tests/wpt/blob/master/payment-request/META.yml">suggested reviewers</a>.
+</small>
diff --git a/testing/web-platform/tests/payment-request/payment-request-canmakepayment-method.https.html b/testing/web-platform/tests/payment-request/payment-request-canmakepayment-method.https.html
index 5627f337488b..cc8349a42239 100644
--- a/testing/web-platform/tests/payment-request/payment-request-canmakepayment-method.https.html
+++ b/testing/web-platform/tests/payment-request/payment-request-canmakepayment-method.https.html
@@ -7,7 +7,6 @@
 <script src="/resources/testdriver.js"></script>
 <script src='/resources/testdriver-vendor.js'></script>
 <script>
-"use strict";
 const basicCard = Object.freeze({ supportedMethods: "basic-card" });
 const applePay = Object.freeze({
   supportedMethods: "https://apple.com/apple-pay",
@@ -78,40 +77,6 @@ promise_test(async t => {
   ).canMakePayment();
   assert_true(await someSupported, `At least one method is expected to be supported.`);
 }, `Mix of supported and unsupported methods, at least one method is supported.`);
-
-promise_test(async t => {
-  const request = new PaymentRequest(defaultMethods, defaultDetails);
-  const [acceptPromise, canMakePaymentPromise] = await test_driver.bless(
-    "show payment request",
-    () => {
-      const acceptPromise = request.show(); // Sets state to "interactive"
-      const canMakePaymentPromise = request.canMakePayment();
-      return [acceptPromise, canMakePaymentPromise];
-    });
-
-  await promise_rejects(t, "InvalidStateError", canMakePaymentPromise);
-  request.abort();
-  await promise_rejects(t, "AbortError", acceptPromise);
-
-  // The state should be "closed"
-  await promise_rejects(t, "InvalidStateError", request.canMakePayment());
-}, 'If request.[[state]] is "interactive", then return a promise rejected with an "InvalidStateError" DOMException.');
-
-promise_test(async t => {
-  const request = new PaymentRequest(defaultMethods, defaultDetails);
-  const [abortPromise, acceptPromise] = await test_driver.bless(
-    "show payment request",
-    () => {
-      const acceptPromise = request.show(); // Sets state to "interactive"
-      acceptPromise.catch(() => {}); // no-op, just to silence unhandled rejection in devtools.
-      const abortPromise = request.abort();  // Sets state to "closed"
-      return [abortPromise, acceptPromise];
-    });
-
-  await abortPromise;
-  await promise_rejects(t, "AbortError", acceptPromise);
-  await promise_rejects(t, "InvalidStateError", request.canMakePayment());
-}, 'If request.[[state]] is "closed", then return a promise rejected with an "InvalidStateError" DOMException.');
 </script>
 
 <small>
diff --git a/testing/web-platform/tests/payment-request/payment-request-hasenrolledinstrument-method-manual.https.html b/testing/web-platform/tests/payment-request/payment-request-hasenrolledinstrument-method-manual.https.html
index e6b164f7cc7b..a4e8028c07f5 100644
--- a/testing/web-platform/tests/payment-request/payment-request-hasenrolledinstrument-method-manual.https.html
+++ b/testing/web-platform/tests/payment-request/payment-request-hasenrolledinstrument-method-manual.https.html
@@ -57,6 +57,45 @@ function testHasEnrolledInstrumentAgain() {
     );
   }, `hasEnrolledInstrument() can be called multiple times if the payment method details are identical.`);
 }
+
+function testInteractiveState() {
+  promise_test(async t => {
+    const request = new PaymentRequest(defaultMethods, defaultDetails);
+    const acceptPromise = request.show();  // Sets state to "interactive"
+    const hasEnrolledInstrumentPromise = request.hasEnrolledInstrument();
+    try {
+      const result = await hasEnrolledInstrumentPromise;
+      assert_true(
+        false,
+        "hasEnrolledInstrument() should have thrown InvalidStateError"
+      );
+    } catch(err) {
+      await promise_rejects(t, "InvalidStateError", hasEnrolledInstrumentPromise);
+    } finally {
+      request.abort();
+      await promise_rejects(t, "AbortError", acceptPromise);
+    }
+  }, `If request.[[state]] is "interactive", then return a promise rejected with an "InvalidStateError" DOMException.`);
+}
+
+function testClosedState() {
+  promise_test(async t => {
+    const request = new PaymentRequest(defaultMethods, defaultDetails);
+    const acceptPromise = request.show();  // Sets state to "interactive"
+    acceptPromise.catch(() => {});  // no-op, just to handle unhandled rejection in devtools.
+    await request.abort();  // Sets state to "closed"
+    const hasEnrolledInstrumentPromise = request.hasEnrolledInstrument();
+    try {
+      const result = await hasEnrolledInstrumentPromise;
+      assert_true(
+        false,
+        "hasEnrolledInstrument() should have thrown InvalidStateError"
+      );
+    } catch(err) {
+      await promise_rejects(t, "InvalidStateError", hasEnrolledInstrumentPromise);
+    }
+  }, `If request.[[state]] is "closed", then return a promise rejected with an "InvalidStateError" DOMException.`);
+}
 </script>
 
 <h2>Manual tests for hasEnrolledInstrument() method</h2>
@@ -85,6 +124,18 @@ function testHasEnrolledInstrumentAgain() {
       details are identical.
     </button>
   </li>
+  <li>
+    <button onclick="testInteractiveState()">
+      If request.[[state]] is "interactive", then return a promise rejected with
+      an "InvalidStateError" DOMException.
+    </button>
+  </li>
+  <li>
+    <button onclick="testClosedState()">
+      If request.[[state]] is "closed", then return a promise rejected with an
+      "InvalidStateError" DOMException.
+    </button>
+  </li>
   <li>
     <button onclick="done()">Done!</button>
   </li>
diff --git a/testing/web-platform/tests/payment-request/payment-request-hasenrolledinstrument-method.https.html b/testing/web-platform/tests/payment-request/payment-request-hasenrolledinstrument-method.https.html
index c1f7b27a22b4..c5139950d53e 100644
--- a/testing/web-platform/tests/payment-request/payment-request-hasenrolledinstrument-method.https.html
+++ b/testing/web-platform/tests/payment-request/payment-request-hasenrolledinstrument-method.https.html
@@ -7,19 +7,10 @@
 <script src="/resources/testdriver.js"></script>
 <script src='/resources/testdriver-vendor.js'></script>
 <script>
-"use strict";
 const unsupportedMethods = [
   { supportedMethods: "this-is-not-supported" },
   { supportedMethods: "https://not.supported" },
 ];
-const defaultMethods = Object.freeze([
-  {
-    supportedMethods: "basic-card",
-    data: {
-      supportedNetworks: [ 'visa' ],
-    },
-  }
-]);
 const defaultDetails = Object.freeze({
   total: {
     label: "Total",
@@ -34,39 +25,9 @@ promise_test(async t => {
   const request = new PaymentRequest(unsupportedMethods, defaultDetails);
   assert_false(
     await request.hasEnrolledInstrument(),
-    "hasEnrolledInstrument() should resolve to false."
+    "Payment method is supported."
   );
 }, `hasEnrolledInstrument() resolves to false for unsupported payment methods.`);
-
-promise_test(async t => {
-  const request = new PaymentRequest(defaultMethods, defaultDetails);
-  const [acceptPromise, hasEnrolledInstrumentPromise] = await test_driver.bless(
-      "show payment request",
-      () => {
-        const acceptPromise = request.show();  // Sets state to "interactive"
-        const hasEnrolledInstrumentPromise = request.hasEnrolledInstrument();
-        return [acceptPromise, hasEnrolledInstrumentPromise];
-      });
-  await promise_rejects(t, "InvalidStateError", hasEnrolledInstrumentPromise);
-
-  await request.abort();
-  await promise_rejects(t, "AbortError", acceptPromise);
-}, `If request.[[state]] is "interactive", then return a promise rejected with an "InvalidStateError" DOMException.`);
-
-promise_test(async t => {
-  const request = new PaymentRequest(defaultMethods, defaultDetails);
-  const [abortPromise, acceptPromise] = await test_driver.bless( "show payment request", () => {
-    const acceptPromise = request.show();  // Sets state to "interactive"
-    acceptPromise.catch(() => {});  // no-op, just to handle unhandled rejection in devtools.
-    const abortPromise =request.abort();  // Sets state to "closed"
-    return [abortPromise, acceptPromise];
-  });
-  await abortPromise;
-  await promise_rejects(t, "AbortError", acceptPromise);
-
-  const hasEnrolledInstrumentPromise = request.hasEnrolledInstrument();
-  await promise_rejects(t, "InvalidStateError", hasEnrolledInstrumentPromise);
-}, `If request.[[state]] is "closed", then return a promise rejected with an "InvalidStateError" DOMException.`);
 </script>
 
 <small>
diff --git a/testing/web-platform/tests/payment-request/payment-request-multiple-show-manual.https.html b/testing/web-platform/tests/payment-request/payment-request-multiple-show-manual.https.html
new file mode 100644
index 000000000000..cc412171a6d7
--- /dev/null
+++ b/testing/web-platform/tests/payment-request/payment-request-multiple-show-manual.https.html
@@ -0,0 +1,66 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Manual test for multiple PaymentRequest.show()</title>
+<link rel="help" href="https://w3c.github.io/payment-request/#show-method">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+"use strict";
+setup({
+  allow_uncaught_exception: true,
+});
+const defaultMethods = Object.freeze([
+  { supportedMethods: "basic-card" },
+  {
+    supportedMethods: "https://apple.com/apple-pay",
+    data: {
+      version: 3,
+      merchantIdentifier: "merchant.com.example",
+      countryCode: "US",
+      merchantCapabilities: ["supports3DS"],
+      supportedNetworks: ["visa"],
+    }
+  },
+]);
+
+const defaultDetails = Object.freeze({
+  total: {
+    label: "Total",
+    amount: {
+      currency: "USD",
+      value: "1.00",
+    },
+  },
+});
+
+function testCallingShowMultipleTimes() {
+  promise_test(async t => {
+    const request = new PaymentRequest(defaultMethods, defaultDetails);
+    const p1 = request.show();
+    const p2 = request.show();
+    const p3 = request.show();
+    const promises = new Set([p1, p2, p3]);
+    await request.abort();
+    assert_equals(promises.size, 3, "Must have three unique objects");
+    await promise_rejects(t, "AbortError", p1);
+    await promise_rejects(t, "InvalidStateError", p2);
+    await promise_rejects(t, "InvalidStateError", p3);
+  }, "Calling show() multiple times is always a new object.");
+}
+</script>
+<h2>Manual test for multiple PaymentRequest.show()</h2>
+<p>
+  Click on the button to bring up the Payment Request UI window and then will
+  close it automatically. (If a payment sheet stays open, the test has failed.)
+</p>
+<ul>
+  <li>
+    <button onclick="testCallingShowMultipleTimes()">
+      Calling show() multiple times is always a new object.
+    </button>
+  </li>
+</ul>
+<small>
+  If you find a buggy test, please <a href="https://github.com/web-platform-tests/wpt/issues">file a bug</a>
+  and tag one of the <a href="https://github.com/web-platform-tests/wpt/blob/master/payment-request/META.yml">suggested reviewers</a>.
+</small>
diff --git a/testing/web-platform/tests/payment-request/payment-request-show-method-manual.https.html b/testing/web-platform/tests/payment-request/payment-request-show-method-manual.https.html
new file mode 100644
index 000000000000..6ef98e85a609
--- /dev/null
+++ b/testing/web-platform/tests/payment-request/payment-request-show-method-manual.https.html
@@ -0,0 +1,97 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Manual tests for PaymentRequest.show() method</title>
+<link rel="help" href="https://w3c.github.io/payment-request/#show-method">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+"use strict";
+setup({
+  explicit_done: true,
+  explicit_timeout: true,
+});
+const defaultMethods = Object.freeze([
+  { supportedMethods: "basic-card" },
+  {
+    supportedMethods: "https://apple.com/apple-pay",
+    data: {
+      version: 3,
+      merchantIdentifier: "merchant.com.example",
+      countryCode: "US",
+      merchantCapabilities: ["supports3DS"],
+      supportedNetworks: ["visa"],
+    }
+  },
+]);
+
+const defaultDetails = Object.freeze({
+  total: {
+    label: "Total",
+    amount: {
+      currency: "USD",
+      value: "1.00",
+    },
+  },
+});
+
+function testThrowsIfStateIsNotCreated() {
+  promise_test(async t => {
+    const request = new PaymentRequest(defaultMethods, defaultDetails);
+    const acceptPromise = request.show(); // Sets state to "interactive"
+    await promise_rejects(t, "InvalidStateError", request.show());
+    await request.abort();
+    await promise_rejects(t, "AbortError", acceptPromise);
+  }, "Throws if the promise [[state]] is not 'created'.");
+}
+
+function testPaymentRequestIsShowingBoolean() {
+  promise_test(async t => {
+    const request1 = new PaymentRequest(defaultMethods, defaultDetails);
+    const request2 = new PaymentRequest(defaultMethods, defaultDetails);
+    const acceptPromise1 = request1.show();
+    const acceptPromise2 = request2.show();
+    await promise_rejects(t, "AbortError", acceptPromise2);
+    await request1.abort();
+    await promise_rejects(t, "AbortError", acceptPromise1);
+  }, `If the user agent's "payment request is showing" boolean is true, then return a promise rejected with an "AbortError" DOMException.`);
+}
+
+function testNotSupportedError() {
+  promise_test(async t => {
+    const request = new PaymentRequest(
+      [{ supportedMethods: "this-is-not-supported" }],
+      defaultDetails
+    );
+    const acceptPromise = request.show();
+    await promise_rejects(t, "NotSupportedError", acceptPromise);
+  }, `If payment method consultation produces no supported method of payment, then return a promise rejected with a "NotSupportedError" DOMException.`);
+}
+</script>
+<h2>Manual tests for PaymentRequest.show() method</h2>
+<p>
+  Click on each button in sequence from top to bottom without refreshing the
+  page. Each button will bring up the Payment Request UI window and then will
+  close it automatically. (If a payment sheet stays open, the test has failed.)
+</p>
+<ol>
+  <li>
+    <button onclick="testThrowsIfStateIsNotCreated()">
+      Throws if the promise [[state]] is not 'created'.
+    </button>
+  </li>
+  <li>
+    <button onclick="testPaymentRequestIsShowingBoolean()">
+      If the user agent's "payment request is showing" boolean is true, then return a promise rejected with an "AbortError" DOMException.
+    </button>
+  </li>
+  <li>
+    <button onclick="testNotSupportedError()">
+      If payment method consultation produces no supported method of payment, then return a promise rejected with a "NotSupportedError" DOMException.
+    </button>
+  </li>
+  <li><button onclick="done()">Done!</button></li>
+</ol>
+<small>
+  If you find a buggy test, please <a href="https://github.com/web-platform-tests/wpt/issues">file a bug</a>
+  and tag one of the <a href="https://github.com/web-platform-tests/wpt/blob/master/payment-request/META.yml">suggested reviewers</a>.
+</small>
diff --git a/testing/web-platform/tests/payment-request/payment-request-show-method.https.html b/testing/web-platform/tests/payment-request/payment-request-show-method.https.html
index cc8c881d1147..dd04987092b4 100644
--- a/testing/web-platform/tests/payment-request/payment-request-show-method.https.html
+++ b/testing/web-platform/tests/payment-request/payment-request-show-method.https.html
@@ -4,8 +4,6 @@
 <link rel="help" href="https://w3c.github.io/payment-request/#show-method">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/resources/testdriver.js"></script>
-<script src="/resources/testdriver-vendor.js"></script>
 <script>
 "use strict";
 const defaultMethods = Object.freeze([
@@ -35,80 +33,8 @@ const defaultDetails = Object.freeze({
 promise_test(async t => {
   const request = new PaymentRequest(defaultMethods, defaultDetails);
   const acceptPromise = request.show();
-  // Abort the request after 2 seconds if it has not rejected. This allows the
-  // other tests in this file to run even if a non-compliant browser shows the
-  // payment sheet without user activation.
-  t.step_timeout(() => {
-    t.force_timeout();
-    request.abort();
-  }, 2000);
-
   await promise_rejects(t, "SecurityError", acceptPromise);
 }, `Calling show() without being triggered by user interaction throws`);
-
-promise_test(async t => {
-  const request = new PaymentRequest(defaultMethods, defaultDetails);
-  const [acceptPromise] = await test_driver.bless(
-    "test: throws if the promise [[state]] is not 'created'",
-    () => {
-      const acceptPromise = request.show(); // Sets state to "interactive"
-      return [acceptPromise];
-    });
-  await promise_rejects(t, "InvalidStateError", request.show());
-  await request.abort();
-  await promise_rejects(t, "AbortError", acceptPromise);
-}, "Throws if the promise [[state]] is not 'created'.");
-
-promise_test(async t => {
-  const request1 = new PaymentRequest(defaultMethods, defaultDetails);
-  const request2 = new PaymentRequest(defaultMethods, defaultDetails);
-  const [acceptPromise1] = await test_driver.bless(
-    `test: reject promise with "AbortedError" if payment request is already showing`,
-    async () => {
-      const acceptPromise1 = request1.show();
-      const acceptPromise2 = request2.show();
-      await promise_rejects(t, "AbortError", acceptPromise2);
-      return [acceptPromise1];
-    });
-
-  await request1.abort();
-  await promise_rejects(t, "AbortError", acceptPromise1);
-}, `If the user agent's "payment request is showing" boolean is true, then return a promise rejected with an "AbortError" DOMException.`);
-
-promise_test(async t => {
-  const request = new PaymentRequest(
-    [{ supportedMethods: "this-is-not-supported" }],
-    defaultDetails
-  );
-  const [acceptPromise] = await test_driver.bless(
-    `test: reject promise with "NotSupportedError"`,
-    () => {
-      const acceptPromise = request.show();
-      return [acceptPromise];
-    });
-  await promise_rejects(t, "NotSupportedError", acceptPromise);
-}, `If payment method consultation produces no supported method of payment, then return a promise rejected with a "NotSupportedError" DOMException.`);
-
-promise_test(async t => {
-  const request = new PaymentRequest(defaultMethods, defaultDetails);
-  const [p1, p2, p3] = await test_driver.bless(
-    `test: calling show() multiple times always returns a new promise`,
-    () => {
-      const p1 = request.show();
-      const p2 = request.show();
-      const p3 = request.show();
-      return [p1, p2, p3];
-    });
-  const promises = new Set([p1, p2, p3]);
-  assert_equals(promises.size, 3, "Must have three unique objects");
-
-  await promise_rejects(t, "InvalidStateError", p2);
-  await promise_rejects(t, "InvalidStateError", p3);
-
-  await request.abort();
-  await promise_rejects(t, "AbortError", p1);
-}, "Calling show() multiple times always returns a new promise.");
-
 </script>
 <small>
   If you find a buggy test, please <a href="https://github.com/web-platform-tests/wpt/issues">file a bug</a>
diff --git a/testing/web-platform/tests/payment-request/rejects_if_not_active.https.html b/testing/web-platform/tests/payment-request/rejects_if_not_active.https.html
index 3c7e85ba970f..06c1f7383a04 100644
--- a/testing/web-platform/tests/payment-request/rejects_if_not_active.https.html
+++ b/testing/web-platform/tests/payment-request/rejects_if_not_active.https.html
@@ -1,11 +1,12 @@
 <!DOCTYPE html>
 <meta charset=utf-8>
+<link rel="help" href="https://w3c.github.io/payment-request/#show()-method">
 <title>PaymentRequest show() rejects if doc is not fully active</title>
-<link rel="help" href="https://w3c.github.io/payment-request/#show-method">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/resources/testdriver.js"></script>
 <script src="/resources/testdriver-vendor.js"></script>
+<link rel="help" href="https://w3c.github.io/payment-request/#dom-paymentrequest-show()">
 <body>
 <script>
 const applePay = Object.freeze({
@@ -49,6 +50,94 @@ function getLoadedPaymentRequest(iframe, url) {
   });
 }
 
+promise_test(async t => {
+  const iframe = document.createElement("iframe");
+  iframe.allowPaymentRequest = true;
+  document.body.appendChild(iframe);
+  // We first got to page1.html, grab a PaymentRequest instance.
+  const request1 = await getLoadedPaymentRequest(
+    iframe,
+    "/payment-request/resources/page1.html"
+  );
+  // We navigate the iframe again, putting request1's document into an inactive state.
+  const request2 = await getLoadedPaymentRequest(
+    iframe,
+    "/payment-request/resources/page2.html"
+  );
+  await test_driver.bless("show payment request", async () => {
+    // Now, request1's relevant global object's document is no longer active.
+    // So, call .show(), and make sure it rejects appropriately.
+    await promise_rejects(
+      t,
+      "AbortError",
+      request1.show(),
+      "Inactive document, so must throw AbortError"
+    );
+  });
+  await test_driver.bless("show payment request", async () => {
+    // request2 has an active document tho, so confirm it's working as expected:
+    request2.show();
+    await request2.abort();
+    await promise_rejects(
+      t,
+      "InvalidStateError",
+      request2.show(),
+      "Abort already called, so InvalidStateError"
+    );
+    // We are done, so clean up.
+    iframe.remove();
+  });
+}, "PaymentRequest.show() aborts if the document is not active");
+
+promise_test(async t => {
+  // We nest two iframes and wait for them to load.
+  const outerIframe = document.createElement("iframe");
+  outerIframe.allowPaymentRequest = true;
+  document.body.appendChild(outerIframe);
+  // Load the outer iframe (we don't care about the awaited request)
+  await getLoadedPaymentRequest(
+    outerIframe,
+    "/payment-request/resources/page1.html"
+  );
+
+  // Now we create the inner iframe
+  const innerIframe = outerIframe.contentDocument.createElement("iframe");
+  innerIframe.allowPaymentRequest = true;
+
+  // nest them
+  outerIframe.contentDocument.body.appendChild(innerIframe);
+
+  // load innerIframe, and get the PaymentRequest instance
+  const request = await getLoadedPaymentRequest(
+    innerIframe,
+    "/payment-request/resources/page2.html"
+  );
+
+  // Navigate the outer iframe to a new location.
+  // Wait for the load event to fire.
+  await new Promise(resolve => {
+    outerIframe.addEventListener("load", resolve);
+    outerIframe.src = "/payment-request/resources/page2.html";
+  });
+
+  const showPromise = await test_driver.bless("show payment request", () => {
+    return request.show();
+  });
+  // Now, request's relevant global object's document is still active
+  // (it is the active document of the inner iframe), but is not fully active
+  // (since the parent of the inner iframe is itself no longer active).
+  // So, call request.show() and make sure it rejects appropriately.
+  await promise_rejects(
+    t,
+    "AbortError",
+    showPromise,
+    "Active, but not fully active, so must throw AbortError"
+  );
+  // We are done, so clean up.
+
+  iframe.remove();
+}, "PaymentRequest.show() aborts if the document is active, but not fully active");
+
 promise_test(async t => {
   const iframe = document.createElement("iframe");
   iframe.allowPaymentRequest = true;
diff --git a/testing/web-platform/tests/payment-request/rejects_if_not_active_manual.https.html b/testing/web-platform/tests/payment-request/rejects_if_not_active_manual.https.html
deleted file mode 100644
index f1d2fb83e0e0..000000000000
--- a/testing/web-platform/tests/payment-request/rejects_if_not_active_manual.https.html
+++ /dev/null
@@ -1,164 +0,0 @@
-<!DOCTYPE html>
-<meta charset=utf-8>
-<title>PaymentRequest show() rejects if doc is not fully active</title>
-<link rel="help" href="https://w3c.github.io/payment-request/#show-method">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<body>
-<script>
-setup({
-  explicit_done: true,
-  explicit_timeout: true,
-});
-
-const applePay = Object.freeze({
-  supportedMethods: "https://apple.com/apple-pay",
-  data: {
-    version: 3,
-    merchantIdentifier: "merchant.com.example",
-    countryCode: "US",
-    merchantCapabilities: ["supports3DS"],
-    supportedNetworks: ["visa"],
-  }
-});
-const validMethod = Object.freeze({
-  supportedMethods: "basic-card",
-});
-const validMethods = Object.freeze([validMethod, applePay]);
-
-const validDetails = Object.freeze({
-  total: {
-    label: "Total due",
-      amount: {
-      currency: "USD",
-      value: "5.00",
-    },
-  },
-});
-
-function getLoadedPaymentRequest(iframe, url) {
-  return new Promise(resolve => {
-    iframe.addEventListener(
-      "load",
-      () => {
-        const { PaymentRequest } = iframe.contentWindow;
-        const request = new PaymentRequest(validMethods, validDetails);
-        resolve(request);
-      },
-      { once: true }
-    );
-    iframe.src = url;
-  });
-}
-
-function testAbortShowIfDocumentIsNotActive() {
-  promise_test(async t => {
-    const iframe = document.createElement("iframe");
-    iframe.allowPaymentRequest = true;
-    document.body.appendChild(iframe);
-    // We first got to page1.html, grab a PaymentRequest instance.
-    const request1 = await getLoadedPaymentRequest(
-      iframe,
-      "/payment-request/resources/page1.html"
-    );
-    // We navigate the iframe again, putting request1's document into an inactive state.
-    const request2 = await getLoadedPaymentRequest(
-      iframe,
-      "/payment-request/resources/page2.html"
-    );
-    // Now, request1's relevant global object's document is no longer active.
-    // So, call .show(), and make sure it rejects appropriately.
-    await promise_rejects(
-      t,
-      "AbortError",
-      request1.show(),
-      "Inactive document, so must throw AbortError"
-    );
-    // request2 has an active document tho, so confirm it's working as expected:
-    request2.show();
-    await request2.abort();
-    await promise_rejects(
-      t,
-      "InvalidStateError",
-      request2.show(),
-      "Abort already called, so InvalidStateError"
-    );
-    // We are done, so clean up.
-    iframe.remove();
-  }, "PaymentRequest.show() aborts if the document is not active.");
-}
-
-function testAbortShowIfDocumentIsNotFullyActive() {
-  promise_test(async t => {
-    // We nest two iframes and wait for them to load.
-    const outerIframe = document.createElement("iframe");
-    outerIframe.allowPaymentRequest = true;
-    document.body.appendChild(outerIframe);
-    // Load the outer iframe (we don't care about the awaited request)
-    await getLoadedPaymentRequest(
-      outerIframe,
-      "/payment-request/resources/page1.html"
-    );
-
-    // Now we create the inner iframe
-    const innerIframe = outerIframe.contentDocument.createElement("iframe");
-    innerIframe.allowPaymentRequest = true;
-
-    // nest them
-    outerIframe.contentDocument.body.appendChild(innerIframe);
-
-    // load innerIframe, and get the PaymentRequest instance
-    const request = await getLoadedPaymentRequest(
-      innerIframe,
-      "/payment-request/resources/page2.html"
-    );
-
-    // Navigate the outer iframe to a new location.
-    // Wait for the load event to fire.
-    await new Promise(resolve => {
-      outerIframe.addEventListener("load", resolve);
-      outerIframe.src = "/payment-request/resources/page2.html";
-    });
-
-    const showPromise = request.show();
-    // Now, request's relevant global object's document is still active
-    // (it is the active document of the inner iframe), but is not fully active
-    // (since the parent of the inner iframe is itself no longer active).
-    // So, call request.show() and make sure it rejects appropriately.
-    await promise_rejects(
-      t,
-      "AbortError",
-      showPromise,
-      "Active, but not fully active, so must throw AbortError"
-    );
-    // We are done, so clean up.
-
-    outerIframe.remove();
-  }, "PaymentRequest.show() aborts if the document is active, but not fully active.");
-}
-</script>
-
-<h2>PaymentRequest show() rejects if doc is not fully active</h2>
-<p>
-  Click on each button in sequence from top to bottom without refreshing the
-  page. Each button will bring up the Payment Request UI window and then will
-  close it automatically. (If a payment sheet stays open, the test has failed.)
-</p>
-<ol>
-  <li>
-    <button onclick="testAbortShowIfDocumentIsNotActive()">
-      PaymentRequest.show() aborts if the document is not active.
-    </button>
-  </li>
-  <li>
-    <button onclick="testAbortShowIfDocumentIsNotFullyActive()">
-      PaymentRequest.show() aborts if the document is active, but not fully
-      active.
-    </button>
-  </li>
-  <li><button onclick="done()">Done!</button></li>
-</ol>
-<small>
-  If you find a buggy test, please <a href="https://github.com/web-platform-tests/wpt/issues">file a bug</a>
-  and tag one of the <a href="https://github.com/web-platform-tests/wpt/blob/master/payment-request/META.yml">suggested reviewers</a>.
-</small>
diff --git a/testing/web-platform/tests/picture-in-picture/disable-picture-in-picture.html b/testing/web-platform/tests/picture-in-picture/disable-picture-in-picture.html
index 5075c011632e..31e0d12ad770 100644
--- a/testing/web-platform/tests/picture-in-picture/disable-picture-in-picture.html
+++ b/testing/web-platform/tests/picture-in-picture/disable-picture-in-picture.html
@@ -47,9 +47,7 @@ promise_test(async t => {
   return requestPictureInPictureWithTrustedClick(video)
   .then(() => {
     video.disablePictureInPicture = true;
-    video.addEventListener('leavepictureinpicture', t.step_func(() => {
-      assert_equals(document.pictureInPictureElement, null);
-    }));
+    assert_equals(document.pictureInPictureElement, null);
   });
 }, 'pictureInPictureElement is unset if disablePictureInPicture becomes true');
 
diff --git a/testing/web-platform/tests/quirks/historical/reference/vertical-align-in-quirks-ref.html b/testing/web-platform/tests/quirks/historical/reference/vertical-align-in-quirks-ref.html
deleted file mode 100644
index 7bef76515011..000000000000
--- a/testing/web-platform/tests/quirks/historical/reference/vertical-align-in-quirks-ref.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<!DOCTYPE html>
-<style>
-div {
-  font-size: 10px;
-  line-height: 50px;
-  border: 1px solid blue;
-}
-img {
-  width: 1em;
-  height: 2em;
-  background: orange;
-  border: 1px solid black;
-}
-.text-top {
-  vertical-align: text-top;
-}
-.text-bottom {
-  vertical-align: text-bottom;
-}
-.top {
-  vertical-align: top;
-}
-.bottom {
-  vertical-align: bottom;
-}
-</style>
-<body>
-  <div>
-    <img class="text-top" src="/css/support/60x60-red.png">Y
-  </div>
-  <div>
-    <img class="text-bottom" src="/css/support/60x60-red.png">Y
-  </div>
-  <div>
-    <img class="top" src="/css/support/60x60-red.png">Y
-  </div>
-  <div>
-    <img class="bottom" src="/css/support/60x60-red.png">Y
-  </div>
-  <div>
-    <img class="text-top" src="/css/support/60x60-red.png"><span>Y</span>
-  </div>
-  <div>
-    <img class="text-bottom" src="/css/support/60x60-red.png"><span>Y</span>
-  </div>
-  <div>
-    <img class="top" src="/css/support/60x60-red.png"><span>Y</span>
-  </div>
-  <div>
-    <img class="bottom" src="/css/support/60x60-red.png"><span>Y</span>
-  </div>
-</body>
diff --git a/testing/web-platform/tests/quirks/reference/vertical-align-in-quirks-ref.html b/testing/web-platform/tests/quirks/reference/vertical-align-in-quirks-ref.html
new file mode 100644
index 000000000000..2395923cd2c5
--- /dev/null
+++ b/testing/web-platform/tests/quirks/reference/vertical-align-in-quirks-ref.html
@@ -0,0 +1,52 @@
+<!DOCTYPE html>
+<style>
+div {
+  font-size: 10px;
+  line-height: 50px;
+  border: 1px solid blue;
+}
+img {
+  width: 1em;
+  height: 2em;
+  background: orange;
+  border: 1px solid black;
+}
+.text-top {
+  vertical-align: text-top;
+}
+.text-bottom {
+  vertical-align: text-bottom;
+}
+.top {
+  vertical-align: top;
+}
+.bottom {
+  vertical-align: bottom;
+}
+</style>
+<body>
+  <div>
+    <img class="text-top" src="../../css/support/60x60-red.png">Y
+  </div>
+  <div>
+    <img class="text-bottom" src="../../css/support/60x60-red.png">Y
+  </div>
+  <div>
+    <img class="top" src="../../css/support/60x60-red.png">Y
+  </div>
+  <div>
+    <img class="bottom" src="../../css/support/60x60-red.png">Y
+  </div>
+  <div>
+    <img class="text-top" src="../../css/support/60x60-red.png"><span>Y</span>
+  </div>
+  <div>
+    <img class="text-bottom" src="../../css/support/60x60-red.png"><span>Y</span>
+  </div>
+  <div>
+    <img class="top" src="../../css/support/60x60-red.png"><span>Y</span>
+  </div>
+  <div>
+    <img class="bottom" src="../../css/support/60x60-red.png"><span>Y</span>
+  </div>
+</body>
diff --git a/testing/web-platform/tests/quirks/historical/vertical-align-in-quirks.html b/testing/web-platform/tests/quirks/vertical-align-in-quirks.html
similarity index 59%
rename from testing/web-platform/tests/quirks/historical/vertical-align-in-quirks.html
rename to testing/web-platform/tests/quirks/vertical-align-in-quirks.html
index c07672430442..1826d0152fb7 100644
--- a/testing/web-platform/tests/quirks/historical/vertical-align-in-quirks.html
+++ b/testing/web-platform/tests/quirks/vertical-align-in-quirks.html
@@ -30,27 +30,27 @@ img {
 </style>
 <body>
   <div>
-    <img class="text-top" src="/css/support/60x60-red.png">Y
+    <img class="text-top" src="../css/support/60x60-red.png">Y
   </div>
   <div>
-    <img class="text-bottom" src="/css/support/60x60-red.png">Y
+    <img class="text-bottom" src="../css/support/60x60-red.png">Y
   </div>
   <div>
-    <img class="top" src="/css/support/60x60-red.png">Y
+    <img class="top" src="../css/support/60x60-red.png">Y
   </div>
   <div>
-    <img class="bottom" src="/css/support/60x60-red.png">Y
+    <img class="bottom" src="../css/support/60x60-red.png">Y
   </div>
   <div>
-    <img class="text-top" src="/css/support/60x60-red.png"><span>Y</span>
+    <img class="text-top" src="../css/support/60x60-red.png"><span>Y</span>
   </div>
   <div>
-    <img class="text-bottom" src="/css/support/60x60-red.png"><span>Y</span>
+    <img class="text-bottom" src="../css/support/60x60-red.png"><span>Y</span>
   </div>
   <div>
-    <img class="top" src="/css/support/60x60-red.png"><span>Y</span>
+    <img class="top" src="../css/support/60x60-red.png"><span>Y</span>
   </div>
   <div>
-    <img class="bottom" src="/css/support/60x60-red.png"><span>Y</span>
+    <img class="bottom" src="../css/support/60x60-red.png"><span>Y</span>
   </div>
 </body>
diff --git a/testing/web-platform/tests/referrer-policy/README.md b/testing/web-platform/tests/referrer-policy/README.md
index c4694dc3728b..a4cc29b3851d 100644
--- a/testing/web-platform/tests/referrer-policy/README.md
+++ b/testing/web-platform/tests/referrer-policy/README.md
@@ -96,7 +96,7 @@ The ```./generic/tools/clean.py``` utility will only work if there is a valid ``
 
 ## Updating the tests
 
-The main test logic lives in ```./generic/referrer-policy-test-case.js``` with helper functions defined in ```./common/security-features/resources/common.js``` so you should probably start there.
+The main test logic lives in ```./generic/referrer-policy-test-case.js``` with helper functions defined in ```./generic/common.js``` so you should probably start there.
 
 For updating the test suite you will most likely do **a subset** of the following:
 
diff --git a/testing/web-platform/tests/referrer-policy/css-integration/child-css/external-import-stylesheet.html b/testing/web-platform/tests/referrer-policy/css-integration/child-css/external-import-stylesheet.html
index 9245ff39c6ea..40f4234ad48d 100644
--- a/testing/web-platform/tests/referrer-policy/css-integration/child-css/external-import-stylesheet.html
+++ b/testing/web-platform/tests/referrer-policy/css-integration/child-css/external-import-stylesheet.html
@@ -6,8 +6,7 @@
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
+    <script src="/referrer-policy/generic/common.js"></script>
     <meta name="referrer" content="origin">
   </head>
   <body>
@@ -17,7 +16,7 @@
     <div class="styled"></div>
 
     <script>
-      promise_test(function(css_test) {
+      async_test(function(css_test) {
         let id = token();
         let url_prefix = location.protocol + "//www1." + location.hostname + ":" + location.port;
         let css_url = url_prefix +
@@ -26,19 +25,19 @@
         let check_url = url_prefix + "/referrer-policy/generic/subresource/stylesheet.py" +
                         "?id=" + id + "&report-headers";
 
-        return new Promise(resolve => {
-            let link = document.createElement("link");
-            link.href = css_url;
-            link.rel = "stylesheet";
-            link.onload = resolve;
-            document.head.appendChild(link);
-          })
-          .then(() => timeoutPromise(css_test, 1000))
-          .then(() => requestViaXhr(check_url))
-          .then(function(message) {
-              assert_own_property(message, "headers");
-              assert_equals(message.referrer, undefined);
-            });
+        let link = document.createElement("link");
+        link.href = css_url;
+        link.rel = "stylesheet";
+        link.onload = function() {
+          css_test.step_timeout(function() {
+              queryXhr(check_url, function(message) {
+                  assert_own_property(message, "headers");
+                  assert_equals(message.referrer, undefined);
+                  css_test.done();
+              }, null, null, css_test);
+          }, 1000);
+        };
+        document.head.appendChild(link);
       }, "Child css from external stylesheet.");
     </script>
 
diff --git a/testing/web-platform/tests/referrer-policy/css-integration/child-css/internal-import-stylesheet.html b/testing/web-platform/tests/referrer-policy/css-integration/child-css/internal-import-stylesheet.html
index c25b99926a0a..30c5ea290309 100644
--- a/testing/web-platform/tests/referrer-policy/css-integration/child-css/internal-import-stylesheet.html
+++ b/testing/web-platform/tests/referrer-policy/css-integration/child-css/internal-import-stylesheet.html
@@ -6,8 +6,7 @@
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
+    <script src="/referrer-policy/generic/common.js"></script>
     <meta name="referrer" content="never">
   </head>
   <body>
@@ -17,7 +16,7 @@
     <div class="styled"></div>
 
     <script>
-      promise_test(function(css_test) {
+      async_test(function(css_test) {
         let id = token();
         let url_prefix = location.protocol + "//www1." + location.hostname + ":" + location.port;
         let css_url = url_prefix + "/referrer-policy/generic/subresource/stylesheet.py?id=" + id + "&import-rule";
@@ -28,13 +27,14 @@
         style.type = 'text/css';
         style.appendChild(document.createTextNode("@import url('" + css_url + "');"));
         document.head.appendChild(style);
-        return timeoutPromise(css_test, 1000)
-          .then(() => requestViaXhr(check_url))
-          .then(function(message) {
+        css_test.step_timeout(function() {
+          queryXhr(check_url, function(message) {
               assert_own_property(message, "headers");
               assert_own_property(message, "referrer");
               assert_equals(message.referrer, css_url);
-            });
+              css_test.done();
+          }, null, null, css_test);
+        }, 1000);
       }, "Child css from internal stylesheet.");
     </script>
 
diff --git a/testing/web-platform/tests/referrer-policy/css-integration/child-css/processing-instruction.html b/testing/web-platform/tests/referrer-policy/css-integration/child-css/processing-instruction.html
index 36d8bbc0216d..52a0ded42a18 100644
--- a/testing/web-platform/tests/referrer-policy/css-integration/child-css/processing-instruction.html
+++ b/testing/web-platform/tests/referrer-policy/css-integration/child-css/processing-instruction.html
@@ -6,8 +6,7 @@
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
+    <script src="/referrer-policy/generic/common.js"></script>
     <meta name="referrer" content="origin">
   </head>
   <body>
@@ -16,7 +15,7 @@
     <div class="styled"></div>
 
     <script>
-      promise_test(function(css_test) {
+      async_test(function(css_test) {
         let id = token();
         let url_prefix = location.protocol + "//www1." + location.hostname + ":" +
                          location.port +
@@ -29,14 +28,15 @@
         let processingInstruction =
           document.createProcessingInstruction(
             "xml-stylesheet", "href=\"" +css_url + "\" type=\"text/css\"");
-        document.insertBefore(processingInstruction, document.firstChild);
-        return timeoutPromise(css_test, 1000)
-          .then(() => requestViaXhr(check_url))
-          .then(function(message) {
+        css_test.step_timeout(function() {
+            queryXhr(check_url, function(message) {
                 assert_own_property(message, "headers");
                 assert_own_property(message, "referrer");
                 assert_equals(message.referrer, expected);
-            });
+                css_test.done();
+            }, null, null, css_test);
+        }, 1000);
+        document.insertBefore(processingInstruction, document.firstChild);
       }, "Child css via a ProcessingInstruction.");
     </script>
 
diff --git a/testing/web-platform/tests/referrer-policy/css-integration/css-test-helper.js b/testing/web-platform/tests/referrer-policy/css-integration/css-test-helper.js
index 0afa9e1b87ca..788df16a456b 100644
--- a/testing/web-platform/tests/referrer-policy/css-integration/css-test-helper.js
+++ b/testing/web-platform/tests/referrer-policy/css-integration/css-test-helper.js
@@ -14,34 +14,41 @@ var svg_test_properties = [
   'mask-image',
 ];
 
+// Schedules async_test's for each of the test properties
 // Parameters:
 //     testProperties: An array of test properties.
 //     testDescription: A test description
 //     testFunction: A function call which sets up the expect result and runs
 //                   the actual test
 function runSvgTests(testProperties, testDescription, testFunction) {
-  for (const property of testProperties) {
+  let runNextTest = function () {
+    let property = testProperties.shift();
+    if (property === undefined) {
+      return;
+    }
+
     let current = {
+      test: async_test(testDescription + " " + property),
       id: token(),
       property: property,
     };
 
-    promise_test(t => {
-      testFunction(current);
-      return timeoutPromise(t, 800)
-        .then(() => {
-            let check_url = url_prefix + "svg.py" + "?id=" + current.id +
-                            "&report-headers";
-            return requestViaFetch(check_url);
-          })
-        .then(message => {
-            assert_own_property(message, "headers");
-            assert_own_property(message, "referrer");
-            assert_equals(message.referrer, current.expected);
-          });
-      },
-      testDescription + " " + property);
-  }
+    current.test.step(function() { testFunction(current) });
+
+    let check_url = url_prefix + "svg.py" + "?id=" + current.id +
+                    "&report-headers";
+    current.test.step_timeout(function() {
+      queryXhr(check_url, function(message) {
+          assert_own_property(message, "headers");
+          assert_own_property(message, "referrer");
+          assert_equals(message.referrer, current.expected);
+          current.test.done();
+      }, null, null, current.test);
+    }, 800);
+  };
+
+  add_result_callback(runNextTest);
+  runNextTest();
 }
 
 function createSvg() {
diff --git a/testing/web-platform/tests/referrer-policy/css-integration/font-face/external-import-stylesheet.html b/testing/web-platform/tests/referrer-policy/css-integration/font-face/external-import-stylesheet.html
index 6bd0554ccdfd..80e3587ad62f 100644
--- a/testing/web-platform/tests/referrer-policy/css-integration/font-face/external-import-stylesheet.html
+++ b/testing/web-platform/tests/referrer-policy/css-integration/font-face/external-import-stylesheet.html
@@ -6,8 +6,7 @@
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
+    <script src="/referrer-policy/generic/common.js"></script>
     <meta name="referrer" content="never">
   </head>
   <body>
@@ -18,7 +17,7 @@
     <div class="styled"></div>
 
     <script>
-      promise_test(function(css_test) {
+      async_test(function(css_test) {
         let id = token();
         let css_url = location.protocol + "//www1." + location.hostname + ":" +
           location.port +
@@ -30,20 +29,20 @@
         let font_url = url_prefix + "/referrer-policy/generic/subresource/font.py" +
                        "?id=" + id + "&report-headers" + "&type=font";
 
-        return new Promise(resolve => {
-            let link = document.createElement("link");
-            link.href = css_url;
-            link.rel = "stylesheet";
-            link.onload = resolve;
-            document.head.appendChild(link);
-          })
-          .then(() => timeoutPromise(css_test, 1000))
-          .then(() => requestViaXhr(font_url))
-          .then(function(message) {
-              assert_own_property(message, "headers");
-              assert_own_property(message, "referrer");
-              assert_equals(message.referrer, css_referrer);
-            });
+        let link = document.createElement("link");
+        link.href = css_url;
+        link.rel = "stylesheet";
+        link.onload = function() {
+          css_test.step_timeout(function() {
+              queryXhr(font_url, function(message) {
+                  assert_own_property(message, "headers");
+                  assert_own_property(message, "referrer");
+                  assert_equals(message.referrer, css_referrer);
+                  css_test.done();
+              }, null, null, css_test);
+          }, 1000);
+        };
+        document.head.appendChild(link);
       }, "Font from imported stylesheet (external).");
     </script>
 
diff --git a/testing/web-platform/tests/referrer-policy/css-integration/font-face/external-stylesheet.html b/testing/web-platform/tests/referrer-policy/css-integration/font-face/external-stylesheet.html
index 8773664625c4..a91eb3fe7582 100644
--- a/testing/web-platform/tests/referrer-policy/css-integration/font-face/external-stylesheet.html
+++ b/testing/web-platform/tests/referrer-policy/css-integration/font-face/external-stylesheet.html
@@ -6,8 +6,7 @@
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
+    <script src="/referrer-policy/generic/common.js"></script>
     <meta name="referrer" content="never">
   </head>
   <body>
@@ -17,27 +16,27 @@
     <div class="styled"></div>
 
     <script>
-      promise_test(function(css_test) {
+      async_test(function(css_test) {
         let id = token();
         let url_prefix = location.protocol + "//www1." + location.hostname + ":" + location.port;
         let css_url = url_prefix + "/referrer-policy/generic/subresource/stylesheet.py?id=" + id + "&type=font";
         let font_url = url_prefix + "/referrer-policy/generic/subresource/font.py" +
                       "?id=" + id + "&report-headers";
 
-        return new Promise(resolve => {
-            let link = document.createElement("link");
-            link.href = css_url;
-            link.rel = "stylesheet";
-            link.onload = resolve;
-            document.head.appendChild(link);
-          })
-          .then(() => timeoutPromise(css_test, 1000))
-          .then(() => requestViaXhr(font_url))
-          .then(function(message) {
-              assert_own_property(message, "headers");
-              assert_own_property(message, "referrer");
-              assert_equals(message.referrer, css_url);
-            });
+        let link = document.createElement("link");
+        link.href = css_url;
+        link.rel = "stylesheet";
+        link.onload = function() {
+          css_test.step_timeout(function() {
+              queryXhr(font_url, function(message) {
+                  assert_own_property(message, "headers");
+                  assert_own_property(message, "referrer");
+                  assert_equals(message.referrer, css_url);
+                  css_test.done();
+              }, null, null, css_test);
+          }, 1000);
+        };
+        document.head.appendChild(link);
       }, "Font from external stylesheet.");
     </script>
 
diff --git a/testing/web-platform/tests/referrer-policy/css-integration/font-face/internal-import-stylesheet.html b/testing/web-platform/tests/referrer-policy/css-integration/font-face/internal-import-stylesheet.html
index 6dcf6be3e7d7..a637082a4ce7 100644
--- a/testing/web-platform/tests/referrer-policy/css-integration/font-face/internal-import-stylesheet.html
+++ b/testing/web-platform/tests/referrer-policy/css-integration/font-face/internal-import-stylesheet.html
@@ -6,8 +6,7 @@
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
+    <script src="/referrer-policy/generic/common.js"></script>
     <meta name="referrer" content="origin">
   </head>
   <body>
@@ -18,7 +17,7 @@
     <div class="styled"></div>
 
     <script>
-      promise_test(function(css_test) {
+      async_test(function(css_test) {
         let id = token();
         let url_prefix = location.protocol + "//www1." + location.hostname + ":" +
                          location.port + "/referrer-policy/generic/subresource/";
@@ -28,13 +27,14 @@
         let style = document.createElement("style");
         style.textContent = "@import url('" + css_url + "');";
         document.head.appendChild(style);
-        return timeoutPromise(css_test, 1000)
-          .then(() => requestViaXhr(font_url))
-          .then(function(message) {
-              assert_own_property(message, "headers");
-              assert_own_property(message, "referrer");
-              assert_equals(message.referrer, css_url);
-            });
+        css_test.step_timeout(function() {
+            queryXhr(font_url, function(message) {
+                assert_own_property(message, "headers");
+                assert_own_property(message, "referrer");
+                assert_equals(message.referrer, css_url);
+                css_test.done();
+            }, null, null, css_test);
+        }, 1000);
       }, "Font from imported stylesheet (internal).");
     </script>
 
diff --git a/testing/web-platform/tests/referrer-policy/css-integration/font-face/internal-stylesheet.html b/testing/web-platform/tests/referrer-policy/css-integration/font-face/internal-stylesheet.html
index 0d54bb766f77..eebd864bc567 100644
--- a/testing/web-platform/tests/referrer-policy/css-integration/font-face/internal-stylesheet.html
+++ b/testing/web-platform/tests/referrer-policy/css-integration/font-face/internal-stylesheet.html
@@ -6,8 +6,7 @@
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
+    <script src="/referrer-policy/generic/common.js"></script>
     <meta name="referrer" content="origin">
   </head>
   <body>
@@ -17,7 +16,7 @@
     <div class="styled"></div>
 
     <script>
-      promise_test(function(css_test) {
+      async_test(function(css_test) {
         let id = token();
         let css_url = location.protocol + "//www1." + location.hostname + ":" +
                       location.port +
@@ -28,13 +27,14 @@
         let style = document.createElement("style");
         style.textContent = "@font-face { font-family: 'wpt'; font-style: normal; font-weight: normal; src: url(" + css_url + "); format('truetype'); } body { font-family: 'wpt';}";
         document.head.appendChild(style);
-        return timeoutPromise(css_test, 1000)
-          .then(() => requestViaXhr(font_url))
-          .then(function(message) {
-              assert_own_property(message, "headers");
-              assert_own_property(message, "referrer");
-              assert_equals(message.referrer, location.origin + "/");
-            });
+        css_test.step_timeout(function() {
+            queryXhr(font_url, function(message) {
+                assert_own_property(message, "headers");
+                assert_own_property(message, "referrer");
+                assert_equals(message.referrer, location.origin + "/");
+                css_test.done();
+            }, null, null, css_test);
+        }, 1000);
       }, "Font from internal stylesheet.");
     </script>
 
diff --git a/testing/web-platform/tests/referrer-policy/css-integration/font-face/processing-instruction.html b/testing/web-platform/tests/referrer-policy/css-integration/font-face/processing-instruction.html
index 26203a822681..bfc42d9fcbe3 100644
--- a/testing/web-platform/tests/referrer-policy/css-integration/font-face/processing-instruction.html
+++ b/testing/web-platform/tests/referrer-policy/css-integration/font-face/processing-instruction.html
@@ -6,8 +6,7 @@
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
+    <script src="/referrer-policy/generic/common.js"></script>
     <meta name="referrer" content="never">
   </head>
   <body>
@@ -18,7 +17,7 @@
     <div class="styled"></div>
 
     <script>
-      promise_test(function(css_test) {
+      async_test(function(css_test) {
         let id = token();
         let url_prefix = location.protocol + "//www1." + location.hostname + ":" + location.port;
         let css_url = url_prefix +
@@ -33,14 +32,15 @@
         let processingInstruction =
           document.createProcessingInstruction(
             "xml-stylesheet", "href=\"" + css_url + "\" type=\"text/css\"");
+        css_test.step_timeout(function() {
+            queryXhr(font_url, function(message) {
+                assert_own_property(message, "headers");
+                assert_own_property(message, "referrer");
+                assert_equals(message.referrer, expected);
+                css_test.done();
+            }, null, null, css_test);
+        }, 1000);
         document.insertBefore(processingInstruction, document.firstChild);
-        return timeoutPromise(css_test, 1000)
-          .then(() => requestViaXhr(font_url))
-          .then(function(message) {
-              assert_own_property(message, "headers");
-              assert_own_property(message, "referrer");
-              assert_equals(message.referrer, expected);
-            });
       }, "Font from external stylesheet (from ProcessingInstruction).");
     </script>
 
diff --git a/testing/web-platform/tests/referrer-policy/css-integration/image/external-import-stylesheet.html b/testing/web-platform/tests/referrer-policy/css-integration/image/external-import-stylesheet.html
index 7c5a8c3d7094..80c71b0e215b 100644
--- a/testing/web-platform/tests/referrer-policy/css-integration/image/external-import-stylesheet.html
+++ b/testing/web-platform/tests/referrer-policy/css-integration/image/external-import-stylesheet.html
@@ -6,8 +6,7 @@
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
+    <script src="/referrer-policy/generic/common.js"></script>
     <meta name="referrer" content="never">
   </head>
   <body>
@@ -18,7 +17,7 @@
     <div class="styled"></div>
 
     <script>
-      promise_test(function(css_test) {
+      async_test(function(css_test) {
         var id = token();
         var css_url = location.protocol + "//www1." + location.hostname + ":" + location.port +
           "/referrer-policy/generic/subresource/stylesheet.py?id=" + id +
@@ -30,20 +29,20 @@
         var img_url = url_prefix + "/referrer-policy/generic/subresource/image.py" +
                       "?id=" + id + "&report-headers";
 
-        return new Promise(resolve => {
-            var link = document.createElement("link");
-            link.href = css_url;
-            link.rel = "stylesheet";
-            link.onload = resolve;
-            document.head.appendChild(link);
-          })
-          .then(() => timeoutPromise(css_test, 1000))
-          .then(() => requestViaXhr(img_url))
-          .then(function(message) {
-              assert_own_property(message, "headers");
-              assert_own_property(message, "referrer");
-              assert_equals(message.referrer, css_referrer);
-            });
+        var link = document.createElement("link");
+        link.href = css_url;
+        link.rel = "stylesheet";
+        link.onload = function() {
+          css_test.step_timeout(function() {
+              queryXhr(img_url, function(message) {
+                  assert_own_property(message, "headers");
+                  assert_own_property(message, "referrer");
+                  assert_equals(message.referrer, css_referrer);
+                  css_test.done();
+               }, null, null, css_test);
+          }, 1000);
+        };
+        document.head.appendChild(link);
       }, "Image from imported stylesheet (external).");
     </script>
 
diff --git a/testing/web-platform/tests/referrer-policy/css-integration/image/external-stylesheet.html b/testing/web-platform/tests/referrer-policy/css-integration/image/external-stylesheet.html
index 72a807bec6ba..ba7497b97de6 100644
--- a/testing/web-platform/tests/referrer-policy/css-integration/image/external-stylesheet.html
+++ b/testing/web-platform/tests/referrer-policy/css-integration/image/external-stylesheet.html
@@ -6,8 +6,7 @@
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
+    <script src="/referrer-policy/generic/common.js"></script>
     <meta name="referrer" content="never">
   </head>
   <body>
@@ -17,27 +16,27 @@
     <div class="styled"></div>
 
     <script>
-      promise_test(function(css_test) {
+      async_test(function(css_test) {
         var id = token();
         var url_prefix = location.protocol + "//www1." + location.hostname + ":" + location.port;
         var css_url = url_prefix + "/referrer-policy/generic/subresource/stylesheet.py?id=" + id;
         var img_url = url_prefix + "/referrer-policy/generic/subresource/image.py" +
                       "?id=" + id + "&report-headers";
 
-        return new Promise(resolve => {
-            var link = document.createElement("link");
-            link.href = css_url;
-            link.rel = "stylesheet";
-            link.onload = resolve;
-            document.head.appendChild(link);
-          })
-          .then(() => timeoutPromise(css_test, 1000))
-          .then(() => requestViaXhr(img_url))
-          .then(function(message) {
-              assert_own_property(message, "headers");
-              assert_own_property(message, "referrer");
-              assert_equals(message.referrer, css_url);
-            });
+        var link = document.createElement("link");
+        link.href = css_url;
+        link.rel = "stylesheet";
+        link.onload = css_test.step_func(function() {
+          css_test.step_timeout(function() {
+              queryXhr(img_url, function(message) {
+                  assert_own_property(message, "headers");
+                  assert_own_property(message, "referrer");
+                  assert_equals(message.referrer, css_url);
+                  css_test.done();
+              }, null, null, css_test);
+          }, 1000);
+        });
+        document.head.appendChild(link);
       }, "Image from external stylesheet.");
     </script>
 
diff --git a/testing/web-platform/tests/referrer-policy/css-integration/image/inline-style.html b/testing/web-platform/tests/referrer-policy/css-integration/image/inline-style.html
index 7e3d8879a4ae..758b6d91852f 100644
--- a/testing/web-platform/tests/referrer-policy/css-integration/image/inline-style.html
+++ b/testing/web-platform/tests/referrer-policy/css-integration/image/inline-style.html
@@ -6,8 +6,7 @@
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
+    <script src="/referrer-policy/generic/common.js"></script>
     <meta name="referrer" content="origin">
   </head>
   <body>
@@ -17,20 +16,21 @@
     <div class="styled"></div>
 
     <script>
-      promise_test(function(css_test) {
+      async_test(function(css_test) {
         var id = token();
         var css_url = location.protocol + "//www1." + location.hostname + ":" + location.port + "/referrer-policy/generic/subresource/image.py" + "?id=" + id;
         var img_url = css_url + "&report-headers";
 
         var div = document.querySelector("div.styled");
         div.style = "content:url(" + css_url + ")";
-        return timeoutPromise(css_test, 1000)
-          .then(() => requestViaXhr(img_url))
-          .then(function(message) {
-              assert_own_property(message, "headers");
-              assert_own_property(message, "referrer");
-              assert_equals(message.referrer, location.origin + "/");
-            });
+        css_test.step_timeout(function() {
+            queryXhr(img_url, function(message) {
+                assert_own_property(message, "headers");
+                assert_own_property(message, "referrer");
+                assert_equals(message.referrer, location.origin + "/");
+                css_test.done();
+            }, null, null, css_test);
+        }, 1000);
       }, "Image from inline styles.");
     </script>
 
diff --git a/testing/web-platform/tests/referrer-policy/css-integration/image/internal-import-stylesheet.html b/testing/web-platform/tests/referrer-policy/css-integration/image/internal-import-stylesheet.html
index e94218d419e6..24aa1858304a 100644
--- a/testing/web-platform/tests/referrer-policy/css-integration/image/internal-import-stylesheet.html
+++ b/testing/web-platform/tests/referrer-policy/css-integration/image/internal-import-stylesheet.html
@@ -6,8 +6,7 @@
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
+    <script src="/referrer-policy/generic/common.js"></script>
     <meta name="referrer" content="origin">
   </head>
   <body>
@@ -18,7 +17,7 @@
     <div class="styled"></div>
 
     <script>
-      promise_test(function(css_test) {
+      async_test(function(css_test) {
         var id = token();
         var url_prefix =  location.protocol + "//www1." + location.hostname + ":" + location.port + "/referrer-policy/generic/subresource/";
         var css_url = url_prefix + "stylesheet.py?id=" + id;
@@ -28,13 +27,14 @@
         style.type = 'text/css';
         style.appendChild(document.createTextNode("@import url('" + css_url + "');"));
         document.head.appendChild(style);
-        return timeoutPromise(css_test, 1000)
-          .then(() => requestViaXhr(img_url))
-          .then(function(message) {
-              assert_own_property(message, "headers");
-              assert_own_property(message, "referrer");
-              assert_equals(message.referrer, css_url);
-            });
+        css_test.step_timeout(function() {
+            queryXhr(img_url, function(message) {
+                assert_own_property(message, "headers");
+                assert_own_property(message, "referrer");
+                assert_equals(message.referrer, css_url);
+                css_test.done();
+            }, null, null, css_test);
+        }, 1000);
       }, "Image from imported stylesheet (internal).");
     </script>
 
diff --git a/testing/web-platform/tests/referrer-policy/css-integration/image/internal-stylesheet.html b/testing/web-platform/tests/referrer-policy/css-integration/image/internal-stylesheet.html
index a6107cb3a995..f4567885e1f1 100644
--- a/testing/web-platform/tests/referrer-policy/css-integration/image/internal-stylesheet.html
+++ b/testing/web-platform/tests/referrer-policy/css-integration/image/internal-stylesheet.html
@@ -6,8 +6,7 @@
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
+    <script src="/referrer-policy/generic/common.js"></script>
     <meta name="referrer" content="origin">
   </head>
   <body>
@@ -17,7 +16,7 @@
     <div class="styled"></div>
 
     <script>
-      promise_test(function(css_test) {
+      async_test(function(css_test) {
         var id = token();
         var css_url = location.protocol + "//www1." + location.hostname + ":" + location.port + "/referrer-policy/generic/subresource/image.py" + "?id=" + id;
         var img_url = css_url + "&report-headers";
@@ -26,13 +25,14 @@
         style.type = 'text/css';
         style.appendChild(document.createTextNode("div.styled::before { content:url(" + css_url + ")}"));
         document.head.appendChild(style);
-        return timeoutPromise(css_test, 1000)
-          .then(() => requestViaXhr(img_url))
-          .then(function(message) {
-              assert_own_property(message, "headers");
-              assert_own_property(message, "referrer");
-              assert_equals(message.referrer, location.origin + "/");
-            });
+        css_test.step_timeout(function() {
+          queryXhr(img_url, function(message) {
+            assert_own_property(message, "headers");
+            assert_own_property(message, "referrer");
+            assert_equals(message.referrer, location.origin + "/");
+            css_test.done();
+          }, null, null, css_test);
+        }, 1000);
       }, "Image from internal stylesheet.");
     </script>
 
diff --git a/testing/web-platform/tests/referrer-policy/css-integration/image/presentation-attribute.html b/testing/web-platform/tests/referrer-policy/css-integration/image/presentation-attribute.html
index ee70f15885c7..d0a4d96f84c8 100644
--- a/testing/web-platform/tests/referrer-policy/css-integration/image/presentation-attribute.html
+++ b/testing/web-platform/tests/referrer-policy/css-integration/image/presentation-attribute.html
@@ -6,8 +6,7 @@
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
+    <script src="/referrer-policy/generic/common.js"></script>
     <meta name="referrer" content="origin">
   </head>
   <body>
@@ -15,19 +14,20 @@
     the referrer and referrer policy from the document.</p>
 
     <script>
-      promise_test(function(css_test) {
+      async_test(function(css_test) {
         var id = token();
         var css_url = location.protocol + "//www1." + location.hostname + ":" + location.port + "/referrer-policy/generic/subresource/image.py" + "?id=" + id;
         var img_url = css_url + "&report-headers";
 
         document.body.background = css_url;
-        return timeoutPromise(css_test, 1000)
-          .then(() => requestViaXhr(img_url))
-          .then(function(message) {
-              assert_own_property(message, "headers");
-              assert_own_property(message, "referrer");
-              assert_equals(message.referrer, location.origin + "/");
-            });
+        css_test.step_timeout(function() {
+            queryXhr(img_url, function(message) {
+                assert_own_property(message, "headers");
+                assert_own_property(message, "referrer");
+                assert_equals(message.referrer, location.origin + "/");
+                css_test.done();
+            }, null, null, css_test);
+        }, 1000);
       }, "Image from presentation attributes.");
     </script>
 
diff --git a/testing/web-platform/tests/referrer-policy/css-integration/image/processing-instruction.html b/testing/web-platform/tests/referrer-policy/css-integration/image/processing-instruction.html
index c2b31be88993..926147be489a 100644
--- a/testing/web-platform/tests/referrer-policy/css-integration/image/processing-instruction.html
+++ b/testing/web-platform/tests/referrer-policy/css-integration/image/processing-instruction.html
@@ -6,8 +6,7 @@
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
+    <script src="/referrer-policy/generic/common.js"></script>
     <meta name="referrer" content="never">
   </head>
   <body>
@@ -18,7 +17,7 @@
     <div class="styled"></div>
 
     <script>
-      promise_test(function(css_test) {
+      async_test(function(css_test) {
         var id = token();
         var url_prefix = location.protocol + "//www1." + location.hostname + ":" + location.port;
         var css_url = url_prefix + "/referrer-policy/generic/subresource/stylesheet.py?id=" + id;
@@ -26,14 +25,15 @@
                       "?id=" + id + "&report-headers";
 
         var processingInstruction = document.createProcessingInstruction("xml-stylesheet", "href=\"" + css_url + "\" type=\"text/css\"");
+        css_test.step_timeout(function() {
+            queryXhr(img_url, function(message) {
+                assert_own_property(message, "headers");
+                assert_own_property(message, "referrer");
+                assert_equals(message.referrer, css_url);
+                css_test.done();
+            }, null, null, css_test);
+        }, 1000);
         document.insertBefore(processingInstruction, document.firstChild);
-        return timeoutPromise(css_test, 1000)
-          .then(() => requestViaXhr(img_url))
-          .then(function(message) {
-              assert_own_property(message, "headers");
-              assert_own_property(message, "referrer");
-              assert_equals(message.referrer, css_url);
-            });
       }, "Image from external stylesheet (from ProcessingInstruction).");
     </script>
 
diff --git a/testing/web-platform/tests/referrer-policy/css-integration/svg/external-stylesheet.html b/testing/web-platform/tests/referrer-policy/css-integration/svg/external-stylesheet.html
index 54ee36ce30bd..148584a0b23b 100644
--- a/testing/web-platform/tests/referrer-policy/css-integration/svg/external-stylesheet.html
+++ b/testing/web-platform/tests/referrer-policy/css-integration/svg/external-stylesheet.html
@@ -6,8 +6,7 @@
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
+    <script src="/referrer-policy/generic/common.js"></script>
     <!-- Helper functions for referrer-policy css tests. -->
     <script src="/referrer-policy/css-integration/css-test-helper.js"></script>
     <meta name="referrer" content="never">
diff --git a/testing/web-platform/tests/referrer-policy/css-integration/svg/inline-style.html b/testing/web-platform/tests/referrer-policy/css-integration/svg/inline-style.html
index 59fb4025f3ba..1f46acb4a321 100644
--- a/testing/web-platform/tests/referrer-policy/css-integration/svg/inline-style.html
+++ b/testing/web-platform/tests/referrer-policy/css-integration/svg/inline-style.html
@@ -6,8 +6,7 @@
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
+    <script src="/referrer-policy/generic/common.js"></script>
     <!-- Helper functions for referrer-policy css tests. -->
     <script src="/referrer-policy/css-integration/css-test-helper.js"></script>
     <meta name="referrer" content="origin">
diff --git a/testing/web-platform/tests/referrer-policy/css-integration/svg/internal-stylesheet.html b/testing/web-platform/tests/referrer-policy/css-integration/svg/internal-stylesheet.html
index 82d75665ea1c..08be4effa475 100644
--- a/testing/web-platform/tests/referrer-policy/css-integration/svg/internal-stylesheet.html
+++ b/testing/web-platform/tests/referrer-policy/css-integration/svg/internal-stylesheet.html
@@ -6,8 +6,7 @@
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
+    <script src="/referrer-policy/generic/common.js"></script>
     <!-- Helper functions for referrer-policy css tests. -->
     <script src="/referrer-policy/css-integration/css-test-helper.js"></script>
     <meta name="referrer" content="origin">
diff --git a/testing/web-platform/tests/referrer-policy/css-integration/svg/presentation-attribute.html b/testing/web-platform/tests/referrer-policy/css-integration/svg/presentation-attribute.html
index 8e616416380e..edeceb1a7854 100644
--- a/testing/web-platform/tests/referrer-policy/css-integration/svg/presentation-attribute.html
+++ b/testing/web-platform/tests/referrer-policy/css-integration/svg/presentation-attribute.html
@@ -7,8 +7,7 @@
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
+    <script src="/referrer-policy/generic/common.js"></script>
     <!-- Helper functions for referrer-policy css tests. -->
     <script src="/referrer-policy/css-integration/css-test-helper.js"></script>
     <meta name="referrer" content="origin">
diff --git a/testing/web-platform/tests/referrer-policy/css-integration/svg/processing-instruction.html b/testing/web-platform/tests/referrer-policy/css-integration/svg/processing-instruction.html
index 99ec1ae6aeb8..ba0e6673a387 100644
--- a/testing/web-platform/tests/referrer-policy/css-integration/svg/processing-instruction.html
+++ b/testing/web-platform/tests/referrer-policy/css-integration/svg/processing-instruction.html
@@ -7,8 +7,7 @@
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
+    <script src="/referrer-policy/generic/common.js"></script>
     <!-- Helper functions for referrer-policy css tests. -->
     <script src="/referrer-policy/css-integration/css-test-helper.js"></script>
     <meta name="referrer" content="origin">
diff --git a/testing/web-platform/tests/referrer-policy/generic/common.js b/testing/web-platform/tests/referrer-policy/generic/common.js
new file mode 100644
index 000000000000..a16691bccb25
--- /dev/null
+++ b/testing/web-platform/tests/referrer-policy/generic/common.js
@@ -0,0 +1,266 @@
+// NOTE: This method only strips the fragment and is not in accordance to the
+// recommended draft specification:
+// https://w3c.github.io/webappsec/specs/referrer-policy/#null
+// TODO(kristijanburnik): Implement this helper as defined by spec once added
+// scenarios for URLs containing username/password/etc.
+function stripUrlForUseAsReferrer(url) {
+  return url.replace(/#.*$/, "");
+}
+
+function parseUrlQueryString(queryString) {
+  var queries = queryString.replace(/^\?/, "").split("&");
+  var params = {};
+
+  for (var i in queries) {
+    var kvp = queries[i].split("=");
+    params[kvp[0]] = kvp[1];
+  }
+
+  return params;
+};
+
+function appendIframeToBody(url, attributes) {
+  var iframe = document.createElement("iframe");
+  iframe.src = url;
+  // Extend element with attributes. (E.g. "referrerPolicy" or "rel")
+  if (attributes) {
+    for (var attr in attributes) {
+      iframe[attr] = attributes[attr];
+    }
+  }
+  document.body.appendChild(iframe);
+
+  return iframe;
+}
+
+function loadImageInWindow(src, callback, attributes, w) {
+  var image = new w.Image();
+  image.crossOrigin = "Anonymous";
+  image.onload = function() {
+    callback(image);
+  }
+
+  // Extend element with attributes. (E.g. "referrerPolicy" or "rel")
+  if (attributes) {
+    for (var attr in attributes) {
+      image[attr] = attributes[attr];
+    }
+  }
+
+  image.src = src;
+  w.document.body.appendChild(image)
+}
+
+function extractImageData(img) {
+    var canvas = document.createElement("canvas");
+    var context = canvas.getContext('2d');
+    context.drawImage(img, 0, 0);
+    var imgData = context.getImageData(0, 0, img.clientWidth, img.clientHeight);
+    return imgData.data;
+}
+
+function decodeImageData(rgba) {
+  var rgb = new Uint8ClampedArray(rgba.length);
+
+  // RGBA -> RGB.
+  var rgb_length = 0;
+  for (var i = 0; i < rgba.length; ++i) {
+    // Skip alpha component.
+    if (i % 4 == 3)
+      continue;
+
+    // Zero is the string terminator.
+    if (rgba[i] == 0)
+      break;
+
+    rgb[rgb_length++] = rgba[i];
+  }
+
+  // Remove trailing nulls from data.
+  rgb = rgb.subarray(0, rgb_length);
+  var string_data = (new TextDecoder("ascii")).decode(rgb);
+
+  return JSON.parse(string_data);
+}
+
+function normalizePort(targetPort) {
+  var defaultPorts = [80, 443];
+  var isDefaultPortForProtocol = (defaultPorts.indexOf(targetPort) >= 0);
+
+  return (targetPort == "" || isDefaultPortForProtocol) ?
+          "" : ":" + targetPort;
+}
+
+function wrapResult(url, server_data) {
+  return {
+    location: url,
+    referrer: server_data.headers.referer,
+    headers: server_data.headers
+  }
+}
+
+function queryIframe(url, callback, attributes, referrer_policy, test) {
+  var iframe = appendIframeToBody(url, attributes);
+  var listener = test.step_func(function(event) {
+    if (event.source != iframe.contentWindow)
+      return;
+
+    callback(event.data, url);
+    window.removeEventListener("message", listener);
+  });
+  window.addEventListener("message", listener);
+}
+
+function queryImage(url, callback, attributes, referrerPolicy, test) {
+  // For images, we'll test:
+  // - images in a `srcdoc` frame to ensure that it uses the referrer
+  //   policy of its parent,
+  // - images in a top-level document,
+  // - and images in a `srcdoc` frame with its own referrer policy to
+  //   override its parent.
+
+  var noSrcDocPolicy = new Promise((resolve, reject) => {
+    var iframeWithoutOwnPolicy = document.createElement('iframe');
+    iframeWithoutOwnPolicy.srcdoc = "Hello, world.";
+    iframeWithoutOwnPolicy.onload = test.step_func(function () {
+      var nextUrl = url + "&cache_destroyer2=" + (new Date()).getTime();
+      loadImageInWindow(nextUrl, test.step_func(function (img) {
+        resolve(decodeImageData(extractImageData(img)));
+      }), attributes, iframeWithoutOwnPolicy.contentWindow);
+    });
+    document.body.appendChild(iframeWithoutOwnPolicy);
+  });
+
+  // Give a srcdoc iframe a referrer policy different from the top-level page's policy.
+  var iframePolicy = (referrerPolicy === "no-referrer") ? "unsafe-url" : "no-referrer";
+  var srcDocPolicy = new Promise((resolve, reject) => {
+    var iframeWithOwnPolicy = document.createElement('iframe');
+    iframeWithOwnPolicy.srcdoc = "<meta name='referrer' content='" + iframePolicy + "'>Hello world.";
+
+    iframeWithOwnPolicy.onload = test.step_func(function () {
+      var nextUrl = url + "&cache_destroyer3=" + (new Date()).getTime();
+      loadImageInWindow(nextUrl, test.step_func(function (img) {
+        resolve(decodeImageData(extractImageData(img)));
+      }), null, iframeWithOwnPolicy.contentWindow);
+    });
+    document.body.appendChild(iframeWithOwnPolicy);
+  });
+
+  var pagePolicy = new Promise((resolve, reject) => {
+    loadImageInWindow(url, test.step_func(function (img) {
+      resolve(decodeImageData(extractImageData(img)));
+    }), attributes, window);
+  });
+
+  Promise.all([noSrcDocPolicy, srcDocPolicy, pagePolicy]).then(test.step_func(values => {
+    assert_equals(values[0].headers.referer, values[2].headers.referer, "Referrer inside 'srcdoc' without its own policy should be the same as embedder's referrer.");
+    assert_equals((iframePolicy === "no-referrer" ? undefined : document.location.href), values[1].headers.referer, "Referrer inside 'srcdoc' should use the iframe's policy if it has one");
+    callback(wrapResult(url, values[2]), url);
+  }));
+}
+
+function queryXhr(url, callback, attributes, referrer_policy, test) {
+  var xhr = new XMLHttpRequest();
+  xhr.open('GET', url, true);
+  xhr.onreadystatechange = test.step_func(function(e) {
+    if (xhr.readyState == 4 && xhr.status == 200) {
+      var server_data = JSON.parse(xhr.responseText);
+      callback(wrapResult(url, server_data), url);
+    }
+  });
+  xhr.send();
+}
+
+function queryWorker(url, callback, attributes, referrer_policy, test) {
+  var worker = new Worker(url);
+  worker.onmessage = test.step_func(function(event) {
+    var server_data = event.data;
+    callback(wrapResult(url, server_data), url);
+  });
+}
+
+function queryModuleWorkerTopLevel(url, callback, attributes, referrer_policy, test) {
+  var worker = new Worker(url, {type: "module"});
+  worker.onmessage = test.step_func(function(event) {
+    var server_data = event.data;
+    callback(wrapResult(url, server_data), url);
+  });
+}
+
+function querySharedWorker(url, callback, attributes, referrer_policy, test) {
+  var worker = new SharedWorker(url);
+  worker.port.onmessage = test.step_func(function(event) {
+    var server_data = event.data;
+    callback(wrapResult(url, server_data), url);
+  });
+}
+
+function queryFetch(url, callback, attributes, referrer_policy, test) {
+  fetch(url).then(test.step_func(function(response) {
+      response.json().then(test.step_func(function(server_data) {
+        callback(wrapResult(url, server_data), url);
+      }));
+    })
+  );
+}
+
+function queryNavigable(element, url, callback, attributes, test) {
+  var navigable = element
+  navigable.href = url;
+  navigable.target = "helper-iframe";
+
+  var helperIframe = document.createElement("iframe")
+  helperIframe.name = "helper-iframe"
+  document.body.appendChild(helperIframe)
+
+  // Extend element with attributes. (E.g. "referrer_policy" or "rel")
+  if (attributes) {
+    for (var attr in attributes) {
+      navigable[attr] = attributes[attr];
+    }
+  }
+
+  var listener = test.step_func(function(event) {
+    if (event.source != helperIframe.contentWindow)
+      return;
+    callback(event.data, url);
+    window.removeEventListener("message", listener);
+  });
+  window.addEventListener("message", listener);
+
+  navigable.click();
+}
+
+function queryLink(url, callback, attributes, referrer_policy, test) {
+  var a = document.createElement("a");
+  a.innerHTML = "Link to subresource";
+  document.body.appendChild(a);
+  queryNavigable(a, url, callback, attributes, test)
+}
+
+function queryAreaLink(url, callback, attributes, referrer_policy, test) {
+  var area = document.createElement("area");
+  // TODO(kristijanburnik): Append to map and add image.
+  document.body.appendChild(area);
+  queryNavigable(area, url, callback, attributes, test)
+}
+
+function queryScript(url, callback, attributes, referrer_policy, test) {
+  var script = document.createElement("script");
+  script.src = url;
+  script.referrerPolicy = referrer_policy;
+
+  var listener = test.step_func(function(event) {
+    var server_data = event.data;
+    callback(wrapResult(url, server_data), url);
+    window.removeEventListener("message", listener);
+  });
+  window.addEventListener("message", listener);
+
+  document.body.appendChild(script);
+}
+
+ // SanityChecker does nothing in release mode.
+function SanityChecker() {}
+SanityChecker.prototype.checkScenario = function() {};
+SanityChecker.prototype.checkSubresourceResult = function() {};
diff --git a/testing/web-platform/tests/referrer-policy/generic/iframe-inheritance.html b/testing/web-platform/tests/referrer-policy/generic/iframe-inheritance.html
index 3bab0979dd91..478a7ce6fe6a 100644
--- a/testing/web-platform/tests/referrer-policy/generic/iframe-inheritance.html
+++ b/testing/web-platform/tests/referrer-policy/generic/iframe-inheritance.html
@@ -7,8 +7,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
+    <script src="/referrer-policy/generic/common.js"></script>
     <meta name="referrer" content="origin">
   </head>
   <body onload="runTest()">
@@ -25,16 +24,12 @@
         iframe.src = "about:blank";
         document.body.appendChild(iframe);
         iframe.contentDocument.write(`
-            <script src = "/common/security-features/resources/common.js"></` + `script>
-            <script src = "/referrer-policy/generic/referrer-policy-test-case.js"></` + `script>
+            <script src = "/referrer-policy/generic/common.js"></` + `script>
             <script>
               var urlPath = "/referrer-policy/generic/subresource/xhr.py";
               var url = "${location.protocol}//www1.${location.hostname}:${location.port}" + urlPath;
-              requestViaXhr(url).then((msg) => {
-                  parent.postMessage({referrer: msg.referrer}, "*")})
-                .catch((e) => {
-                    parent.postMessage({referrer: "FAILURE"}, "*");
-                  });
+              queryXhr(url, (msg) => {
+                  parent.postMessage({referrer: msg.referrer}, "*")});
             </` + "script>");
         }
       </script>
diff --git a/testing/web-platform/tests/referrer-policy/generic/link-rel-prefetch.html b/testing/web-platform/tests/referrer-policy/generic/link-rel-prefetch.html
index 0f78596fa2d7..54963141b191 100644
--- a/testing/web-platform/tests/referrer-policy/generic/link-rel-prefetch.html
+++ b/testing/web-platform/tests/referrer-policy/generic/link-rel-prefetch.html
@@ -5,7 +5,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/common.js"></script>
     <meta name="referrer" content="origin">
     <link rel="prefetch" href="/referrer-policy/generic/subresource/image.py">
   </head>
@@ -14,14 +14,18 @@
     and referrer policy from the document.</p>
 
     <script>
+      var prefetch_test = async_test("Prefetched image.");
+
       var img_url = "/referrer-policy/generic/subresource/image.py";
-      promise_test((t) => timeoutPromise(t, 1000)
-        .then(() => loadImageInWindow(img_url, null, window))
-        .then(function (img) {
-            var message = decodeImageData(extractImageData(img));
-            assert_equals(message.headers.referer, document.location.origin + "/");
-          }),
-        "Prefetched image.");
+      prefetch_test.step_timeout(
+          function() {
+            loadImageInWindow(img_url, function (img) {
+              var message = decodeImageData(extractImageData(img));
+              prefetch_test.step(function() { assert_equals(message.headers.referer, document.location.origin + "/")});
+              prefetch_test.done();
+            }, null, window);
+          },
+          1000);
     </script>
 
     <div id="log"></div>
diff --git a/testing/web-platform/tests/referrer-policy/generic/multiple-headers-and-values.html b/testing/web-platform/tests/referrer-policy/generic/multiple-headers-and-values.html
index d6b9408c1536..682199b917c3 100644
--- a/testing/web-platform/tests/referrer-policy/generic/multiple-headers-and-values.html
+++ b/testing/web-platform/tests/referrer-policy/generic/multiple-headers-and-values.html
@@ -5,8 +5,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
 
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
+    <script src="/referrer-policy/generic/common.js"></script>
   </head>
   <body>
     <h1>Referrer Policy: multiple Referrer-Policy header and header values are allowed</h1>
@@ -15,15 +14,14 @@
     <pre id="received_message">Running...</pre>
 
     <script>
-      promise_test(() => {
-        var urlPath = '/referrer-policy/generic/subresource/image.py?cache_destroyer=' + (new Date()).getTime();
-        var url = location.protocol + "//www1." + location.hostname + ":" + location.port +
-                  urlPath;
-        return requestViaImageForReferrerPolicy(url, null, 'no-referrer')
-          .then(function(message) {
-              assert_equals(message.referrer, document.location.origin + "/");
-            });
-      }, "Image uses the last recognized Referrer-Policy header value");
+      var test = async_test("Image uses the last recognized Referrer-Policy header value");
+      var urlPath = '/referrer-policy/generic/subresource/image.py?cache_destroyer=' + (new Date()).getTime();
+      var url = location.protocol + "//www1." + location.hostname + ":" + location.port +
+                urlPath;
+      queryImage(url, test.step_func(function(message) {
+        assert_equals(message.referrer, document.location.origin + "/");
+        test.done();
+      }), null, 'no-referrer', test);
     </script>
 
     <div id="log"></div>
diff --git a/testing/web-platform/tests/referrer-policy/generic/multiple-headers-combined.html b/testing/web-platform/tests/referrer-policy/generic/multiple-headers-combined.html
index 0b36aeee94c3..ad02ae84bd74 100644
--- a/testing/web-platform/tests/referrer-policy/generic/multiple-headers-combined.html
+++ b/testing/web-platform/tests/referrer-policy/generic/multiple-headers-combined.html
@@ -5,8 +5,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
 
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
+    <script src="/referrer-policy/generic/common.js"></script>
   </head>
   <body>
     <h1>Referrer Policy: multiple Referrer-Policy header values are allowed</h1>
@@ -15,15 +14,14 @@
     <pre id="received_message">Running...</pre>
 
     <script>
-      promise_test(() => {
-        var urlPath = '/referrer-policy/generic/subresource/image.py?cache_destroyer=' + (new Date()).getTime();
-        var url = location.protocol + "//www1." + location.hostname + ":" + location.port +
-                  urlPath;
-        return requestViaImageForReferrerPolicy(url, null, 'no-referrer')
-          .then(function(message) {
-              assert_equals(message.referrer, document.location.origin + "/");
-            });
-      }, "Image uses the last recognized Referrer-Policy header value");
+      var test = async_test("Image uses the last recognized Referrer-Policy header value");
+      var urlPath = '/referrer-policy/generic/subresource/image.py?cache_destroyer=' + (new Date()).getTime();
+      var url = location.protocol + "//www1." + location.hostname + ":" + location.port +
+                urlPath;
+      queryImage(url, test.step_func(function(message) {
+        assert_equals(message.referrer, document.location.origin + "/");
+        test.done();
+      }), null, 'no-referrer', test);
     </script>
 
     <div id="log"></div>
diff --git a/testing/web-platform/tests/referrer-policy/generic/multiple-headers-one-invalid.html b/testing/web-platform/tests/referrer-policy/generic/multiple-headers-one-invalid.html
index 599ffdccc3ea..b1384b14a0e8 100644
--- a/testing/web-platform/tests/referrer-policy/generic/multiple-headers-one-invalid.html
+++ b/testing/web-platform/tests/referrer-policy/generic/multiple-headers-one-invalid.html
@@ -5,8 +5,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
 
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
+    <script src="/referrer-policy/generic/common.js"></script>
   </head>
   <body>
     <h1>Referrer Policy: multiple Referrer-Policy headers with one invalid</h1>
@@ -15,15 +14,14 @@
     <pre id="received_message">Running...</pre>
 
     <script>
-      promise_test(() => {
-        var urlPath = '/referrer-policy/generic/subresource/image.py?cache_destroyer=' + (new Date()).getTime();
-        var url = location.protocol + "//www1." + location.hostname + ":" + location.port +
-                  urlPath;
-        return requestViaImageForReferrerPolicy(url, null, 'no-referrer')
-          .then(function(message) {
-              assert_equals(message.referrer, document.location.href);
-            });
-      }, "Referrer policy header parsing fails if one header is invalid");
+      var test = async_test("Referrer policy header parsing fails if one header is invalid");
+      var urlPath = '/referrer-policy/generic/subresource/image.py?cache_destroyer=' + (new Date()).getTime();
+      var url = location.protocol + "//www1." + location.hostname + ":" + location.port +
+                urlPath;
+      queryImage(url, test.step_func(function(message) {
+        assert_equals(message.referrer, document.location.href);
+        test.done();
+      }), null, 'no-referrer', test);
     </script>
 
     <div id="log"></div>
diff --git a/testing/web-platform/tests/referrer-policy/generic/multiple-headers-one-unknown-token.html b/testing/web-platform/tests/referrer-policy/generic/multiple-headers-one-unknown-token.html
index cf9a79216262..3273c0dbedfe 100644
--- a/testing/web-platform/tests/referrer-policy/generic/multiple-headers-one-unknown-token.html
+++ b/testing/web-platform/tests/referrer-policy/generic/multiple-headers-one-unknown-token.html
@@ -5,8 +5,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
 
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
+    <script src="/referrer-policy/generic/common.js"></script>
   </head>
   <body>
     <h1>Referrer Policy: multiple Referrer-Policy headers with one invalid</h1>
@@ -15,15 +14,14 @@
     <pre id="received_message">Running...</pre>
 
     <script>
-      promise_test(() => {
-        var urlPath = '/referrer-policy/generic/subresource/image.py?cache_destroyer=' + (new Date()).getTime();
-        var url = location.protocol + "//www1." + location.hostname + ":" + location.port +
-                  urlPath;
-        return requestViaImageForReferrerPolicy(url, null, 'no-referrer')
-          .then(function(message) {
-              assert_equals(message.referrer, document.location.origin + "/");
-            });
-      }, "Image uses last recognized referrer policy token from Referrer-Policy headers");
+      var test = async_test("Image uses last recognized referrer policy token from Referrer-Policy headers");
+      var urlPath = '/referrer-policy/generic/subresource/image.py?cache_destroyer=' + (new Date()).getTime();
+      var url = location.protocol + "//www1." + location.hostname + ":" + location.port +
+                urlPath;
+      queryImage(url, test.step_func(function(message) {
+        assert_equals(message.referrer, document.location.origin + "/");
+        test.done();
+      }), null, 'no-referrer', test);
     </script>
 
     <div id="log"></div>
diff --git a/testing/web-platform/tests/referrer-policy/generic/multiple-headers.html b/testing/web-platform/tests/referrer-policy/generic/multiple-headers.html
index 418044a14cdc..5f6a749b4bd2 100644
--- a/testing/web-platform/tests/referrer-policy/generic/multiple-headers.html
+++ b/testing/web-platform/tests/referrer-policy/generic/multiple-headers.html
@@ -5,8 +5,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
 
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
+    <script src="/referrer-policy/generic/common.js"></script>
   </head>
   <body>
     <h1>Referrer Policy: multiple Referrer-Policy headers are allowed</h1>
@@ -15,15 +14,14 @@
     <pre id="received_message">Running...</pre>
 
     <script>
-      promise_test(() => {
-        var urlPath = '/referrer-policy/generic/subresource/image.py?cache_destroyer=' + (new Date()).getTime();
-        var url = location.protocol + "//www1." + location.hostname + ":" + location.port +
-                  urlPath;
-        return requestViaImageForReferrerPolicy(url, null, 'no-referrer')
-          .then(function(message) {
-              assert_equals(message.referrer, document.location.origin + "/");
-            });
-      }, "Image uses the last recognized Referrer-Policy header");
+      var test = async_test("Image uses the last recognized Referrer-Policy header");
+      var urlPath = '/referrer-policy/generic/subresource/image.py?cache_destroyer=' + (new Date()).getTime();
+      var url = location.protocol + "//www1." + location.hostname + ":" + location.port +
+                urlPath;
+      queryImage(url, test.step_func(function(message) {
+        assert_equals(message.referrer, document.location.origin + "/");
+        test.done();
+      }), null, 'no-referrer', test);
     </script>
 
     <div id="log"></div>
diff --git a/testing/web-platform/tests/referrer-policy/generic/referrer-policy-test-case.js b/testing/web-platform/tests/referrer-policy/generic/referrer-policy-test-case.js
index 2c5c8eb80cc6..2385cc2a1c4e 100644
--- a/testing/web-platform/tests/referrer-policy/generic/referrer-policy-test-case.js
+++ b/testing/web-platform/tests/referrer-policy/generic/referrer-policy-test-case.js
@@ -1,27 +1,3 @@
-function wrapResult(server_data) {
-  return {
-    referrer: server_data.headers.referer,
-    headers: server_data.headers
-  }
-}
-
-// NOTE: This method only strips the fragment and is not in accordance to the
-// recommended draft specification:
-// https://w3c.github.io/webappsec/specs/referrer-policy/#null
-// TODO(kristijanburnik): Implement this helper as defined by spec once added
-// scenarios for URLs containing username/password/etc.
-function stripUrlForUseAsReferrer(url) {
-  return url.replace(/#.*$/, "");
-}
-
-function normalizePort(targetPort) {
-  var defaultPorts = [80, 443];
-  var isDefaultPortForProtocol = (defaultPorts.indexOf(targetPort) >= 0);
-
-  return (targetPort == "" || isDefaultPortForProtocol) ?
-          "" : ":" + targetPort;
-}
-
 function ReferrerPolicyTestCase(scenario, testDescription, sanityChecker) {
   // Pass and skip rest of the test if browser does not support fetch.
   if (scenario.subresource == "fetch-request" && !window.fetch) {
@@ -38,16 +14,16 @@ function ReferrerPolicyTestCase(scenario, testDescription, sanityChecker) {
   sanityChecker.checkScenario(scenario);
 
   var subresourceInvoker = {
-    "a-tag": requestViaAnchor,
-    "area-tag": requestViaArea,
-    "fetch-request": requestViaFetch,
-    "iframe-tag": requestViaIframe,
-    "img-tag":  requestViaImageForReferrerPolicy,
-    "script-tag": requestViaScript,
-    "worker-request": url => requestViaDedicatedWorker(url, {}),
-    "module-worker": url => requestViaDedicatedWorker(url, {type: "module"}),
-    "shared-worker": requestViaSharedWorker,
-    "xhr-request": requestViaXhr
+    "a-tag": queryLink,
+    "area-tag": queryAreaLink,
+    "fetch-request": queryFetch,
+    "iframe-tag": queryIframe,
+    "img-tag":  queryImage,
+    "script-tag": queryScript,
+    "worker-request": queryWorker,
+    "module-worker": queryModuleWorkerTopLevel,
+    "shared-worker": querySharedWorker,
+    "xhr-request": queryXhr
   };
 
   var referrerUrlResolver = {
@@ -65,6 +41,8 @@ function ReferrerPolicyTestCase(scenario, testDescription, sanityChecker) {
   var t = {
     _scenario: scenario,
     _testDescription: testDescription,
+    _subresourceUrl: null,
+    _expectedReferrerUrl: null,
     _constructSubresourceUrl: function() {
       // TODO(kristijanburnik): We should assert that these two domains are
       // different. E.g. If someone runs the tets over www, this would fail.
@@ -82,20 +60,19 @@ function ReferrerPolicyTestCase(scenario, testDescription, sanityChecker) {
 
       var targetPort = portForProtocol[t._scenario.target_protocol];
 
-      return t._scenario.target_protocol + "://" +
-             domainForOrigin[t._scenario.origin] +
-             normalizePort(targetPort) +
-             t._scenario["subresource_path"] +
-             "?redirection=" + t._scenario["redirection"] +
-             "&cache_destroyer=" + (new Date()).getTime();
+      t._subresourceUrl = t._scenario.target_protocol + "://" +
+                          domainForOrigin[t._scenario.origin] +
+                          normalizePort(targetPort) +
+                          t._scenario["subresource_path"] +
+                          "?redirection=" + t._scenario["redirection"] +
+                          "&cache_destroyer=" + (new Date()).getTime();
     },
 
     _constructExpectedReferrerUrl: function() {
-      return referrerUrlResolver[t._scenario.referrer_url]();
+      t._expectedReferrerUrl = referrerUrlResolver[t._scenario.referrer_url]();
     },
 
-    // Returns a promise.
-    _invokeSubresource: function(resourceRequestUrl) {
+    _invokeSubresource: function(callback, test) {
       var invoker = subresourceInvoker[t._scenario.subresource];
       // Depending on the delivery method, extend the subresource element with
       // these attributes.
@@ -107,35 +84,43 @@ function ReferrerPolicyTestCase(scenario, testDescription, sanityChecker) {
       var delivery_method = t._scenario.delivery_method;
 
       if (delivery_method in elementAttributesForDeliveryMethod) {
-        return invoker(resourceRequestUrl,
-                       elementAttributesForDeliveryMethod[delivery_method],
-                       t._scenario.referrer_policy);
+        invoker(t._subresourceUrl,
+                callback,
+                elementAttributesForDeliveryMethod[delivery_method],
+                t._scenario.referrer_policy,
+                test);
       } else {
-        return invoker(resourceRequestUrl, {}, t._scenario.referrer_policy);
+        invoker(t._subresourceUrl, callback, null, t._scenario.referrer_policy, test);
       }
+
     },
 
     start: function() {
-      promise_test(test => {
-          const resourceRequestUrl = t._constructSubresourceUrl();
-          const expectedReferrerUrl = t._constructExpectedReferrerUrl();
-          return t._invokeSubresource(resourceRequestUrl)
-            .then(result => {
-                // Check if the result is in valid format. NOOP in release.
-                sanityChecker.checkSubresourceResult(
-                    test, t._scenario, resourceRequestUrl, result);
+      async_test(function(test) {
 
-                // Check the reported URL.
-                assert_equals(result.referrer,
-                              expectedReferrerUrl,
-                              "Reported Referrer URL is '" +
-                              t._scenario.referrer_url + "'.");
-                assert_equals(result.headers.referer,
-                              expectedReferrerUrl,
-                              "Reported Referrer URL from HTTP header is '" +
-                              expectedReferrerUrl + "'");
-              });
-        }, t._testDescription);
+        t._constructSubresourceUrl();
+        t._constructExpectedReferrerUrl();
+
+        t._invokeSubresource(test.step_func(function(result) {
+          // Check if the result is in valid format. NOOP in release.
+          sanityChecker.checkSubresourceResult(
+              test, t._scenario, t._subresourceUrl, result);
+
+          // Check the reported URL.
+          test.step(function() {
+            assert_equals(result.referrer,
+                          t._expectedReferrerUrl,
+                          "Reported Referrer URL is '" +
+                          t._scenario.referrer_url + "'.");
+            assert_equals(result.headers.referer,
+                          t._expectedReferrerUrl,
+                          "Reported Referrer URL from HTTP header is '" +
+                          t._expectedReferrerUrl + "'");
+          }, "Reported Referrer URL is as expected: " + t._scenario.referrer_url);
+
+          test.done();
+        }), test);
+      }, t._testDescription);
     }
   }
 
diff --git a/testing/web-platform/tests/referrer-policy/generic/sandboxed-iframe-with-opaque-origin.html b/testing/web-platform/tests/referrer-policy/generic/sandboxed-iframe-with-opaque-origin.html
index 103627b21df0..1b2b12bf6910 100644
--- a/testing/web-platform/tests/referrer-policy/generic/sandboxed-iframe-with-opaque-origin.html
+++ b/testing/web-platform/tests/referrer-policy/generic/sandboxed-iframe-with-opaque-origin.html
@@ -7,8 +7,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
+    <script src="/referrer-policy/generic/common.js"></script>
   </head>
   <body>
     <h1>Referrer Policy: A document with an opaque origin doesn't send referrers</h1>
@@ -26,17 +25,13 @@
           iframe.sandbox = sandboxAttributes;
           iframe.srcdoc = `
               <meta name = "referrer" content = "always">
-              <script src = "/common/security-features/resources/common.js"></` + `script>
-              <script src = "/referrer-policy/generic/referrer-policy-test-case.js"></` + `script>
+              <script src = "/referrer-policy/generic/common.js"></` + `script>
               <script>
                 var urlPath = "/referrer-policy/generic/subresource/xhr.py";
                 var url = "${location.protocol}//www1.${location.hostname}:${location.port}" + urlPath;
-                requestViaXhr(url).then((msg) => {
+                queryXhr(url, (msg) => {
                     parent.postMessage({referrer: msg.referrer, description: "${description}"}, "*")
-                  })
-                  .catch((e) => {
-                    parent.postMessage({referrer: "FAILURE", description: "${description}"}, "*")
-                  });
+                }, null, null, test);
               </` + "script>";
           document.body.appendChild(iframe);
         }, description);
diff --git a/testing/web-platform/tests/referrer-policy/generic/subresource-test/area-navigate.html b/testing/web-platform/tests/referrer-policy/generic/subresource-test/area-navigate.html
index b7f05be9892b..3eb824521b78 100644
--- a/testing/web-platform/tests/referrer-policy/generic/subresource-test/area-navigate.html
+++ b/testing/web-platform/tests/referrer-policy/generic/subresource-test/area-navigate.html
@@ -6,8 +6,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
+    <script src="/referrer-policy/generic/common.js"></script>
   </head>
   <body>
     <h1>Area Link messaging - cross-origin Area Link navigation</h1>
@@ -17,22 +16,21 @@
     <pre id="received_message">Running...</pre>
 
     <script>
-      promise_test(function() {
-          var urlPath = '/referrer-policy/generic/subresource/document.py';
-          var url = location.protocol + "//www1." + location.hostname + ":" + location.port +
-                    urlPath;
-          return requestViaArea(url)
-            .then(function(message) {
-              var pre = document.getElementById('received_message')
-              var headers = message.headers;
-              pre.innerHTML = "";
-              pre.innerHTML += url + ":\n\n";
-              pre.innerHTML += JSON.stringify(headers, null, 2) + "\n\n"
-              assert_own_property(headers, "host")
-              assert_own_property(headers, "connection")
-            });
-        },
-        "Area is responding with HTTP headers");
+      async_test(function(messaging_test) {
+        var urlPath = '/referrer-policy/generic/subresource/document.py';
+        var url = location.protocol + "//www1." + location.hostname + ":" + location.port +
+                  urlPath;
+        queryAreaLink(url, function(message) {
+          var pre = document.getElementById('received_message')
+          var headers = message.headers;
+          pre.innerHTML = "";
+          pre.innerHTML += url + ":\n\n";
+          pre.innerHTML += JSON.stringify(headers, null, 2) + "\n\n"
+          assert_own_property(headers, "host")
+          assert_own_property(headers, "connection")
+          messaging_test.done();
+        }, null, null, messaging_test);
+      }, "Area is responding with HTTP headers");
     </script>
 
     <div id="log"></div>
diff --git a/testing/web-platform/tests/referrer-policy/generic/subresource-test/fetch-messaging.html b/testing/web-platform/tests/referrer-policy/generic/subresource-test/fetch-messaging.html
index 2c12ae45510c..edb159d9eb1c 100644
--- a/testing/web-platform/tests/referrer-policy/generic/subresource-test/fetch-messaging.html
+++ b/testing/web-platform/tests/referrer-policy/generic/subresource-test/fetch-messaging.html
@@ -6,8 +6,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
+    <script src="/referrer-policy/generic/common.js"></script>
   </head>
   <body>
     <h1>Fetch messaging - same-origin Fetch request</h1>
@@ -21,21 +20,26 @@
         assert_true(!!window.fetch, "Fetch is not supported by this browser.");
       }, "Fetch is supported by the browser.");
 
-      promise_test(function() {
+      (function() {
+        if (!window.fetch)
+          return;
+
+        async_test(function(fetch_test) {
           var urlPath = '/referrer-policy/generic/subresource/xhr.py';
           var url = location.protocol + "//" + location.hostname + ":" +
                     location.port + urlPath;
-          return requestViaFetch(url)
-            .then(function(message) {
-                var pre = document.getElementById('received_message')
-                var headers = message.headers;
-                pre.innerHTML = "";
-                pre.innerHTML += url + ":\n\n";
-                pre.innerHTML += JSON.stringify(headers, null, 2) + "\n\n";
-                assert_own_property(headers, "host")
-                assert_own_property(headers, "connection")
-              });
-      }, "Fetch is responding with HTTP headers");
+          queryFetch(url, function(message) {
+            var pre = document.getElementById('received_message')
+            var headers = message.headers;
+            pre.innerHTML = "";
+            pre.innerHTML += url + ":\n\n";
+            pre.innerHTML += JSON.stringify(headers, null, 2) + "\n\n";
+            assert_own_property(headers, "host")
+            assert_own_property(headers, "connection")
+            fetch_test.done();
+          }, null, null, fetch_test);
+        }, "Fetch is responding with HTTP headers");
+      })();
     </script>
 
     <div id="log"></div>
diff --git a/testing/web-platform/tests/referrer-policy/generic/subresource-test/iframe-messaging.html b/testing/web-platform/tests/referrer-policy/generic/subresource-test/iframe-messaging.html
index 3bfada318f2a..606e18b281f6 100644
--- a/testing/web-platform/tests/referrer-policy/generic/subresource-test/iframe-messaging.html
+++ b/testing/web-platform/tests/referrer-policy/generic/subresource-test/iframe-messaging.html
@@ -6,8 +6,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
+    <script src="/referrer-policy/generic/common.js"></script>
   </head>
   <body>
     <h1>Iframe messaging - cross-origin iframe request</h1>
@@ -17,20 +16,20 @@
     <pre id="received_message">Running...</pre>
 
     <script>
-      promise_test(function() {
+      async_test(function(messaging_test) {
         var urlPath = '/referrer-policy/generic/subresource/document.py';
         var url = location.protocol + "//www1." + location.hostname + ":" + location.port +
                   urlPath;
-        return requestViaIframe(url)
-          .then(function(message) {
-            var pre = document.getElementById('received_message')
-            var headers = message.headers;
-            pre.innerHTML = "";
-            pre.innerHTML += url + ":\n\n";
-            pre.innerHTML += JSON.stringify(headers, null, 2) + "\n\n"
-            assert_own_property(headers, "host")
-            assert_own_property(headers, "connection")
-          });
+        queryIframe(url, function(message) {
+          var pre = document.getElementById('received_message')
+          var headers = message.headers;
+          pre.innerHTML = "";
+          pre.innerHTML += url + ":\n\n";
+          pre.innerHTML += JSON.stringify(headers, null, 2) + "\n\n"
+          assert_own_property(headers, "host")
+          assert_own_property(headers, "connection")
+          messaging_test.done();
+        }, null, null, messaging_test);
       }, "Iframe is responding with HTTP headers");
     </script>
 
diff --git a/testing/web-platform/tests/referrer-policy/generic/subresource-test/image-decoding.html b/testing/web-platform/tests/referrer-policy/generic/subresource-test/image-decoding.html
index 807344dab9f1..9c50ea661938 100644
--- a/testing/web-platform/tests/referrer-policy/generic/subresource-test/image-decoding.html
+++ b/testing/web-platform/tests/referrer-policy/generic/subresource-test/image-decoding.html
@@ -6,8 +6,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
+    <script src="/referrer-policy/generic/common.js"></script>
   </head>
   <body>
     <h1>Image decoding - cross-origin image request</h1>
@@ -17,20 +16,20 @@
     <pre id="received_message">Running...</pre>
 
     <script>
-      promise_test(function() {
+      async_test(function(messaging_test) {
         var urlPath = '/referrer-policy/generic/subresource/image.py';
         var url = location.protocol + "//www1." + location.hostname + ":" + location.port +
                   urlPath + "?cache_destroyer=" + (new Date()).getTime();
-        return requestViaImageForReferrerPolicy(url, undefined, "always")
-          .then(function(message) {
-            var pre = document.getElementById('received_message')
-            var headers = message.headers;
-            pre.innerHTML = "";
-            pre.innerHTML += url + ":\n\n";
-            pre.innerHTML += JSON.stringify(headers, null, 2) + "\n\n"
-            assert_own_property(headers, "host")
-            assert_own_property(headers, "connection")
-          });
+        queryImage(url, function(message) {
+          var pre = document.getElementById('received_message')
+          var headers = message.headers;
+          pre.innerHTML = "";
+          pre.innerHTML += url + ":\n\n";
+          pre.innerHTML += JSON.stringify(headers, null, 2) + "\n\n"
+          assert_own_property(headers, "host")
+          assert_own_property(headers, "connection")
+          messaging_test.done();
+        }, null, "always", messaging_test);
       }, "Image is encoding headers as JSON.");
     </script>
 
diff --git a/testing/web-platform/tests/referrer-policy/generic/subresource-test/link-navigate.html b/testing/web-platform/tests/referrer-policy/generic/subresource-test/link-navigate.html
index 8c5d2c838660..95582f65bac8 100644
--- a/testing/web-platform/tests/referrer-policy/generic/subresource-test/link-navigate.html
+++ b/testing/web-platform/tests/referrer-policy/generic/subresource-test/link-navigate.html
@@ -6,8 +6,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
+    <script src="/referrer-policy/generic/common.js"></script>
   </head>
   <body>
     <h1>Link messaging - cross-origin Link navigation</h1>
@@ -17,20 +16,20 @@
     <pre id="received_message">Running...</pre>
 
     <script>
-      promise_test(function() {
+      async_test(function(messaging_test) {
         var urlPath = '/referrer-policy/generic/subresource/document.py';
         var url = location.protocol + "//www1." + location.hostname + ":" + location.port +
                   urlPath;
-        return requestViaAnchor(url)
-          .then(function(message) {
-              var pre = document.getElementById('received_message')
-              var headers = message.headers;
-              pre.innerHTML = "";
-              pre.innerHTML += url + ":\n\n";
-              pre.innerHTML += JSON.stringify(headers, null, 2) + "\n\n"
-              assert_own_property(headers, "host")
-              assert_own_property(headers, "connection")
-            });
+        queryLink(url, function(message) {
+          var pre = document.getElementById('received_message')
+          var headers = message.headers;
+          pre.innerHTML = "";
+          pre.innerHTML += url + ":\n\n";
+          pre.innerHTML += JSON.stringify(headers, null, 2) + "\n\n"
+          assert_own_property(headers, "host")
+          assert_own_property(headers, "connection")
+          messaging_test.done();
+        }, null, null, messaging_test);
       }, "Link is responding with HTTP headers");
     </script>
 
diff --git a/testing/web-platform/tests/referrer-policy/generic/subresource-test/script-messaging.html b/testing/web-platform/tests/referrer-policy/generic/subresource-test/script-messaging.html
index cdeb1a03ed3c..f73f4406df20 100644
--- a/testing/web-platform/tests/referrer-policy/generic/subresource-test/script-messaging.html
+++ b/testing/web-platform/tests/referrer-policy/generic/subresource-test/script-messaging.html
@@ -6,8 +6,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
+    <script src="/referrer-policy/generic/common.js"></script>
   </head>
   <body>
     <h1>Script messaging - cross-origin Script request</h1>
@@ -17,20 +16,20 @@
     <pre id="received_message">Running...</pre>
 
     <script>
-      promise_test(function() {
+      async_test(function(messaging_test) {
         var urlPath = '/referrer-policy/generic/subresource/script.py';
         var url = location.protocol + "//www1." + location.hostname + ":" + location.port +
                   urlPath;
-        return requestViaScript(url)
-          .then(function(message) {
-              var pre = document.getElementById('received_message')
-              var headers = message.headers;
-              pre.innerHTML = "";
-              pre.innerHTML += url + ":\n\n";
-              pre.innerHTML += JSON.stringify(headers, null, 2) + "\n\n"
-              assert_own_property(headers, "host")
-              assert_own_property(headers, "connection")
-            });
+        queryScript(url, function(message) {
+          var pre = document.getElementById('received_message')
+          var headers = message.headers;
+          pre.innerHTML = "";
+          pre.innerHTML += url + ":\n\n";
+          pre.innerHTML += JSON.stringify(headers, null, 2) + "\n\n"
+          assert_own_property(headers, "host")
+          assert_own_property(headers, "connection")
+          messaging_test.done();
+        }, null, null, messaging_test);
       }, "Script is responding with HTTP headers");
     </script>
 
diff --git a/testing/web-platform/tests/referrer-policy/generic/subresource-test/worker-messaging.html b/testing/web-platform/tests/referrer-policy/generic/subresource-test/worker-messaging.html
index 7ef9b381ae4f..fd7591882e91 100644
--- a/testing/web-platform/tests/referrer-policy/generic/subresource-test/worker-messaging.html
+++ b/testing/web-platform/tests/referrer-policy/generic/subresource-test/worker-messaging.html
@@ -6,8 +6,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
+    <script src="/referrer-policy/generic/common.js"></script>
   </head>
   <body>
     <h1>Worker messaging - same-origin Worker request</h1>
@@ -17,20 +16,20 @@
     <pre id="received_message">Running...</pre>
 
     <script>
-      promise_test(function() {
+      async_test(function(messaging_test) {
         var urlPath = '/referrer-policy/generic/subresource/worker.py';
         var url = location.protocol + "//" + location.hostname + ":" +
                   location.port + urlPath;
-        return requestViaDedicatedWorker(url, {})
-          .then(function(message) {
-              var pre = document.getElementById('received_message')
-              var headers = message.headers;
-              pre.innerHTML = "";
-              pre.innerHTML += url + ":\n\n";
-              pre.innerHTML += JSON.stringify(headers, null, 2) + "\n\n"
-              assert_own_property(headers, "host")
-              assert_own_property(headers, "connection")
-            });
+        queryWorker(url, function(message) {
+          var pre = document.getElementById('received_message')
+          var headers = message.headers;
+          pre.innerHTML = "";
+          pre.innerHTML += url + ":\n\n";
+          pre.innerHTML += JSON.stringify(headers, null, 2) + "\n\n"
+          assert_own_property(headers, "host")
+          assert_own_property(headers, "connection")
+          messaging_test.done();
+        }, null, null, messaging_test);
       }, "Worker is responding with HTTP headers");
     </script>
 
diff --git a/testing/web-platform/tests/referrer-policy/generic/subresource-test/xhr-messaging.html b/testing/web-platform/tests/referrer-policy/generic/subresource-test/xhr-messaging.html
index 1bd1b4c724ea..6ef4a9cfd4b9 100644
--- a/testing/web-platform/tests/referrer-policy/generic/subresource-test/xhr-messaging.html
+++ b/testing/web-platform/tests/referrer-policy/generic/subresource-test/xhr-messaging.html
@@ -6,8 +6,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
+    <script src="/referrer-policy/generic/common.js"></script>
   </head>
   <body>
     <h1>XHR messaging - cross-origin XHR request</h1>
@@ -17,20 +16,20 @@
     <pre id="received_message">Running...</pre>
 
     <script>
-      promise_test(function() {
+      async_test(function(messaging_test) {
         var urlPath = '/referrer-policy/generic/subresource/xhr.py';
         var url = location.protocol + "//www1." + location.hostname + ":" + location.port +
                   urlPath;
-        return requestViaXhr(url)
-          .then(function(message) {
-              var pre = document.getElementById('received_message')
-              var headers = message.headers;
-              pre.innerHTML = "";
-              pre.innerHTML += url + ":\n\n";
-              pre.innerHTML += JSON.stringify(headers, null, 2) + "\n\n"
-              assert_own_property(headers, "host")
-              assert_own_property(headers, "connection")
-            });
+        queryXhr(url, function(message) {
+          var pre = document.getElementById('received_message')
+          var headers = message.headers;
+          pre.innerHTML = "";
+          pre.innerHTML += url + ":\n\n";
+          pre.innerHTML += JSON.stringify(headers, null, 2) + "\n\n"
+          assert_own_property(headers, "host")
+          assert_own_property(headers, "connection")
+          messaging_test.done();
+        }, null, null, messaging_test);
       }, "XHR is responding with HTTP headers");
     </script>
 
diff --git a/testing/web-platform/tests/referrer-policy/generic/template/test.debug.html.template b/testing/web-platform/tests/referrer-policy/generic/template/test.debug.html.template
index ce7761b949df..0faf63bddb3a 100644
--- a/testing/web-platform/tests/referrer-policy/generic/template/test.debug.html.template
+++ b/testing/web-platform/tests/referrer-policy/generic/template/test.debug.html.template
@@ -8,7 +8,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/referrer-policy/generic/common.js"></script>
     <!-- The original specification JSON for validating the scenario. -->
     <script src="/referrer-policy/spec_json.js"></script>
     <!-- Internal checking of the tests -->
diff --git a/testing/web-platform/tests/referrer-policy/generic/template/test.release.html.template b/testing/web-platform/tests/referrer-policy/generic/template/test.release.html.template
index e55a50bdc418..0d63fd68aef8 100644
--- a/testing/web-platform/tests/referrer-policy/generic/template/test.release.html.template
+++ b/testing/web-platform/tests/referrer-policy/generic/template/test.release.html.template
@@ -9,7 +9,8 @@
     <meta name="assert" content="%(test_description)s">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/generic/unsupported-csp-referrer-directive.html b/testing/web-platform/tests/referrer-policy/generic/unsupported-csp-referrer-directive.html
index f639ead4d438..475efa550917 100644
--- a/testing/web-platform/tests/referrer-policy/generic/unsupported-csp-referrer-directive.html
+++ b/testing/web-platform/tests/referrer-policy/generic/unsupported-csp-referrer-directive.html
@@ -6,8 +6,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
+    <script src="/referrer-policy/generic/common.js"></script>
   </head>
   <body>
     <h1>Referrer Policy: CSP 'referrer' directive should not be supported</h1>
@@ -16,14 +15,14 @@
     <pre id="received_message">Running...</pre>
 
     <script>
-      promise_test(function() {
+      async_test(function(test) {
         var urlPath = '/referrer-policy/generic/subresource/image.py?cache_destroyer=' + (new Date()).getTime();
         var url = location.protocol + "//www1." + location.hostname + ":" + location.port +
                   urlPath;
-        return requestViaImageForReferrerPolicy(url, null, 'always')
-          .then(function(message) {
-            assert_equals(message.referrer, document.location.href);
-          });
+        queryImage(url, function(message) {
+          assert_equals(message.referrer, document.location.href);
+          test.done();
+        }, null, 'always', test);
       }, "Image has a referrer despite CSP 'referrer' directive");
     </script>
 
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
index cbe5c3409c19..101f20892106 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
index bdbf8c101283..e5e6a7861d60 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
index 7bdbbc130dbf..9d0ab2400728 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
index 7badfd8b68fc..a8935c2be47f 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
index 456672827fb7..35d6245f51af 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
index f3a056045a9c..dae1ad56c19a 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
index 3498954b5626..86fa9997caca 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
index d474e014b14e..f8712fd2a42c 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
index d4835b418fd5..701ec1dba42c 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
index df7e879bed26..d1b0482e16f9 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
index 4fa4a9e83893..9dcfbac38af3 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
index 72be051717d6..9f8f2d884db7 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
index 1ad65c0bf41d..ca6ada18114f 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
index 81f4844a6789..49a8973c42ec 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
index 1c7bce4c0dd6..a1eaf56efbfb 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
index 370d63871938..70e193434bb3 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
index 81553daeb195..85d4a15f7af5 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
index 9c5d60894ea8..e6863a13df8b 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
index 301c53de0009..9a2dd530ff94 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
index a17c9867c1c3..058e087238ad 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
index 7035e54e0039..20d2c1be3d7a 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
index 4208fb4944fb..c5c0dd241579 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
index 79180dd34081..d5e3b9fe04db 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
index cfcaf54f0258..b3e883240b74 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
index a31e8ef5d949..1415f88e61b7 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
index 59edb33d0c6a..c9e14a5c67af 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
index c9959ff21aa7..1197e4ea08a2 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
index 2d0c22356dd8..c2c4ccdb7147 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
index 91c0a42f51a2..e5da88157d58 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
index dc29dbf6b805..a0e3be12513e 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
index 11bfaaa5011e..ca23aa444bd7 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
index cde4ea0089d7..34a7176c9098 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
index a28f30625e83..621a3f4f5de6 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
index 65bd20884db9..7081357984aa 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
index 1e92417cd9cd..ca8b0837bbb5 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
index 1ea239cd8395..553af1be5315 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
index f0826241b169..5ac87bc663a0 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
index feec9a66a670..389921d4d8f3 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
index dac22586386c..dfbabf210821 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
index 1710dd861f88..233611e69523 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
index 43faed2e5896..133936739413 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
index 53d3ed97e59e..301edeccd840 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
index 9386254ef461..e398d4662d62 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
index 97f3d84dfccb..eb995697d5cb 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
index 9f12fd80e53b..a05ee8ec350e 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
index 7389528742f8..00e0b12f96b4 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
index 3e87aa52cd9f..4e1745300b2d 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
index 8d779a2ac859..99be5759bc8e 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
index f8f58a8ed4dd..8b4c4a85cff3 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
index 61e507067e89..3a808fa1663c 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
index ed912fdbcc65..e6a4a48ef500 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
index bb4ccc4abf27..5b6a0f069f03 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
index ddc4a43ffd78..45a76a77635d 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
index 0adea708a1db..a3f6a8b60921 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
index 2756f3764504..013ad95a13af 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
index a92a57a999bc..eb834de9b0ed 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
index 5effff6c0e03..babd2f18cc56 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
index a386a250de01..a3f6d25c82f6 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
index 041a0deff1dc..7e456c4025a4 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
index 3eed81bb188c..6684bb31ed09 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
index 91e8184af98d..293756816815 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
index 4dca8709603e..695a773b0877 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
index 451de2c941b2..f7e7f0bf280d 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
index 7f40332eebdc..a54cf8649954 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
index 427d70cb5c6d..b7adfc59b0e4 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
index d6783b558892..6639c028e2e3 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
index 329961596054..f6e4ba09b587 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
index 46da8711749d..8aaee1ba91b0 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
index b7cd58894796..0a7d63121c2d 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
index 63841b8db447..5c4afd6b405c 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
index 6b9d4d1c9912..bd9dec511f49 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
index d030178341ff..dd03fe581760 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
index 2aa0c8e1e435..ca38b699f4d9 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
index 720329eab8eb..5b0157e85f2b 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
index 116f07c80db7..47a08ddf8458 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
index 4bc58094681c..be990f2112a2 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
index df2d8fc463e7..8cf74125ad86 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
index dafaeb264430..7cb08817b904 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
index b2aa15f1be1d..2a4bde0b9b62 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
index 8082bae869f3..55ccac1f143b 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
index dd54f1d1b906..36e1fed42e44 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
index e6ab88cc7dcf..fc4a9865cad7 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html
index 303247356881..6cc76f7583b2 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html
index e8c152f1e545..7eb7b8138258 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
index 35f607209b41..c0fe57edd266 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
index fc629c39dabf..dffd45534d18 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
index 7148d4973c43..79d8995f9c32 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html
index 0fefd8d9e764..ab381f0c907d 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html
index 1929fde3fa89..d0b3f5affb19 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html
index acf66a905b2c..b900876cb4ab 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html
index 75e2cd73efaa..834afccf6769 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
index f9fb398c8788..d521c1671714 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
index 559872f1f31b..6299e8ec7f65 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
index ac2bec35ae20..c67433bb7242 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
index 34d782c22c7d..eec9e271431e 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
index f6f19227db00..8b46cf58362a 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
index 149727967ddc..94290a0c4560 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
index eef23b2791d8..dd800d38e482 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
index 45f515c04cb2..96b2d3201b48 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
index 6970b1f74cf7..75f0f3334836 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
index b529c14ef8a5..97c4bb92e949 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
index 54d02b588ca6..f6e9650e2416 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
index 43c1f774cc4d..71ff29503cb0 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
index 8afc89e11199..399bb0c14acc 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
index c8046a61bd93..2ec45b40a56a 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
index f5a167388698..6a93f8429db0 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
index f4bec4504c02..9b72d4bbb75b 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
index 68f694ea714a..a7fac617780c 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
index 4bd40993f26f..6e8a612c8c48 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
index 7dbb5581889f..68cc56301584 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
index 2476110d8ef6..af2ce4df2e84 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
index afb6b13cb43f..33d9214bbe36 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
index 4c6f5692736b..fe4596ea0780 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
index ba9f9a0efefa..0f6a74f590f4 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
index 6517df335314..59fec5603229 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
index 4e15e43099d1..c3bc39e7afcd 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
index 7638b0adf61a..d6efd8973220 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
index 6eb29336a51b..aa00c6f71d70 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
index 1a8e73ce41b7..55083571c65d 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
index 12b0d017daed..e1d4a6b3f2f8 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
index 3ae13145cdf5..6717cc2aa041 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
index 219c254ad1b2..fd9e5863833f 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
index 7f3aa55d9d9f..d7fd00050f69 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
index e69ae0802d61..21f160024902 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
index e199ae2cd97a..aac4a2a3f41c 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
index 2198438fa27c..7e1ce57dd772 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
index 41e2e81b3ce8..05b5362b4f5b 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
index b66d22e3da7d..8d84056e7ed3 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
index f5c003efc762..e09f582d7360 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
index 8e91b249fa76..e4f4232ae868 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
index af01d1e1cac1..d3b557d7961e 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
index 99cfb54efabe..c748f8c251ac 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
index 31d98347369d..7ff4aea0e1d2 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
index 528ebdd0ebc8..cad3acfe5afe 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
index 9a773233f627..6975f78071b1 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
index 691f8033a868..b55f5379b468 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
index 86386e1910df..514baf51fc46 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
index 2d1cf98d233e..41ad2badffa2 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
index dbf7e1148811..36c8aaeafc92 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
index 078f1e84f48b..6cee2216b9f3 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
index d304fee70329..5a67b55e6632 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
index d03e37d4e957..a3d17dd1d0b6 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
index b07d53206cd1..5a33e4c4b502 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
index 1593e0cb3584..c86db50d203a 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
index 33baa60317c7..ba698b85d32e 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
index c31e2ae39c0f..e153ebd848c1 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
index 9222a8c716ef..e1d04f843c40 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
index d8168c9bd1c2..4451804cd8ce 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
index eba59dffadbc..ec8dcc3bb9fd 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
index d1331eb6d7f0..13d58dccf566 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
index 6c9dcdfedc34..e7ed38632b1b 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
index 09d4ca95c43b..ce744e0093b1 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html
index 54342e1433f5..574cdccc9b6d 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html
index 69775f37f672..f452387ad236 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
index 0ad290b7edae..a70858c05850 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
index 139ed4d4fc78..621b14550193 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
index dcd8b45bbbb4..134267bb13c9 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html
index 5e5ec8c220a0..f7b4c6c37e69 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html
index 7fc74dda97ef..dce5baf64e0a 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html
index 2d18c27a667e..ff6b14d5a845 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html
index bca073ce3ff0..d2541d3407f2 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
index abb708940f38..74f1935efac3 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
index 699544722421..2da8ff784bad 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
index 4ff4f97ca7bb..559862ade990 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
index 4c74d8957b6c..844daf18c881 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
index 8d26b422dd8f..293d8c3304b8 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
index 9337d1e45d5b..7571a86f52ee 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
index 27928aa098fc..96939619cda2 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
index 07ddfbc1555d..c79814f0ec87 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
index d60eac9d39ba..04b4a59463f0 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
index dfc8c35b49f1..5c749f4bf973 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
index cf4586caf02f..5246fb54f55c 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
index 0ab6410623ed..3885e8a6a5a8 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
index 53153eb74da4..9de62cd2afbd 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
index a176cffd623a..af9798b9c0fb 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
index 1d6d93b81b70..36464436dea5 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
index eaad1a0a98e8..455693efa7ee 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
index f1bb3cc7079b..25ca0138fa47 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
index 7aee747463a4..dd5055d0e35c 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
index 34e69f7c7438..dbecd94064eb 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
index 42461c7c8291..c58c2c723ad2 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
index 8e2c95011ff1..0b7655ace11c 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
index 76b93cb60d55..fe44085e3ee2 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
index def23fdf12f7..875a8ffe49ed 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
index a3266512ba4a..58af86ef04a6 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
index 1c950d203e8d..fb82ab874ee2 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
index 610a20c12696..bdabcd3f3bcd 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
index f625618a1ae8..542395d1f306 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html
index 678c75ab7d45..178f813a614c 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
index 000ce7b3969f..ff9462ecbcd4 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
index ef883cab54da..a0b8c34f540e 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
index 24510a06613f..c5434c6cd002 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
index 64efe12111b0..0531f45d3626 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
index 0f0dbd681633..8691721fefca 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
index 275e6cfc16f3..4d69c86dd156 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
index 343fecc8a78c..3330e7cb732a 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
index f648b8cf33e5..f159ef61ee95 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
index e99813ab5432..890ab5be5d46 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html
index 1f77326ca746..1dd2d1c1c2fc 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
index 91aa649a8220..4c9e15551ebf 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
index a9d51a2f5ad7..0a9f0a3af747 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
index c56bd5bc4498..563ad1b91b8f 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
index e7d6a220827a..1271218d08bf 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
index 91c171fa6d19..a7b4ad7a5b93 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
index 5ff941231bbf..4ba159c7fb5c 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
index 5b394487e18b..c52392c32480 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
index 59f2fff31ef6..51c5c5247728 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
index 68cd8261ebaf..6edeebf3d75e 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html
index 93adb6103c8b..0276285cd04b 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
index de49d97286f2..2760fdc1ddeb 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
index 3c2855c9faa8..2e65b4d125e4 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
index 0c7d14b0db36..639c0246bb83 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
index 64920f628190..88db01292a34 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
index 2e10439957ce..2663e303da5c 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
index 55dc97173e88..11f22d858586 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
index d08bc429041d..3ce8fa97772a 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
index 5c49deb29f51..c17e9a8461c4 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
index eac501edc098..d3a2a4728814 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html
index 1db72da39cfe..393a92a4ac0e 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
index 31aca378f6d3..2f2926b128c3 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html
index 99902760f7ce..34815f46112b 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
index 8f7caf149403..57cddb7c4a9d 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html
index 0ef53d8e08a1..e0388dbf5e2e 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
index a81bfc961598..a3355ef9732a 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
index db728004ffe4..1aed56a52c87 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
index 62a8de9b1212..4dc27f057f46 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
index a4efdd16e1c2..fc98c1d720a9 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
index 106e6eda1b4a..435a4b7cb4fb 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html
index d1093145df9a..787e03d5b2ee 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
index d8d6b6eabf8f..8dc6c82e1c15 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
index 60d19d4305f4..4a52130cced3 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html
index 9b31ed7bef64..0b5fc2178587 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
index 7990117a9040..5a47798f03e1 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
index bb87b5bda2b6..5fece1114a6a 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html
index b4ed0577d2ca..f3921aaf56df 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
index 36d5d03971a5..04ddbada0aa8 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html
index ee6a4b4ba23f..1d3f7dce1f97 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
index d40a7ac85810..68528a3d118e 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html
index d65fd11b9c83..0485112fb137 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
index 8f80e8154692..c2ae6abed994 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
index 5bbfd0ef4a15..43a2c9c6fb80 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
index a0d023540f22..c6fafef57351 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
index 0515d6436afb..d0b61af2ba9a 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
index 3d1bd73fb7a1..07949589bd71 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html
index f13681a35268..325eaeba031d 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
index e1ebe43e3916..b68a4e51795a 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
index bd6869a2baa0..8f8f01f20fd9 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html
index 3d9b9f132ce7..74cf6d4e7923 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
index 1d35ee33a722..57c858aec840 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
index 44011453965b..097b8cdd3f05 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html
index 86a68a6727e5..c53cf0d94ef7 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
index df3ab816891e..a9370a998dd7 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html
index f1422ed24cde..713221d297a9 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
index cff3a8801ff1..712a2cee4eef 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html
index da2c5b7e1f5d..db4b684c7944 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
index 5f3514b0b466..334c549171be 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
index bc6d22ad5075..9a38440128a7 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
index 1290c5100b6b..5e8d81c2d042 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
index c903683a81ba..a49ecda4db78 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
index d940f0838942..723f22630c80 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html
index ddd50e267bc8..c11e69041be6 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
index 2ef7ddeffcc4..fd4612effbfd 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html
index b9e3c4b3f0d4..b18fbef56a84 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/module-worker/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/module-worker/no-redirect/generic.http.html
index 9ec62aa2d1b3..3edc386aaa29 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/module-worker/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/module-worker/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
index 303a8d018241..4f12853c0fcb 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html
index f7e1767c96ad..52d3ae1264cb 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
index 635660b9017d..cb20e18af7c2 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html
index b2f2be724c15..636bf3735b1c 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html
index 234103dd8f7c..38473b34702d 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html
index c82c8a4e9713..e0d3bd0faf8a 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html
index 32a281aaf9a5..f6a5f615bb4e 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
index c69b1e7d41b9..8a49347b7b10 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html
index 9568f28ecdde..9ab2958e4b77 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
index 65b43ac75cbd..bda2e617536c 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html
index 76805bf942a7..131a9c07803a 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
index e497c4ba0aec..c114a3f8a850 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html
index f2515906f583..f1dc1238a120 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
index f7ca726736d7..44e0199f5b3d 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
index 995443fbcebb..b7b1fc54729b 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
index 2c6590ac4b32..216a1e6cde3e 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
index 5334977c62db..355f562c1d90 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
index db04564136b7..e61542595633 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html
index d4672cd6dd42..7170884a6e3d 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
index eb3a48481c3e..65a9ba9b7bff 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
index 3f28ff207990..20dda3fe160f 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html
index cebab2ca35c2..9beec5d648d1 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
index 05b25458fe01..d02fce2bbeeb 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
index 7dff4f79bbd2..ec472b264cd3 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html
index bb4388c10172..deb8d736bf48 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
index f2a7ddc32962..8fa40cb48711 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
index 93289f82c18d..4f02037581d6 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
index 26d52678563c..bc1c5021a70d 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/generic.http.html
index 7e483a269035..7b2c327c3201 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
index c06245306dc6..e5ea31157f48 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
index fdbd90e2f820..cd54256ad037 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
index 3825e5429775..84b7c650fbf2 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
index 4d7d1e02d9ad..b9e130b9623c 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
index 5d5c4a021bf7..ee64a3991678 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
index e0ec15fca9cf..83168afa28a2 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
index f803cc2e72ab..6e624a4c0061 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
index 4365a3afe01a..206283f31617 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html
index 637ae9566e65..c45116994e3e 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
index fa6e076d365a..c4399815df93 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
index 1b27a92e3da8..29831095ffa4 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/generic.http.html
index 8185f0002716..488a26b43306 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
index 5b2f107682ee..1cf420f9338f 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
index a82dc84b1099..31e5d1662cc3 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
index c9fa90ef0b88..15ff3f5ac478 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/generic.http.html
index 4765b57cd8d9..0dd487b42c73 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
index 1bf43d9a4fa7..b48e453103fa 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
index d71c10f55ef8..ba04f94ac075 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
index 765c59ffd9df..b35d2db838a1 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
index 375e1d4231c0..e923921d1501 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
index 587d613bbdf1..c1b54abd4bdd 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
index 58b04f610da6..3ce103711560 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
index 046b05f8b452..1b4719a32c65 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
index 5f8628516a88..b83af76c638b 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html
index fa09d764d3b5..a370ed358851 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
index f0ceb06c7cf9..fa2e7a8f5d0d 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
index f6f7a8a8477c..485702bc2345 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/generic.http.html
index 8bd07880730a..c412dce6cf1a 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
index 0216050b5aa9..c1c32ba312c9 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
index de157bfd629d..1a73ec9e9590 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
index 71975a017844..852b2a7ac53c 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/fetch-request/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/fetch-request/no-redirect/generic.http.html
index ccddbcf5056c..fa18f832d73a 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/fetch-request/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/fetch-request/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
index f035f115030b..e8a9e5144143 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
index b05eb93ff6b3..7932dd8bb57c 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
index d5dc7e24c1a9..324251c10f18 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
index feccd9a975d2..67df3bc8fcff 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
index f0e0db6e04a7..9000bcbee23d 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
index 362bf8ff2892..7f5cb7c8f9f3 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
index 43704298c33e..ea981ad14d08 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html
index 643174232769..ea935b1d542a 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/module-worker/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/module-worker/no-redirect/generic.http.html
index 38d05a3f563f..e22b638b5d16 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/module-worker/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/module-worker/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
index fd5ce02eca1e..222b078cc664 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html
index 86526c3f5ef9..3c1c41cda1a1 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
index a9135e537c02..954dede4acf5 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html
index 2631486b1db6..d2fc88f0bf9b 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/shared-worker/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/shared-worker/no-redirect/generic.http.html
index 74c932ed4a36..6da08e2e0e1e 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/shared-worker/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/shared-worker/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html
index 1cd5af2177dc..b9ac0adff0d2 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/worker-request/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/worker-request/no-redirect/generic.http.html
index 500eae542739..1cb5b30bafb8 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/worker-request/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/worker-request/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
index bfce0b6d8c08..b0528816da0f 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/xhr-request/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/xhr-request/no-redirect/generic.http.html
index 157ae0f93c04..524e650e983b 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/xhr-request/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/xhr-request/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
index e2b004a80879..0b6580b2ee3f 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
index cffa02a31355..7932926619c6 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
index 622f2bfe56eb..5c88dcae2c9f 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/fetch-request/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/fetch-request/no-redirect/generic.http.html
index 44e6203fd170..2a83f8cc91ac 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/fetch-request/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/fetch-request/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
index ac1ec15f433d..3714b4a982fa 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
index 69224666c667..57b4df568c2b 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
index eb74c6f2b96a..dcf26139b43c 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
index 79098e561dc9..070d4283a136 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
index be002de7b258..9da6e448ba7c 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
index 77e3b3c11030..2159b24e03fd 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
index 151c44ad31b7..aa032ca43e34 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
index 368ad71f83ce..6e0dcd4c2c12 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html
index 6b96346dcc76..25559421d063 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
index 349ad2046095..04bb56842b71 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
index be53cee6f8e5..da806358dbea 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/xhr-request/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/xhr-request/no-redirect/generic.http.html
index f8da5cabac83..253f15de81ca 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/xhr-request/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/xhr-request/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
index c3a50470784b..3b5271935c29 100644
--- a/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
index b3ab54550792..822706864ff0 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html
index d4bf7a1f1dec..9455ed856d36 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html
index d762dee151ac..a6512954b88c 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html
index c9d1b4e49be0..af8c262adf25 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html
index 927ee8c2e2f8..2b634b85e406 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html
index a3df64017d96..42ed329bf253 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html
index ff3342e75ee8..9e78e962ca6a 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html
index 74205b4add2e..d34b4ae25bbe 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html
index a303873f893b..f8a200230bb1 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html
index 4c6c29ddfcdd..38a61d264a7b 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
index 99144cde5445..0626306d65ad 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html
index a33e68004bb4..f0dd273c3207 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html
index accf8eb7510f..0687cc22f529 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html
index 58aa461d790d..7b6dd7b981a4 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html
index 9924d010f774..c371ce99322a 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html
index 421dfc01dde5..5bfef0ff661c 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html
index 78f45838ed89..856951865ef6 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html
index 6bfcaa405804..098b987b99d2 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html
index 66360f4eb4bd..2d8217031d18 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html
index 19daec1b686e..fce7ad9933b5 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
index db98a1c7e9fd..eadb3d1d614d 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html
index f64f19a72683..1bcb41746d72 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html
index 390a5f5a8b2f..8f3c27f7e6dd 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
index cb9953893e2a..6633b43a0efa 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html
index b9e48fe21873..36941155b106 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html
index 91441418f739..fc05b1e52c38 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html
index fb3699920a17..56560123ce3b 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html
index b5209c4858d1..318ffd577a2c 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html
index e725c59f612a..dea7ad286eef 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html
index 50ae40ee38c0..46c715d6aa2f 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html
index cd50a0c73618..12903c4da403 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-upgrade.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-upgrade.http.html
index ce16bd7550d1..ca0b0b1b5f56 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-upgrade.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-upgrade.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.http.html
index 50e426c1fee8..19cf59322f7b 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
index ce5af8884f8c..77452623c862 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html
index f089bb5418f4..f0c9e6fd969c 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html
index 080b7afc6bdd..2aed178fd08a 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html
index 7bcb5d59a582..4e184519eb8b 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-upgrade.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-upgrade.http.html
index 4bb082ea49f8..9063bbd5ee50 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-upgrade.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-upgrade.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/same-origin-upgrade.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/same-origin-upgrade.http.html
index 4da9437134fd..56bc742d64d4 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/same-origin-upgrade.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/same-origin-upgrade.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html
index c3733730a056..3209c5beebf6 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
index 9f902d25220a..d78b7146ccef 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html
index a0aeaaaae514..f4902bd2726b 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html
index ad6787e78f7a..fac6166811f6 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html
index 4a00eabbcedf..7385003cf8a6 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html
index aef8b034271c..5e3a82f01bdf 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html
index 174286a0f9c0..6eed1d7792d6 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html
index 3fc318a61f70..cc3f2c42a094 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html
index 347ebc1f5ef3..c9f973b9bfb8 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html
index 9e3c50929b68..6850d329d048 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html
index 1437c09ff829..a27a2ee4e040 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html
index 894f2190227b..67a7335ef210 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html
index 4bac2f359201..bace41398536 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html
index ca8069f30b55..ebedf9e28d12 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html
index 0f50430ef1c0..58121f98f3a5 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html
index 036b2a536ebe..7381c138364a 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html
index 361e380f85ed..5117e3dd82aa 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
index b99ccab0779d..637ed02656ef 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html
index 0fb80285ebb5..20fe88fde19b 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html
index 302bd2405795..224fc53a05ed 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html
index e94605844b4a..856662a7799b 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html
index e216544db003..17f78140023d 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html
index c9a82a7ec97a..53d9a7044115 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html
index ec1aa5fe20c7..423c8ed2078d 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html
index 21e76cbb71f7..790b68586f77 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html
index e70bb298ad23..1dae9fecc533 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html
index 221f559302ec..75644a3ccc10 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html
index 4231bf5a5c4d..2a226c6e18a1 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html
index c52248944d9c..e1c3ecd12860 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html
index f52c97603ada..edd101a837e5 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html
index 3260bde8f758..37979395e124 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html
index 87ef4d3d75f1..bc7c6d02d50a 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html
index f3dbd367410f..f9fbbbc3233e 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
index aed37136cba5..f481aa975e94 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html
index c16e78db1fc2..6ef928b6e193 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html
index 86212da23f36..b253ef852833 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
index b90134b21ace..2d20c7c6dd11 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html
index 4b0dcf7c2937..67169cf167cf 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html
index 8f70ddb5f589..d21c6bda10de 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
index 70e6d49f0885..3859dcedf3c6 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html
index 2b5ad603b3ca..77f71fb39247 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html
index 05110163091e..024d43ea15a2 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html
index 791dcb00a422..fa35c1f3e97b 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/same-origin-insecure.http.html
index 5c9f234f5707..291f4928bad9 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/no-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/no-redirect/same-origin-insecure.http.html
index add6afd25239..f4006d10ac47 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/no-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/no-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html
index 98e6da8e6bb9..61669344ddd7 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html
index 9d29a062d986..4daa0771923a 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html
index e00321d72c9c..369e98e0f073 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html
index f525e4b737b7..bac83829eb53 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html
index dc152b1c1c3c..b6fe7805564b 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html
index a775758ece48..1ae15983f6cd 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html
index 92a2d44535a8..14159b0d5b97 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html
index 8f18dd1eca21..3ca50f3d66f9 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html
index 5f68ddb6d6a9..5bddea2b1cd6 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
index 0f397527f7f7..9798ee5b0459 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html
index 272b00eca265..79e75063576a 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/same-origin-upgrade.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/same-origin-upgrade.http.html
index d926e88b7cbe..ee78d6ef1e93 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/same-origin-upgrade.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/same-origin-upgrade.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/same-origin-upgrade.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/same-origin-upgrade.http.html
index 35523543b1d5..0019b7d1f336 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/same-origin-upgrade.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/same-origin-upgrade.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
index cba63f68e23c..f4020bdff8a5 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-upgrade.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-upgrade.http.html
index f44abaac86d6..48dcc5d522e8 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-upgrade.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-upgrade.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.http.html
index 7666ac3fdcc4..6cc4669d9882 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
index 098ff416ee53..b1bacfe9bbad 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html
index ac60e28d9f27..08156b668c4c 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html
index c7c01131967d..ae1f44978c7b 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html
index cd1bae5c0662..7b0f9d4b3b7d 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-upgrade.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-upgrade.http.html
index fd4d713c8a7a..633eb15d97a9 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-upgrade.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-upgrade.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/no-redirect/same-origin-upgrade.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/no-redirect/same-origin-upgrade.http.html
index 7d2da9aebe11..b7dd2d260b23 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/no-redirect/same-origin-upgrade.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/no-redirect/same-origin-upgrade.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html
index 60a11860cca1..d968e31f4620 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/same-origin-upgrade.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/same-origin-upgrade.http.html
index 9b24a9b82274..cde3c4dcb62c 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/same-origin-upgrade.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/same-origin-upgrade.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/same-origin-upgrade.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/same-origin-upgrade.http.html
index 351d30bd251e..69e0ac3f3922 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/same-origin-upgrade.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/same-origin-upgrade.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
index c665e5b43f57..f9f5cbfc2e0e 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
index 05b86531109b..6a1e8da86f08 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html
index 97c82f66ef04..cae0548b2819 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html
index 9537a48957f8..dfbdf4e37415 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html
index 368b0ee16190..33a64908d8fe 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html
index 4211efaba0b9..99d89c892d94 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html
index d60f065db504..efc15af9bbc1 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html
index 662e24872c2c..6457b6d07b63 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html
index 38948e13c4c9..b4895ecb1cac 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html
index 907cc36092e1..8253f1e26e28 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html
index c75f25713b15..8319c47992e8 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html
index f39fb3987d11..c96142058fc4 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html
index 7e6874220874..fc6604637854 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html
index 17bd96e9ef90..a821ec58add2 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html
index a9a7577a85d6..f86d0e825ca1 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html
index 11a875323c74..f4826c63ac5b 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html
index a0ed420f9428..d83650ee3661 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
index f1bf5cd08007..d2784edeecf7 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html
index bbd7756d5525..48676a9744de 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html
index 293db9a254e6..2812882a2ada 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html
index 33680a395085..cc13e377b14a 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html
index 9374b0c9976d..bbb011122af6 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html
index 2b6af670a40e..6d3ec1b96339 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html
index af557c3e0970..76c95cdea767 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html
index e5013b496c53..114d4dc86564 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html
index f8f883c5a557..0b7378bd620b 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html
index 071c2023856d..d5e863d2ea5f 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html
index 4f717db0327e..94f0f0b675e9 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html
index 7fb3baf96cc5..4a1ba7ae95de 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html
index a5d2f72ea379..7009e93f4b93 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html
index f3aa717b93af..219ae6d84980 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html
index 8e682a3f3d30..df5a52f9a859 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html
index fa83b85d0747..7436b3978965 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
index f3686ad81e8a..ef7b77d48eb7 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html
index 7e81614e044d..ebaa47c7220d 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html
index 331bbdc50e38..6cb598b38189 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
index dac39cccddd4..f7b661028921 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html
index d18ea4abd82c..cc2175edbb9a 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html
index 09d5070910f7..b8cecaeed147 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
index 695925490df5..ba8b28780dec 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html
index 0da5165131ed..9aa2e5128fc6 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html
index 0549934ffda9..9d997bd1ae90 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html
index da3532e1f2ec..0245434f37cc 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/same-origin-insecure.http.html
index 2a4336594a20..12b857b64dcf 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/same-origin-insecure.http.html
index 2ef56b06f566..056ff4efbf29 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html
index 2daf158239df..969d7e8dd4c9 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html
index 13d8b9b5c4a9..091ce5d0eb1c 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html
index ac38dd8430bb..9be9f24e6ee5 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html
index 31b0ed5f974b..8a7bdc29a40e 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html
index 68e7b3b79541..4618f8eb3e52 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html
index 7ba521e0a07e..3bd6428d3272 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html
index 23de8a050429..497b8f617482 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html
index 400db8eb15a5..225c18eb7a0f 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html
index fd20ee80fc36..eb3e612fd3d9 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
index 2df2a64f1571..ef09fe30ce3d 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html
index 410b0f60abf5..2111a0cf7c5b 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/same-origin-upgrade.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/same-origin-upgrade.http.html
index e8a7f7a9a922..f0adebf34b3c 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/same-origin-upgrade.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/same-origin-upgrade.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/same-origin-upgrade.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/same-origin-upgrade.http.html
index c453f6b20577..4d5714f87f1b 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/same-origin-upgrade.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/same-origin-upgrade.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
index 97964228c16e..6578bd1e6311 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-upgrade.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-upgrade.http.html
index 54fbe6c6b23f..94802477e7b3 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-upgrade.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-upgrade.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.http.html
index bb4c5d584e80..a4298049e507 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
index fa5da93f3207..548e63ea9741 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html
index 1c793e5d20f0..32da6f1eaae4 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html
index af71d2cb0af2..c7367f706597 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html
index 7b048dfdd0c5..a0e33c7205f1 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-upgrade.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-upgrade.http.html
index de54508cc614..c80a3c7e52f6 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-upgrade.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-upgrade.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/same-origin-upgrade.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/same-origin-upgrade.http.html
index 2cb2c9cafa05..e7e65e19ec66 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/same-origin-upgrade.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/same-origin-upgrade.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html
index beef748465d4..42ecdbc0fd8b 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/same-origin-upgrade.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/same-origin-upgrade.http.html
index 7ff81f1acad8..c6dcc471c47d 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/same-origin-upgrade.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/same-origin-upgrade.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/same-origin-upgrade.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/same-origin-upgrade.http.html
index bbacb9889fa4..53505abe07c2 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/same-origin-upgrade.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/same-origin-upgrade.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
index 75cafd9d0134..76b1b2df5fa3 100644
--- a/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
index aa620be40721..290d81d821a6 100644
--- a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
index a75718db06c9..403b08e5dc7f 100644
--- a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
index 685c62057bed..25e9e2f45fb7 100644
--- a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
index 7914e4c57939..0ae83292f8a2 100644
--- a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
index a24dbda650f6..7358e1c70194 100644
--- a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
index 7ec3eda9fed5..77b87b8cb976 100644
--- a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
index 214480ca0ea7..e8ba9a759403 100644
--- a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
index 1a4d14979f2f..9be1730a90ea 100644
--- a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html
index d120b9c15545..a7d72f506184 100644
--- a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
index e634d528dcd1..9bfb0810d3d0 100644
--- a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
index 41d7e859d41c..6d528c04d013 100644
--- a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
index 48189b1adabc..5622a50bf201 100644
--- a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
index 8f7a234ad56b..dfdf69fbcdc6 100644
--- a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
index 8a7a4cd9f655..f5542f97e1cc 100644
--- a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
index a86839417746..8cec185e133a 100644
--- a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
index f4275d6d7a87..9cb253f3569f 100644
--- a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
index 248ffa35a821..2ce74e688b97 100644
--- a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
index 16c44750747b..0a24543d610d 100644
--- a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html
index 8bf0a00458eb..463b67ec4ae7 100644
--- a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
index 611336e515fc..10ef951d91ee 100644
--- a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
index bdf2c0192a84..899f078c943c 100644
--- a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
index e5f01e669324..ce0b1252eae9 100644
--- a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
index e471f0a9e754..39304901c558 100644
--- a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
index 8f7e7201ff88..987106249042 100644
--- a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
index c52859bbb7a0..33d76d384f2e 100644
--- a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
index 30075aff0b6c..56a0eabe7dfa 100644
--- a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
index 3f84d37ade11..2befe6ff3818 100644
--- a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
index 7a233bfc2fa2..84333fbb7ab8 100644
--- a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html
index 3e523d9f3cdf..15cd9b2b89ab 100644
--- a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
index 532f0c5c33c5..10984fde1aa0 100644
--- a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
index f9c2b476b4f7..e71d09acc8f1 100644
--- a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
index 7ff76ce07474..c9cb06842c57 100644
--- a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
index dc86ae02073f..c6f8e1490fb9 100644
--- a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
index 3ed7638a2fea..dd44b6679a86 100644
--- a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
index ea62578df2b1..2ae35e050394 100644
--- a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
index 50d5a6cb205a..2b7cc6d59540 100644
--- a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
index ca194603e195..a6bbc66d32ca 100644
--- a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
index 3617e7dca8c9..554665cd3e0c 100644
--- a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html
index d21d561aedf8..6237b64bd34a 100644
--- a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
index 2b9cf9506256..6eae7c560197 100644
--- a/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html
index fffd1490fee6..5592aa5d0743 100644
--- a/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
index ab66756f26db..758ab5767204 100644
--- a/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html
index 8ee2450b5c6e..35a5049a54b4 100644
--- a/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
index 6b84a807ddab..851b077e6a20 100644
--- a/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
index 3f368591eebe..cd93dd64a82f 100644
--- a/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
index ad08efb479eb..3cdd172581e4 100644
--- a/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
index e7a40a8f5b58..34be306a1b08 100644
--- a/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
index f3a1ceb24851..33fe33fb1e9d 100644
--- a/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html
index f742fedda5ca..eecbe272b070 100644
--- a/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
index fc5ba70b0f52..90f8d6aa6a12 100644
--- a/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
index bee7e7c7dfab..8f88eaf53e0f 100644
--- a/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html
index 7bbb4f14eda8..3df62ffabb05 100644
--- a/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
index b318b3d1b529..f9961c352bf4 100644
--- a/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
index a245060678ae..4c124d2982c6 100644
--- a/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html
index 618f72716bf5..29b6635f9694 100644
--- a/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
index 9bccee1d35bf..501315b2bd40 100644
--- a/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html
index d134273d38f7..b8b2f5ad6377 100644
--- a/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
index f33f2a41642e..ddae157a6a23 100644
--- a/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html
index ec0f304dbd4c..b484454134d5 100644
--- a/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
index 1283487e5f29..2219a9204d1c 100644
--- a/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
index 10f7d424f2a9..22559b1097af 100644
--- a/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
index 4b988f93a4fd..ddfbd4e197e8 100644
--- a/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
index 3989f871abdb..23df7f0ad7c2 100644
--- a/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
index 393b5c8f2c41..767c138725f0 100644
--- a/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html
index da1a319f11db..414cae5d65ee 100644
--- a/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
index 51e7b9f026ec..081b8b55fcd7 100644
--- a/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
index c3ef83c913ae..fd3a69a85ba5 100644
--- a/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html
index c3e754769d78..65a3a532696f 100644
--- a/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
index 36d54be09f7a..6fb1b31b1ffa 100644
--- a/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
index 8f5729a5ff80..d8ff89441f73 100644
--- a/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html
index ad5192f22bee..58fbc4829c8c 100644
--- a/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
index bff291d441e1..229787117c6e 100644
--- a/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html
index 38d2b85996e9..7b79cdeb4322 100644
--- a/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
index 4c6c66b676cc..2a421f846523 100644
--- a/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html
index cd8d5a5be9d4..df23d02dd855 100644
--- a/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
index 9f3da6f3ab8b..0098e8f3e103 100644
--- a/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
index 16a0ea6f259c..6254fb8c7617 100644
--- a/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
index ad1fb82a0925..8454f0665a84 100644
--- a/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
index 9f2b156b000b..381737defbd7 100644
--- a/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
index fede3d587f1f..7b600cbbd4c9 100644
--- a/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html
index 433f7e593ce3..f6631d88424c 100644
--- a/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
index daed62fc5e4d..4f087234601f 100644
--- a/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html
index 615d560eeb19..db8e7be2376b 100644
--- a/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/module-worker/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/module-worker/no-redirect/generic.http.html
index dac70645d79b..5a335d0863ca 100644
--- a/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/module-worker/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/module-worker/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
index dac34ad4b559..04027e95f075 100644
--- a/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html
index c649d8dd535f..37037229b118 100644
--- a/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
index 1c621fddc142..13473d515afd 100644
--- a/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html
index d8b420b1cffd..82ee6907051a 100644
--- a/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html
index 4fcae6272f18..333f687308a7 100644
--- a/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html
index 144995f92ee2..be0f44caff62 100644
--- a/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html
index bd0400245b5e..744281736065 100644
--- a/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
index 93c9e35cb174..619ed34a3315 100644
--- a/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html
index edf049b19687..015a044daf61 100644
--- a/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
index 92eb517ea4ca..2b3c2527b36f 100644
--- a/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html
index ae73fbcb869e..f3110e130184 100644
--- a/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
index 37b908384578..02d91a903e9c 100644
--- a/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html
index 9f077babd838..064eea5a3a14 100644
--- a/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
index 57d7d3a04c06..d92098a3114e 100644
--- a/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
index e857f4c73716..a8f6d4c2b007 100644
--- a/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
index 1b49b8f82739..22b20d3b146d 100644
--- a/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
index 44ce1077bd62..e4c0e8e69935 100644
--- a/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
index 84bd7f157852..30a7422fe640 100644
--- a/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html
index af0626314763..99c436d7fc88 100644
--- a/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
index c05be86fa280..a94ce6d57bcf 100644
--- a/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
index ea519ad8b0f1..9f262c082981 100644
--- a/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html
index 34b777898723..e4d50953a687 100644
--- a/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
index 770a09f7085a..3a3e505e007f 100644
--- a/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
index 734bc6f95c3c..8cf8a9db06f2 100644
--- a/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html
index d050b563c4b0..f0e9bcfe4ed2 100644
--- a/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
index dab9d524b50b..9bb9159faae2 100644
--- a/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
index 84dea491ddeb..0d7566945019 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
index 7b1cbb26b035..66cad9817144 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/generic.http.html
index 99c2a35a24a2..373a9a1fb9f2 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
index 74d96730f03e..0661bda2b555 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
index 9ce9bede537d..95cfae3151e6 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
index 506e55c79202..5631be4380a8 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
index bbab94c8bbd6..c5f2de32e715 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
index ec567113e3df..e676621b20b5 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
index b8e5a1e0abcb..d1f431ffde70 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
index c4c455d4c18b..10ba9c188e19 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
index 7c00437264b9..78762fe53c6a 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html
index f7e611b03251..8580bf41ea14 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
index e813a79bb07e..740cca8ff169 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
index b399c06afde9..38096523b07b 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/generic.http.html
index e9329317d5f2..9d1db30f66b4 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
index 2139b0b14f63..f28bd6734a5d 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
index 71695073c1d1..ad1d0d06a667 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
index 5e689a460087..52ea79ea3de9 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/generic.http.html
index 397d206f62dd..45bc707ab0b0 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
index 0ccd881d9fac..d80387047c91 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
index e7e41b63db23..6465e10c9057 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
index 03081d0abfb4..413690e8da87 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
index 18ce9743bf76..602ec76bdbea 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
index a5950befbbfc..1a987e7f595b 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
index f8a80aa5a060..b7d113508620 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
index 2e5e19e6251a..312c8d556e97 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
index c7ebf4abcf50..ba9d5d08f7ec 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html
index 3a9187bcf99a..93a164d270f1 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
index 0cbaa017b59a..9b8f447e5148 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
index 3737ab6a8f72..8b1a8ea3d042 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/generic.http.html
index 4c384414f318..d40d7b41133e 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
index 037b7a011e57..65bc469879be 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
index 0cb67fe3056c..69c724f4eed2 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
index 16fd9997ceb6..cba7210bdf0f 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/generic.http.html
index d38c1b6503a1..54122bd8d5fe 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
index 074b1865ee5f..a83eed311088 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
index 9f644b23c8c3..493f79902c7a 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
index b9ac4730a345..4aaae188f74a 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
index f4342e37e643..acf0c7aa0254 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
index 9ed44e5a4287..99da41e73470 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
index 6dd14610457a..756dfb3cd2f8 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
index 821d533f6f2e..65ed223f1ec8 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html
index 06d6ba95b185..87ebfbfa0b0a 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/generic.http.html
index f4357c15a394..0cf72a93e9e9 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
index 53a65a9c8147..96e7d4e7bf93 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html
index 73766d21c75d..d6c28231cd3e 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
index a534338697f8..ee9ad9993775 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html
index 90f15d3fac0f..09ccab6e19f2 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/generic.http.html
index 4e4bd6e90a57..36e0f5d34f46 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html
index 8e69d73f9b80..69a8c2c1d09d 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/generic.http.html
index 400e92543337..4d4e8ef2ddb6 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
index 94ec3d20dfee..e33ca1b5f933 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/generic.http.html
index bf854e141359..e966c29b6282 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
index 45a441abd8e1..175441c9e669 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
index ae8a1cbea7e4..f323ca74bd4e 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
index 487a4e01ca71..21828b7b73d3 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/generic.http.html
index ed9dca4b815c..cadd6aa50ead 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
index b48fa8741d9a..ac6d689b5ad2 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
index b70b01384f4f..92c2e4d40a95 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
index 8bca726055ad..eceedcb150a9 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
index 5145f3b87fc3..e847df8fff2d 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
index 49aecc71a730..9cb83cb0c97a 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
index 8e306510727d..700d95828b0e 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
index e8cbb6677228..73c907dea435 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
index 348ed773848a..2b7786cd384e 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html
index 72ff5190be39..15ff14f65cea 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
index d790e13840b1..ba8411200fd6 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
index 1a05902082e8..60df8dd48245 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/generic.http.html
index 5d798f540bae..a119d66bea15 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
index a11d44f1750c..47c8084c38ee 100644
--- a/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
index 27be3854a1a5..8d4c19c4863d 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html
index d781a3c846b9..14e928ea859a 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html
index 10d6d0240db6..0e549ae0d402 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html
index 692bceabc2db..ea0d402325e9 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html
index 560438ceb146..0acf101b8ef6 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html
index e2e3c145807b..7026fe1d12d0 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html
index 4d1c319f03a8..e8bb9ae8580c 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html
index bc7ee277cb44..0c7b71228174 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html
index 7cf53822096c..eca111bd511d 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html
index ec99ff4cd648..f46299630e10 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
index 2b47852898b7..59943a3ee452 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html
index a2b03cece1f7..73f992b65570 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html
index 1ed9506e591f..7fc3541bc7f5 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html
index 10d8d55e4fab..73ba641f908e 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html
index e5599ca5d60e..172853a4fec0 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html
index 5982a1a2e534..b2104f4cb599 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html
index d843f6e38992..c984c4363e8a 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html
index 22e5916a6609..7b61c2621889 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html
index 32fc200c5067..aa3b6aa07b15 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html
index 1b402276e3ce..b993d95afa40 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
index 16e801bc89a1..a384aa04e3be 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html
index 3877ada9427d..4cb71bcbf195 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html
index 1fc0adb4d097..66abd90fd5d5 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
index 190220f0161e..7c366c1080eb 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html
index fa4064bb6c4f..11683e44beb3 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html
index ce1a841dae75..617093728176 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html
index c779d1494644..594c2984df61 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html
index 949c1235c238..0a4d82c7eed3 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html
index d24966f203f5..7eee32a0406d 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html
index 5a995aa042ca..f92bf349cff2 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
index 08319d5faeea..f17556c54bde 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html
index 31692cca4601..fa91f2cbb38b 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html
index dd06b82cb0e1..ddd0fd439071 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
index b5c99bd430a4..f04cea14e663 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html
index 06780d9504cb..18dba0048818 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html
index 5e57d9aba05e..9d8b2b2c4e1b 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html
index ac2b34d45167..2befacac7af3 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html
index 3db9b5d5ff68..988c99d5c60a 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html
index 81023157107c..7588d84e0932 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html
index 9cffc3a3e9ec..3e2b36979fce 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html
index 77090c12734e..b26c3efdc2a5 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html
index e36ed4dd893a..c7c348f90ba8 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html
index 90de6fb92aa8..126e278b4b61 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html
index a483e45c53f4..f22d6d87b88b 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html
index 88e761fadc95..90dd8881d536 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html
index ab9b34004e60..8dd055d71c36 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html
index 2ae899937a5d..32248c739405 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html
index 318ac0f04b6f..4e41494b8696 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html
index ca48b235a3c1..08973c57153d 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
index 1556581d911c..54629cb45b84 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html
index c0284a4616d1..863791529723 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html
index 8d701f4364ad..1e66182f0985 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html
index 3ac0dcc95125..289a4a50700f 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html
index 3450d8e1de8a..4d44a10b7645 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html
index 2aed29beb92e..d76ff641aa58 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html
index 594eb72381e0..37d4e3e46e72 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html
index 6531c27e7874..2757dabaad9c 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html
index f3ea627adf95..8a405470c4a0 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html
index 6abc50ecc594..f5c690b8bfb1 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html
index 6f11fcc8b054..ba1424c06188 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html
index 2a7ea1cedfc0..7aebb65a521f 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html
index dd9cacd10243..8d145be6b4f0 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html
index 67d90cd44b53..6d334876d900 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html
index c6962cf03cf2..941dd867f2c7 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html
index d7f3d697bbb9..41e0570ec785 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
index 8076d219244b..1af12eb18e32 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html
index 7512b2edb96d..8f72529b6fb6 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html
index 61a4547ee831..36e5d0a32c82 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
index 231760371381..87cc414978a3 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html
index d256320b428a..41d8f63f2dff 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html
index 54a2aeeabe4f..e9082a8036a1 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
index d2f96231f11b..731cb633995a 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html
index 39344d054d2f..94a1ceca87d0 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html
index aa394e3a5a7d..0e0fc8e5b5fd 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html
index b1cd787f6825..b5f8a4cbd3fa 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/same-origin-insecure.http.html
index 632f1e32a0c5..8da4f3b3be0d 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/module-worker/no-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/module-worker/no-redirect/same-origin-insecure.http.html
index 2525a167f469..424221d94140 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/module-worker/no-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/module-worker/no-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html
index 1d754d24a8a0..bbc8f26a5833 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html
index 8776fdc00836..d373139d1e20 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html
index ff1f271128fb..49468d12539f 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html
index 9b189b5f669b..84f4c4707ed0 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html
index b190d3b199df..e7d9438c14b4 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html
index 84bf6dad89ca..5f8f6c1e7927 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html
index d7efdd2da6ed..44413d7b167d 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html
index dd169e50c8cb..c3be3878ed06 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html
index 8806a014de25..f4800516d7e7 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
index e4ce94ad2b88..ce60482bd768 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
index f1fbb2b4179e..5714a7e068b8 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
index 1555a3d827a6..ca5c1fd4b045 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html
index 7e27cfdc3207..934fb53a6e04 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html
index b716504830bf..755075a17a1d 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
index 0c8e45be8757..56c1bdb7dd4c 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
index 22b88b8b66fc..319db6a902f8 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html
index ec43372bfb1f..98643446686a 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html
index 88f90ba82458..a70bbb7ff135 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html
index 5f24b6e4dc68..2199fbacc2ee 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html
index 0d03f45be563..0038a1a78abe 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html
index b289aa53466f..8555bc6ccfdc 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html
index e7001e502cbd..bd2014b069f6 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html
index 903030acab07..b519ebcfbc23 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html
index d0d28622838f..a70f22d69d07 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html
index b6c3033e8f06..633938985b4f 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html
index d714cf6cfcf8..b9eefbc30428 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html
index 5c37342fc29a..82fc3b114408 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html
index 219a866303d5..bbcbe233fbff 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html
index bab1422ce4f8..fd270955f744 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html
index dcb2fef2e5eb..4739c58478c6 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html
index 4afe764b7475..fe6f02837a22 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
index 59c9006ac007..80f337f9e74f 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html
index ecc047cd0d18..5d0f8168ca8a 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html
index 3bc5d625b4ea..3a4fb95e8252 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html
index f0b53109a4f2..20c2f4f497d6 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html
index e3819a3a25d3..d3ad1f9c4242 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html
index b6ac8b10fc93..5de6a24aa4ba 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html
index 2b9112f6f128..d39c95d82dc8 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html
index 9ee2002a7c35..df9f3a839898 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html
index 2c4115e98fda..729839842efb 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html
index 6f2bfd58ff69..f5e5c5230c11 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html
index b10591c4cd9f..5e03688c4315 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html
index b7fbd2643d1d..346e401ef9b4 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html
index da50e5c4fe26..27d89b3c0cb4 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html
index 7830d6f47be5..045dc06177ad 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html
index 99dd29eefba5..aadf71777465 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html
index 465007eb7544..aada3951f967 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/cross-origin.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
index a88aa71cfaff..ab255afb9bd5 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html
index 3f8cae052646..9bbbfb72fcde 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html
index d92b1c116cf8..6d7a54cdb11d 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
index d8951158b03e..8117e29c06a7 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html
index da4812eee49c..34859ed87a4c 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html
index 9254b47bd740..e73908952d22 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
index 3dd09242a866..0080977a7279 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html
index 14a541ae27a8..155bf01095ad 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html
index 1763d19a6423..7b3442d29e1b 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html
index 9ec70b6f80c1..fe2b40c58d48 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/same-origin-insecure.http.html
index 52d5a74214ea..c0d87fa32023 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/same-origin-insecure.http.html
index dd0c6631674b..8586b96fe8b0 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html
index 4f157deb995d..18f3dbc804e5 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html
index 7d233267d311..f296512efad9 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html
index a1e1b9da5b51..8eaeb5cd8de9 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html
index b2bbee56b96d..548025dafc32 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html
index 01c45482b293..d6e828c54d51 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html
index f31661fc41c5..2e459e3d0592 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html
index 68c1c1076fa2..0760ef944d86 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html
index c301290fa9b6..9ca4512215a1 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html
index 02109248fbc8..a8ec1e6acf1d 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
index d8de5bbd9744..5fdacce40e78 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
index 4a376c18d6d7..cac271986ec5 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
index 64d2fced4a61..7023a52beae5 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html
index b6966365114d..a6be79bcd4a5 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html
index 591f211dc02b..70602133f848 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
index fc88896bc4b7..27a95b7ad14a 100644
--- a/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/same-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/same-origin-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html
index 0c23a10a2dc1..0f00dc411852 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-insecure.http.html
index 05d3c57afef2..410b5da8bad3 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-insecure.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-insecure.http.html
index 649fc0bb3d98..ee981716bb17 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-insecure.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-insecure.http.html
index ceb1df9c8257..7f80e3dc6137 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-insecure.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html
index 518a983bd0f4..e1acb81c2ed8 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html
index 1891f73b445d..8f524a23ecb6 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html
index 0510bad2d507..d1d3bfbf4cf8 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-insecure.http.html
index 36d2e8bdd190..aa2b89c0219c 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-insecure.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-insecure.http.html
index 9235e2fab57d..3d35d85a8a3f 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-insecure.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-insecure.http.html
index 4ed01baae9e9..6185377c16f5 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-insecure.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
index 1d76bd4ee31e..9e10c7fa3487 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
index ea4a9cd9a70f..6b6302a6a3e7 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
index 113c6de0b3a7..bcdf715662d9 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
index 9a13daabc2a3..18ec84b8a53e 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
index d611bb5ef5ba..07bcce770a9a 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
index e6a2f230bc47..81c5c0b89b35 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
index 61ab89776914..3e08734ae731 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
index 8f69b50885c2..ad88c2de7a0d 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
index 00ec7fdac746..62cfcfbf644e 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
index c36fc8dd9873..867f86fc9378 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html
index 977b03a760a6..8ab2c077ffca 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-insecure.http.html
index 6665152dcbad..14ffec0f8223 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-insecure.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-insecure.http.html
index b3212e1130b3..1dd3145951f8 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/same-insecure.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-insecure.http.html
index ebb494d4ad4e..fbda921ea186 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-insecure.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html
index b43d0d9d83b3..0ba667d9c74e 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html
index 0b7fff638ff0..abbc2d80fcac 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html
index 95b684b4ffeb..71b1a9038a2e 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-insecure.http.html
index aaf4952cedad..6466b7f149f5 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-insecure.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-insecure.http.html
index e812d9a3b844..a86dca24c375 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/same-insecure.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-insecure.http.html
index 70e0de3d4aa9..6936906ab3ee 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-insecure.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
index ed76f75b539b..44b03ee27d22 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
index 181b14f75faf..f21693a2904f 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
index 9f85cba2b10b..5ecad4840a7c 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
index 873f53f0c2cb..4a37ed845dde 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
index 5c680ed73dba..44d4afad9c36 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
index 9adb33a0ab13..e0135ac6550b 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
index c01fdd4269e4..c03ac3ec36ee 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
index b72ab9603dd3..81f8677c3333 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
index f4d4be6a33b8..79b6a081e17f 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
index 690c3f5329e8..0517a5d4420e 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html
index e64a4894af61..e49741ffb270 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-insecure.http.html
index 6bc062c8a425..78028ea112b5 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/cross-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/cross-insecure.http.html
index 58feb6dfd1e6..b436f264f46e 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/cross-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/cross-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-insecure.http.html
index ffff41d39f72..7f0b239b625d 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-insecure.http.html
index efb17d6a4bad..7d8657595e36 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/cross-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/cross-insecure.http.html
index ce5dbd7ab29c..cf0764bda250 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/cross-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/cross-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-insecure.http.html
index 34c1e3066467..68f7480b4d97 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html
index 07d557111742..713b5eeb4d46 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html
index dcde036dca48..5ce05593ccf4 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html
index f5efe8c0763d..e1b43a7bd76a 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/cross-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/cross-insecure.http.html
index 95939f1e55d5..57e841048c12 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/cross-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/cross-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/cross-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/cross-insecure.http.html
index 406344590436..220448dd230d 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/cross-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/cross-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/cross-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/cross-insecure.http.html
index a520b09e762c..1bf99f140246 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/cross-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/cross-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-insecure.http.html
index a1284bdf979e..4b41fa5b88c2 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/cross-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/cross-insecure.http.html
index c4d04afdb5fe..f46debfbe650 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/cross-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/cross-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-insecure.http.html
index 585b27360917..7642d2f3def8 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
index 6f6866815462..66928c51c3f6 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
index d7cad6d1aa0d..23dddef080c9 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
index e5d8f02cc5d6..41eb7eaa35a7 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
index 16cbf34746c9..fa964a4a4d66 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
index 14d77416a426..a973b979eefe 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
index 778169fc059f..8e6ca11f3f40 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
index fd7e6df3b2d6..7073af2d60ef 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
index af30f3629062..6554f6cfc40c 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
index 53d4bc14c663..65f8a5621e85 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
index b65e35e7fafc..9c0a097c4b11 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
index 2e774aff9a10..f456395c4c11 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
index 44d5a7e86452..6943ffa982bc 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
index e0a1190722dd..b14bb43a99cb 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
index 862a53dc05be..b9275cb0f0c8 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
index 78f77cc46ae9..947e631d1bff 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
index fcc8004d96ed..f6c8623a069e 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html
index 9db05933d767..cddec2b7421b 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/same-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/same-insecure.http.html
index e1cd5ce74907..08135c2a8928 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/same-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/same-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/same-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/same-insecure.http.html
index e8966a3dd407..37fb15fef59a 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/same-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/same-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/same-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/same-insecure.http.html
index 5ca9fa74e7e6..3c35f0622762 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/same-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/same-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/same-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/same-insecure.http.html
index 3756bc90866d..0c49b4e91a6d 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/same-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/same-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/same-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/same-insecure.http.html
index de03c558be7a..bc930390574b 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/same-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/same-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/same-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/same-insecure.http.html
index a47402f8e5a7..af7d1df7a867 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/same-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/same-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html
index 55d3eb108d91..b40e40125ba8 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html
index 1f4182fc9b83..fe66263f7894 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html
index 1df1aea63862..4f5483753de4 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/same-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/same-insecure.http.html
index e61424294592..80d2dcd0787b 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/same-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/same-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/no-redirect/same-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/no-redirect/same-insecure.http.html
index 25c47754396d..695afae60374 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/no-redirect/same-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/module-worker/no-redirect/same-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/same-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/same-insecure.http.html
index 5098411274ba..16c752ce04c7 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/same-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/same-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/no-redirect/same-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/no-redirect/same-insecure.http.html
index ce461d48838f..6acc89c80d21 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/no-redirect/same-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/no-redirect/same-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/same-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/same-insecure.http.html
index 595ff8cda813..7620c0160525 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/same-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/same-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/same-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/same-insecure.http.html
index 25628c57045a..ae16346f3adf 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/same-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/same-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/same-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/same-insecure.http.html
index 59b5540d5373..118bb0a3c454 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/same-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/same-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-insecure.http.html
index 90c9c062897f..df71263b21b8 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/same-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-insecure.http.html
index c0c4d57a6b53..c71cd293d230 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/worker-request/no-redirect/same-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/same-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/same-insecure.http.html
index df3d3caf697d..d5979d7ab667 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/same-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/same-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/same-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/same-insecure.http.html
index 12cd2108c2d9..b6bedeeb00bc 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/same-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/same-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/same-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/same-insecure.http.html
index afa379cbe44f..7baab77a09fb 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/same-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/same-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
index 69ffdead833d..693c23702ee8 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
index 0310cd681538..fa61f3528a74 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
index 85d66187d221..316e28af94ca 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
index 2e4e2e4b0e90..f08708b1e324 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
index 21a46331bdc8..c922dd302656 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
index 393b25128ec7..dbbc06464123 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
index 5c96b21ab4cb..cd93f802cad6 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
index c5715052dfa6..2ce4f8c4f357 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
index 3bc071771cb3..05cd14306e8a 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
index 4db9193f982e..6c0eee6a9730 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
index 59ce04e05015..55f137e6d5c3 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
index c3fcd6c749af..c13e87d458be 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
index 9f60ef4828d1..ed886aa24102 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
index fdcf4ed4b4dc..2cf0c49c10b0 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
index a9cb84bd57c7..c06e5fa46878 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
index 4188c7062136..f29aae30d574 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html
index 5c7e811b6a2b..dbe403fc39de 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-insecure.http.html
index adc20b102726..5d8c30513a5d 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/cross-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/cross-insecure.http.html
index 14c5f88565f4..fb54ac71aae5 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/cross-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/cross-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-insecure.http.html
index 1f7660e4b447..4e71ba5f1220 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-insecure.http.html
index 2a8ebc516130..feb537fbc239 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-insecure.http.html
index 52204f86a53e..6dba08c88def 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-insecure.http.html
index b9276fb2f6b1..d40ed50fffe1 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html
index 9ce539405820..ba6cc74c4740 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html
index 16f65d24374c..285c361d1d1b 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html
index 9178670ec75e..29976794882f 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-insecure.http.html
index 2187ed654518..dff241107ec7 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/cross-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/cross-insecure.http.html
index 9481c4e3eefb..6d11862edcaa 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/cross-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/cross-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-insecure.http.html
index 87189f7a0411..1fc31fe398fb 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-insecure.http.html
index d91479b1687a..4a8a1f0488e8 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/cross-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/cross-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/cross-insecure.http.html
index 04f2d1e115ef..68b177b6af33 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/cross-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/cross-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-insecure.http.html
index c0a3a3fef358..68a648275fb1 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/cross-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
index a7121fa4ed7f..7b1ddac6e61d 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
index 5c945e119f72..684dcaa146d6 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
index fa6bee08e75f..ecfd82d0630e 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
index 87b9c1894b65..7071663d6345 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
index b09d94eb7bbb..9d76145215cf 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
index 4a0abcbac66f..f515e1d8a2ef 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
index fda4a75c834f..9bba4f399abb 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
index 42eed76eb371..b3d45d73923c 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
index 575447c7e3f6..0faae4a906a8 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
index 03ece498654a..cc26b0961b8b 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
index dc66954e2787..94b42818407c 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
index e2302d26f201..ffb2366aa46e 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
index 2ecbb3bb8831..b67826d7755d 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
index ae5bac974d88..596550e89990 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
index b2c6669de57f..dc8ee2a8f45e 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
index 72bc5f3adcce..266d4ff26737 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html
index c216eb8c8f9c..2e49fa6bc310 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/same-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/same-insecure.http.html
index a770bc11c7cc..0e1f1375da11 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/same-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/same-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/same-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/same-insecure.http.html
index 5d6f7b21463e..c00e3501c970 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/same-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/same-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/same-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/same-insecure.http.html
index 3612fc08b2c6..65aa8b72ecd8 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/same-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/same-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-insecure.http.html
index 44ce34312a30..b3079d2dc9d7 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/same-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/same-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/same-insecure.http.html
index cc9bcb48c9f2..c3ef7af0439b 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/same-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/same-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-insecure.http.html
index dd271801aff6..d21951e8997b 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html
index 3818bdb23062..7077dfa12711 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html
index e3a8560e198d..e6b8211824cd 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html
index bb969a6b1378..28a143047e54 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/same-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/same-insecure.http.html
index c2d2eef0933c..a74c968cd6f6 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/same-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/same-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/same-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/same-insecure.http.html
index 65f61af96c30..e75274330b59 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/same-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/same-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-insecure.http.html
index f96147aa9f81..06e0cf6ccb57 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/same-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/same-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/same-insecure.http.html
index 15f8356c4863..d9cfc360d9a0 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/same-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/same-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-insecure.http.html
index 7b37f77b0a54..882de7e13dec 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/same-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/same-insecure.http.html
index 2ee6670f1b4d..a567c3388611 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/same-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/same-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/same-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/same-insecure.http.html
index 324200c0809c..ede59d3c13de 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/same-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/same-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/same-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/same-insecure.http.html
index 7679e7f4c3a5..e9b7a295ab93 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/same-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/same-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/same-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/same-insecure.http.html
index 01429fc8d583..f9e58ca6f78b 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/same-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/same-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/same-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/same-insecure.http.html
index 35a67d5cfe64..2c9beb9b272b 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/same-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/same-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/same-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/same-insecure.http.html
index 6655e6609c7d..2da9b429ec7c 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/same-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/same-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/same-insecure.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/same-insecure.http.html
index cf425621db76..61b40b556707 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/same-insecure.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/same-insecure.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
index 3bfba05055e3..3e10a769b593 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
index 7682dc3dcf84..3dc9ca4eded6 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
index f438db21fb2a..fa5788b514de 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
index d25fb8468a14..f226759df6ed 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
index 96cdc93e1ca1..263ca22b550c 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
index f698ba3603c8..e631d7950df5 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
index 0bc65f1d001f..dd777e20b01c 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
index c031a4c0d234..3666ca93a142 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
index 8f40cb489a31..083863b0823c 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
index af4f0f329009..73e1f65bbaa9 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
index 4a335ea3f210..9b8cb3a1d8ef 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
index b0bbd0bde31a..ec76e41ddeb9 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
index 9365b2056ccd..7f76db13d255 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
index f8f378e955f8..c6dd5590c159 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
index d1a685be521b..8ebdfb9f152a 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
index 50a5f8e21078..793aef76ed98 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
index 66d64058bdf1..de1463b5d3db 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
index 6af2ee1d078c..5cec2348d225 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
index 1893dfae743b..0f5f5353dadb 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
index 3162697bf32c..67f62b51cfcf 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
index c9bb4d2fe73c..0185812ea27f 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
index da49cf91783c..b13d43aab689 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
index 7a6b6abaf706..733dd399da57 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
index 01a91c0b38a8..966f10b28f10 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
index 245bcdea2f0d..3001dbfd9661 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
index e428457354ef..308d22db03b1 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
index 90568a2f2157..6c5e16e343a4 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
index 6bf526dd44d2..e5171dacac7f 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
index 6a3de7df3869..518fc5ca927b 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
index 787fd136f0ed..07c8d14f050b 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
index 5412f5c774f4..307ec94547f9 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
index 7c196b7310da..94a45bbf40d7 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
index b65dd714740b..ff3a4d5f906e 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
index 8e4e673295ca..5e202a4c467f 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
index 9e2257546573..437c1a502c43 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
index 411d6546f60d..adb575e8fc4f 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
index 362bb7300b03..b368130fe63e 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
index 33929b4db8bd..6be360594479 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
index 6e348099402a..29a5417f753e 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
index f9c98e425094..1d19df2c20db 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
index 33192628da63..29cec56f83e6 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
index c7b24eadaa59..fc158a9c9a53 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
index a32db5940990..0636fed23499 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
index 48a05510e842..6ee44808bf2b 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
index d9691a5f278e..1e97bb824d0e 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
index 112cb07a1c71..bf2a2136ac48 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
index c577811769b6..92f584e8be61 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
index fc3caa7db410..3a3d0cb3912b 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
index 562b343c0745..b1771d766820 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
index a5efd1ab5acb..a2b64ec7a290 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
index 5111816d1944..10d67abeb640 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
index 88a8d6ed0379..c5d55deda1d4 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
index 0abbbc31a552..8b1c993d2666 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
index f9bd0ffa568c..e409624d7f9c 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
index 5235d65e67ba..d968e806708c 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
index ca82f796aa0f..9b6ea47cd8dc 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
index eb2728ba4a3c..3a37854f3482 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
index 6db13b83ac64..b8bfa369cc0a 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
index a775c9291885..e7abb5524aff 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
index fa5dd4e3a5fc..ee0f6a65e9c4 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
index ddc087857933..6e0f4dd793d4 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
index ef1e1e1c630e..6dcc1de0c480 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
index 4404426bc7ec..dd867e250bf7 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
index 7bac59bc7503..a8a664fab21d 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
index acbed1072d54..778eace94561 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
index c6cf50265cb2..151cdf90d970 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
index de2b97f32673..8356d3b1842a 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
index 51e66f2a9b24..be8889a92642 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
index 36161da8f3b6..f579e962710a 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
index a11910b00b82..6771dfdc2cd4 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
index 9ba64a59d561..82b6165bee17 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
index af71a3151103..850b62b05954 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
index 83bb4f5aa6f3..112efd4056cd 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
index 8d8435e45386..8dd238f17810 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
index 2d324453c557..d0c92c8c3338 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
index 88065cd16cd8..80aba4f30ea6 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
index d979933fac7f..76edcef00e15 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
index f53a953aa7ef..0c9a64d75bfb 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
index 67600bf97751..7261e079b529 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
index e27563a44213..e3d99ada9946 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
index 282de2a68e1e..bf4f76c422c7 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
index afe01d98b43c..3568a5853db6 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
index c385eeb8cb60..34678b6e0bb2 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
index d3b18a67385f..fd6fa84b8fc3 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
index ae435dedf3e6..8e2f26110c38 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
index ac8edef81631..f1ef4905ab91 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
index 5288baf690b5..882ec58e84c4 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
index 76a320a9bfe6..61222c061b1a 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
index bd748b6d848d..eced7c919476 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
index 428ff8615482..07324af6df42 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
index 6669ab212b34..74f5a7ccc92b 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
index c35d7cb17bd7..e0c913583e95 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
index 01ba2d5b0bb8..28616e8af6f0 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
index 8fb9370cb754..4fb70527b619 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
index de6638c6d18e..dc4f644b7837 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
index ac920cb9f4f2..829b2b072f74 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
index a6eedfd236c7..e2be71dd9ce7 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
index e0e92bf589ef..b3d3dc54a0d2 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html
index 4586fab184ac..82b67545c48b 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html
index 9e0900d7f25f..bb8d797d0cb2 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
index d8edc558d403..56fdc7923fd4 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
index b68fabfb9d96..62397c248476 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
index c9623dc3be42..183620ee89bb 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html
index 705a94f449f2..1be3aa77d065 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html
index e751a96832e0..ea834022713c 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html
index ee798fd77f6e..1b30f714d08d 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html
index 862904136950..b5880bda93aa 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
index 34909cb71a1e..dce61d41d78d 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
index 8baf9eec6861..c857f4c7695a 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
index 3462a51251b1..1f137283c629 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
index 3dc212e9fec9..b25470749eb5 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
index c25f716b0321..4a82c2944526 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
index ca6b4320645d..787d3afc7a52 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
index a22890c0756e..0a1d40c5f876 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
index 5592f7a47a30..999c43e8b1d2 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
index af5b5b495c62..6330560d9464 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
index ac79d620e75f..4681722ab177 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
index d3bd99156f17..1487f9645366 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
index 3aa49c4d9b8c..ddd876b91afa 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
index dde11eb542c9..6c92b8d51666 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
index b6be0bca28c0..c2fef2eab9c6 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
index face97dda015..51b0a806941e 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
index 32123fac2554..ab62bdbeed56 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
index 8efd849727dc..bd5bbed36eb0 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
index 961cb2b4a946..a3d7e8477591 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
index 5f0a33f4c242..e264bc35cdcf 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
index 8bece44d3edf..bdfe9f7b932f 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
index 02c0d382c8de..96cb24604591 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
index 2167cd19befa..97b2f49424eb 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
index 464d38106caf..41c90bdfd053 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
index 6bddb18878ef..005b0fa5eb73 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
index 076e51049ad7..bb240bee618e 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
index 8e9b6554fd15..0d6b7b272181 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
index d78d22da6015..09d9594c266b 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
index ca2079d40209..c83cd66182d2 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
index 5d9aa9a967c4..d9ed4f6c0d2c 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
index 1eba7c478acf..f060d3b99992 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
index 090d71774683..d37724e7c61c 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
index 6f8a8d122917..7c9c53f86f73 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
index 68836a1e20f8..2b04c50a4250 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
index de67eb3147c6..064da1b6986e 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
index f29a3130e4f5..7046e6e1474c 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
index 85ffd5a6205b..a14d6f79ced3 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
index 66c4ed68e7d8..25557dfb8e7e 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
index 6539ce8496df..f3ce31c69db6 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
index 4588734ecf6e..fdbf7a78b19a 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
index 9b86f363499a..cf16f8adef64 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
index 7271188681be..ffda52304cd9 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
index c26d30017f96..e013b680fef2 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
index 70c9c8160bb5..1a1b2404463e 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
index 1171eaff9075..5bfd8faa1d90 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
index 3f958fb4ae82..d648738223cc 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
index c37487a81772..25f01ca1b264 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
index f7aeb60176f3..c51a797d372e 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
index d3696d838659..3562c938a091 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
index f6b60e3e3b42..50994e295cdb 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
index d696ac799378..da91cfdd2ef8 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
index 3e2328303efe..bb496aa3f04a 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
index 7730443312c7..32ceeff6b39e 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
index cec306036efe..0179180e5895 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
index 479d8c56ecb6..3b9d5beb6a39 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
index b551580619c3..01c5646b14c8 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
index b1d9cad4e67f..fccec81bbcc4 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
index 337b2ee3f6be..5840859b4ef9 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
index 47e90041bdc0..4e93fafee056 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
index 2199f7a899f9..9a9490e666f8 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
index 2657884e93ee..9e1bd3a1c084 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
index 40c7e0370341..46a7a33c3ff1 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html
index 85886baeb2c4..f60cef60c73b 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html
index 9763a1973aed..3ee6b651a90d 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
index ecbf2b83c288..6186d57f3f85 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
index c0f5c866b502..08a6df4fdb41 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
index e747f570bfef..8bf116b873f4 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html
index 7fd8ff4d1943..aa874fda9222 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html
index beec47c1edd7..056494df00ba 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html
index c4070eca035e..7d18b730ec3f 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html
index e5ec2f3a1b1f..8a85ecfc7562 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
index 0383a617eaa8..3fe96e71d486 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
index 7ce14526dedb..bdfce453e8db 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
index d6131965f7eb..6e29cc16ad1b 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
index 752a2bb08322..8f4342bcdbb5 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
index 489181e7a6c3..dfc4b9792ab3 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
index e3a255bc3533..dfbc93f20767 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
index b2c688bd1e14..4f581e783486 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
index 1677fde7fe7f..610799d5e236 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
index 995c0e605acc..db36bbc70d83 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
index 31f622b9b4ab..8f4eabfa2544 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
index d5a472e0ffa5..e5acfb1b0509 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
index 86665bc95293..f2a6afb83f7e 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
index caff3743136c..40dc6bfa4078 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
index 2f14b230b333..2bac0fc5a3d8 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
index 6205355dfadb..023680ab7e16 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
index d061c5f7e9dd..fbd9be455de2 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
index 6066601fb0f0..1b2a3b3ceb4f 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
index 597c0a51676e..0c002eff6aa5 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
index 1cbc16515d17..3aecaf52f882 100644
--- a/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
index cefaa9c97f7b..b803ec868579 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
index bd43802283c5..1d4be3c77950 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
index 9503d1482220..715150770260 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
index bce63cdb6d39..814b6d9ba1ec 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
index a57959714e9b..3bb8712035bc 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
index 9e292c97c0df..8a8a459f9447 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
index 1fa9bf44245b..04ae66bd22c4 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
index 070e99e8f18e..edfdd5a4fb47 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html
index 980678e81681..19bb2541bd31 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
index 982a571ab153..45216007e36e 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
index 7e9c9f1e7b89..0ae15d3a6f54 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
index 639c2ad1cf31..4947e50aab9c 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
index 9bd40a44a819..39deeac307ec 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
index e2b981ef3206..334ebae52279 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
index 8bab7df57a8e..ca1f0a68f7a7 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
index c2d2948d4b77..f813f24a611d 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
index f1804350ceb2..d3272c43508c 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
index fb1c255cabd0..9c4d68109b90 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html
index bde470822dd5..2c445f168927 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
index e28d725eff81..384d6b4f05c5 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
index 699a9f8f4220..f1d51bf377de 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
index 241f87c0769a..22800cf4b4d9 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
index e9c5fc2a0bf5..ceaa0164ef2d 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
index 2b77f9761e70..5117c0f4dc14 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
index 089c3c59254d..d891987d39fb 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
index f152defa15f8..246089208a1d 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
index 6be7be59f2e9..10fc2a00fafb 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
index 1d234b8d14dd..3fae7fde3c20 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html
index fff0f8ba92e0..6ad3c317b112 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
index 9adae7ad86e4..5976b8fc94a4 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
index 5a74b6f4ccfa..3a4c60248c86 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
index 256ffe7733e6..9d504a970924 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
index 7875fa93b9e5..5fc928a3c7ec 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
index c61159234515..01d2abbb84cf 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
index 2705d9d7ede7..2b520ff43afa 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
index 2edd407c673c..7a2fb09fc67e 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
index bed4da153fe4..7612d5ef6483 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
index e3baa436370c..61716199e584 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html
index d4eefd637473..7c900a7466e2 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
index 60917b64e8e4..4b307df8c340 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html
index 30b4a2439faf..3aabb1d6e6b0 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
index 78f5cbfa1cb6..53ab93a35745 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html
index efd83b24093f..ae0a512baaee 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
index aee2c19a0688..1360c04c3fbd 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
index 0bdbad44abfd..e608f52cbb53 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
index cc62ce408946..e8b1059951d0 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
index 44308b954169..0755eaf96b55 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
index 34fa48f5e7b4..6c873e8f0ad0 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html
index a525fc603d88..e9d9d246902c 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
index 7ac73e2015d8..78b871570eaf 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
index f213cd31bf00..a38b20f1753a 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html
index 8140af2fdf97..a7fd03c43015 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
index 8e8241e6f810..06b2b252f351 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
index f8f932883587..49c3ec58e8f0 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html
index dc670ca1ad2d..163b8c8a038d 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
index b10e0f2958d0..c28550135119 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html
index ed9b5c0089dd..2ce057e691a6 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
index 3adc05493c58..608035538d8e 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html
index 9a64304c2e0a..046b2585986c 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
index 03a51f774791..59bf756b8eca 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
index ab4c34366f3b..eee0a3f8ba5f 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
index db547eca9708..57f1a9d04077 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
index 931895b1d4fd..fdb7033c4c42 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
index 0ef325faa851..7168479ac2df 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html
index 69909e9ef80c..5689889eb33b 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
index 35115b87c2bf..678d95524020 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
index b95663578562..73cabcfd9392 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html
index 1220a18baa63..fccf299678c4 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
index 21df7bc75d46..174c0feac742 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
index 144c8bf13430..832ceb02ead4 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html
index 46086730a008..4ce779935054 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
index 96faa6252020..664cb7e3deaa 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html
index 5e5c5f8200f2..2041b85a8e5a 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
index d82278a75d56..2ce45af4cdd0 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html
index 928dcce4ca57..038a0b2dd5c0 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
index f4a83144a42d..78b340afe47a 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
index 6fc3d5945454..12446ba14837 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
index e9fff3e4c859..70a115d87566 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
index d6b38a0c6349..7a083ea6cdc4 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
index c399b4798347..12871fac6bff 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html
index 93d63b6c2efd..abd803c44377 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
index 5e7717967d88..02e9b92a215e 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html
index 7b67fec5f175..8d97cd77bfd1 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/module-worker/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/module-worker/no-redirect/generic.http.html
index d8ced7706afc..a3291b0ca86e 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/module-worker/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/module-worker/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
index e315f3cc216e..435281a74c99 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html
index fa86de29f5a2..dbdf2d6fb9ec 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
index c7ee265f11f7..e1643fd37fad 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html
index 86ce965807fa..53cfed58c20a 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html
index a0a3492f10dd..4621243bb65a 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html
index ff29153c8c76..7882c1319c11 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html
index ba0c3a2cf398..f9baeba7a310 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/worker-request/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
index 67f6ce8b96c1..89acf024fda6 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html
index c1892cbd682d..9f43191303cb 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
index d40087f2376a..5e492ca91755 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html
index c3cb404fa455..f0824a229108 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
index e90461cd1603..54a2fc32257c 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html
index 0ae217ed8c8e..e6775088a6e0 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
index b55a2708a779..c2bccdf77caa 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
index b092571cfeb4..79cd63640dee 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
index c0b5209603d8..4fc687f979b9 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
index 9393d4cdad96..3a24da90cacb 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
index b76378b830c2..95154a9916d7 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html
index 9025174a4939..501e8ed242fe 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
index e197f94bfdc1..a49c2a05ccce 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
index dd4ebfca68cb..77d22e913705 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html
index 057f2680f765..6ab0525a97a4 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
index 5d87766d2def..22057804af79 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
index dbde82d26508..980c4a9aa467 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html
index 02ce7599d041..42c0c4b6ff8d 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
index a6c62bec6ec6..efb989ee35e1 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
index e4da9e99f46b..9bc18f9d5ea5 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
index 2eeb2a715669..15120a2dc19b 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/generic.http.html
index 3e8df22f781d..dea4a85cf8fe 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
index 24958f59132d..c46cbb6a1594 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
index 27c43706681d..e89ee7f89409 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
index a3b987bf9721..875901b25646 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
index f390274ded67..82858ef6227f 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
index ddd26ce66a38..775bf93fa3db 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
index 79eaac299796..41560ae8c18d 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
index a62df13ca5e1..03073d50e308 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
index ff5286575a6c..5a1e1ccc64e9 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html
index 3fd0a99ea40e..5dab67170868 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
index b53da6f22a98..50447b968fd6 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
index 0264f09c393f..e4d2e2c77c4a 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/generic.http.html
index 8258da324592..374f5c0ea621 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
index 90e0df722ed0..f02d54bd7f58 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
index ac71e83fd2ab..8a372cee16a6 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
index 6e38ce7a26f5..71778ee0cd7d 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/generic.http.html
index ab9071628feb..6f34ef1571a9 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
index f0c3f6e63622..ebd930f6910d 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
index 4595ec4c56ab..18e6eb2b4216 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
index 74551b6ea250..fc44e3e254f7 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
index 0476d6f8440f..5c8822601909 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
index 12f9db6f8aef..ebf71f175382 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
index 873003b99b81..bf6262f26cfb 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
index 06cabeaf21ac..f591cbef0a79 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
index b3b3b5de83fd..ba2d54d627fb 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html
index 62caaa3ecf8e..e8b0aa9e87a0 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
index 2872e8bc50cb..a34ce0378b84 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
index 789b74b5593b..6482686b5fd6 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/generic.http.html
index 958547af2c45..2610bb065985 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
index 97413c484021..740895b805a2 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
index 99e9bf4c7451..0f16cc626c25 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
index 19639f8418da..681dab44cd43 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/no-redirect/generic.http.html
index 8388262d65a1..d72aeb785a5e 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
index 3de61cf23e33..77c3c68a77ca 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
index 3522e360059c..e5592cd0891b 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
index 01987663ea96..a87451fbdce1 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
index 724108608a09..631e1477c805 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
index 065d0185aa5a..0cbf66fed618 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
index 2fffac47880e..43dc43d0401b 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
index 0a3500c570c8..7fe2baacff82 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html
index bb86346321f8..c33155b29990 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/module-worker/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/module-worker/no-redirect/generic.http.html
index 63b5c5a76b96..eae3381ae927 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/module-worker/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/module-worker/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
index 77bee4533efe..e1db3d1e59e2 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html
index 1545ccb90b52..404392c8e448 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
index 4f5f456c89e1..18cd15910ac4 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html
index 4c803b30288f..6fb87153b289 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/shared-worker/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/shared-worker/no-redirect/generic.http.html
index 39671be7f7cb..f1f759257f63 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/shared-worker/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/shared-worker/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html
index a0d247f675f3..7a763d011c75 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/worker-request/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/worker-request/no-redirect/generic.http.html
index 2f787fc985bc..bc7f41857aa4 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/worker-request/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/worker-request/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
index 4ad2229ff18a..34c729544642 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/xhr-request/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/xhr-request/no-redirect/generic.http.html
index 7ce79ded82de..6386f26a9f9f 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/xhr-request/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/xhr-request/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
index be77219b39bc..e9ffeeba0efa 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
index 5b3f4220a117..e00dc04118ce 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
index 8bb961f3f747..d3cc95adfd84 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/fetch-request/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/fetch-request/no-redirect/generic.http.html
index 332f3826fe7c..dbd4183bd7a5 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/fetch-request/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/fetch-request/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
index 09c9f0636d51..6e07cfb0990e 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
index 71785bd20234..8c54512a93ab 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
index 8a1b13d20173..07e669ccf940 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
index 12403886df61..ec2e9c64732b 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
index a549e552350d..da52ddcc8795 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
index 1dc5657fb2ac..38e401993d84 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
index e391b7273b9e..3ae164bf11b4 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
index 23220fba182e..759728b00b36 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html
index 8fb47741b94d..7b73c8ded47d 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
index ef8036fc23ac..379763fc354a 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
index ac23978e8775..90417e90e712 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/xhr-request/no-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/xhr-request/no-redirect/generic.http.html
index f6bb90e3ecbc..a4e1bee0d77d 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/xhr-request/no-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/xhr-request/no-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
index 9f7db2bd8013..4780d0d4926d 100644
--- a/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
+++ b/testing/web-platform/tests/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/generic.http.html
@@ -14,7 +14,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
index 93678e42af61..d4d48c5202e7 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
index 1167119941cf..bcd0a811b2e1 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
index 558f6538c853..55346939f95c 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
index 4ea91857c495..e377fc377119 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
index f243ee265600..2b2c1b287c85 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
index f335481c2119..e4d5cd7dc619 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
index 1284d2992061..2361a04f5fa6 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
index 852270205abd..ce4ea6be8cf0 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
index b4036ad1783f..2dc068ac4e5f 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
index c0907438fadc..87e94c62d012 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
index 2e1bb1ec4440..b495fd233054 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
index e9261bc57d58..8d6e5f548fd5 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
index 3d46e709fcb0..5fd5bf661946 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
index 0b778f4997f1..fb46a40ab9a3 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
index d5de49051f09..5d37c9fa6e80 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
index d7e2a54fd1a9..efd91432012d 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
index ae40fbac0274..6198659416b6 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
index 10c558f7d23d..67f0f034fe8b 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
index 117dbf8543f8..fcfa56d773ce 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
index c0d9f6c81a3c..52400d6305ea 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
index 2099d0da89f0..29c0ced3a221 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
index 7b12dba78c78..7c8e98fa37c7 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
index 729766edb534..e67e90c80934 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
index 3f7f04c97edb..18667759ea98 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
index 0fa59706d733..b47279c1ce60 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
index 9cd46c0db0da..997bbf49e797 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
index d913fd518bac..9472829baa66 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
index dabd9cf66de9..3668aee53c25 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
index 1c5a69f8f269..2cd7df0252b6 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
index 08c5c1df2df7..3345a9ed2a52 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
index 6edd0b6222d8..5ed0f06af2ac 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
index ba34cf586d20..cb9ff640eaef 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
index 6dc6e580fb1a..8f9818814669 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
index 1869a4aeaba5..8c134e9c3aaa 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
index 9370940f5a1d..7eb82506233b 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
index 6364a6bc8465..35e905c392cb 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
index 50f9ef60600c..871679a6eba1 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
index 104de66bb885..ceb5586630af 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
index c253955bd2e4..3ea90747c0f5 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
index 00058b3bfde6..5b89eb7aedfa 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
index c7c15bf7f361..e750aa9186ea 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
index 3c28f7795e8b..0665510a6475 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
index c14f0f8a6d3a..a93c94af59ad 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
index 0a7733497c72..6665a2f354a8 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
index 7fa1acae0d67..b380ce0c91e6 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
index b21bad37d592..1894667f01eb 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
index 6ef1bfc09733..033feffcce4e 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
index a1a9cc6e212f..1f6b62841e0d 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
index bf66c513f8c6..88a3e42a568d 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
index e00dbee878be..69d835c3d83e 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
index fab4c3750452..ffa234c29666 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
index 922da3091e23..f92abf01b851 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
index 49b72b4b54cd..953805774289 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
index 599ba30a37a7..b6191fed6954 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
index d456f4fec7be..635ec9d82cbc 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
index fd6e2e0f3fa8..00848d6602fe 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
index b65752bdfbda..3ddbcee365f1 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
index 599558d826a2..00cacb9060ad 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
index edc3544fc94b..68b8f69e5c63 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
index 0bc0ee857521..9390b64fde83 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
index 1f9110ca0008..1c12c9ca24cf 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
index 1bcc264cf04f..a76c98066ac5 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
index c74f071263bd..dd1c82dc6ccc 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
index d1f0c2e1e91f..307c7621135d 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
index 9569bbb4d5d4..30530e6636a6 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
index e527876ac0e0..d6e1c283c399 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
index 1e7cb029ac17..19666416a90c 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
index 9f070f67463d..f05d225d8111 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
index a6f3cc71c272..efa96f50fab3 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
index 7c2f24e314c2..ecc377c6870c 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
index 6a530fc09ed6..c5b47ed3bbf2 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
index 5e6ab1985ac6..f8b744f618cc 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
index cc182c1098ef..6a70b5b42a19 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
index 6f84795a6214..36757f5dc623 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
index 5a17464ef25b..c75ea8d74cf6 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
index d547c4b15d83..e765d82001ea 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
index 3e2b15cefcd6..5d2c1268cdfb 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
index 6f34b7f039c7..07850f1d2f5c 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
index 7b3143e624f0..bea31157fe5c 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
index 00840f73e623..b1e6128a3ab5 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
index 9d1a36f454a6..187644769c25 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
index f50ba2946a6d..621aaf86a285 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html
index ba6b200df2e8..aa5a9ac86bb5 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html
index 65131c489825..c2201e9c4e21 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
index 4076b3d0a9fd..2c16b549ae91 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
index 2ad2e9d51585..2c66e693d31e 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
index cd641e7b903b..e6c6432c015f 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html
index 699a94f9a1cf..f5b7e511b362 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html
index 0910fa386b2c..526e24ac4c9e 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html
index 26adab8772b1..686d4feab2f2 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html
index 54b504131611..63195e03a244 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
index 61dac7d3fe86..ec52992fd927 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
index 0bba74c770d9..c0aef90b38c1 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
index 87df303a657b..76e883fce0d1 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
index ba575736b5ac..00e67dffba8f 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
index 47b497f2b0a2..d719b5135069 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
index f284f6cf44fa..21b899d88f28 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
index 4f5cd420094d..e83e55eccef0 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
index 40e927d4da00..fdf3cf38c755 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
index fdece9a07e23..ff768ca6241d 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
index f1b517ebbf76..b36050b5ed1e 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
index 5cf1f7c7ada0..943ec5cf35f9 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
index 4b97c9b6c562..44cf0ddecc42 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
index 1ae3c471c51a..9df29013d079 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
index 00f20b1e7e0e..5b392fb53f5c 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
index a39a72025c59..7d6be6e4dca2 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
index 4c42aee6507b..29c554a2fca1 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
index d03e62030af7..2f60784c0d99 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
index 3eceeff71bb0..179877264a64 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
index eb30e847d25b..de46596f96af 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
index 7c2b2347b1b1..d519295475bb 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
index a57e2a050a2d..4ee0c81a535c 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
index ac03ced7b71f..1db8f0d99643 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
index f08ddef240d2..5b1533620e61 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
index 1836ebdc7566..30dee3506adc 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
index 65b503d1df47..31b50bde1c8d 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
index bc7f9ad7cd4b..cea04e81a0f1 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
index 3bdd36afe7f0..0e646941205f 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
index 732d621c87ae..f99e0f0ae307 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
index 8dfe8880440f..1bbcfbb06d34 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
index 89cd05266604..a35c885ecebb 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
index 95976e0878fb..7e46eee5ea07 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
index e5a62b3e07f5..3457d393c266 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
index 00c5d396018f..690b427f4b1d 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
index 5a1c26f8ad3c..7c1838c5158c 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
index c1d5b4ccd7c2..b891494cb887 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
index c2a56c863ce4..4c07e9aeb661 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
index 9c399c3bfcef..58c6f098cc16 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
index 60ab186daa72..31da00276bde 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
index 748af8f5f86e..b4448f4dac4f 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
index 0d30bade3fab..a9c58e69fe07 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
index dddfbef0396f..71e9f32ec372 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
index 30ad89093ec4..da7331ae14d1 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
index 10b361014763..8fea31f3c85a 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
index 9655342103fe..476ddd04ec52 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
index 719669da9a2c..a583699ffbce 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
index b15ff922c115..6f60845874f0 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
index 4aaff556215e..88f9b2ff185a 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
index eb55e13e77dc..c36005af7ab6 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
index 4ee8c7941053..1b67733527e8 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
index 5b8fa9cc474e..0003f46e3517 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
index 5504dabd9531..89749f24178b 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is cross-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
index e9054bff4305..3e9b3473de13 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
index e9940a8d929a..36911507e268 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
index 10b0d60b2f90..e8487bca9fe7 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
index 391be7ae1010..f3a2ea727827 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
index 020a95d3bca8..4f0899351163 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
index 50269b158f11..7cae21045bab 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
index 8b4d43c07fa0..59699ea0c704 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
index 181944a1b61e..a0e4f7aae5aa 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
index d93785c6000a..39bc55b03c79 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
index 7329e02bfb1a..842e32d571fe 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html
index 4f3f00a55f74..15103438ba68 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html
index 0c53605d2fa2..37e4203474d4 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
index 3a64fb26fe67..39410f46c653 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/script-tag/keep-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
index a228469d11d4..74c79e9fdd8d 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/script-tag/no-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
index 7428dbf85b95..5a66ee358306 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/script-tag/swap-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html
index ebb22260c75e..a32157dca017 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html
index 39b2048c8a27..7031f36f36f8 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html
index b9819db1faef..6500c7f756c0 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html
index 65be8f33e0aa..5f10dd7f5e9d 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
index abb3d72fca7e..85ecb5e6511b 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/xhr-request/keep-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
index 87d2aeb88e54..c4207cf8b303 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/xhr-request/no-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
index 1989f796e104..359326b1a007 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/xhr-request/swap-origin-redirect/insecure-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
index addd685a0da7..2f6ec65f99f2 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
index 4c15c563c240..8378e3f1b165 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
index 45f57513a6bf..735dc7639f4e 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
index c958f31b91f8..ba6d9abb3735 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
index 39005dc819d2..0d8231cfa4cd 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
index a51d2fc5ef41..82296dc38192 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
index 9ab1701e208b..7a7c19a6d8d9 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
index e34b1e98a320..241ae8b80026 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
index 3e4e70070e02..57e56be55437 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
index 025b656bb760..98738a646dfa 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
index 600cdb9fc92a..3e504c049711 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/script-tag/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
index e95715a15103..f48e258f0931 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/script-tag/no-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
index b9f74bb358e0..59e01959a102 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/script-tag/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
index 3713018b868f..32e8231f01da 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/xhr-request/keep-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
index fb74c67677ab..2d391dbbdf5c 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/xhr-request/no-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
index 001021fe4a1e..0bd9d4a42c83 100644
--- a/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
+++ b/testing/web-platform/tests/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/xhr-request/swap-origin-redirect/upgrade-protocol.http.html
@@ -13,7 +13,8 @@
                                  the target request is same-origin.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
   </head>
   <body>
diff --git a/testing/web-platform/tests/reporting/bufferSize.html b/testing/web-platform/tests/reporting/bufferSize.html
deleted file mode 100644
index b3512b3bc93b..000000000000
--- a/testing/web-platform/tests/reporting/bufferSize.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE HTML>
-<meta charset=utf-8>
-<title>Reporting: Buffer size</title>
-<link rel="author" title="Paul Meyer" href="paulmeyer@chromium.org">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/resources/testdriver.js"></script>
-<script src="/resources/testdriver-vendor.js"></script>
-<script>
-  // Test the buffer size (100) of ReportingObserver.
-  async_test(async function(test) {
-    for (i = 0; i != 110; ++i)
-      await test_driver.generate_test_report("" + i);
-
-    var observer = new ReportingObserver(function(reports) {
-      test.step(function() {
-        // Only (the most recent) 100 reports should be observed, even though
-        // 110 were buffered.
-        assert_equals(reports.length, 100);
-        for(i = 0; i != 100; ++i) {
-          assert_equals(reports[i].body.message, "" + (i + 10));
-        }
-      });
-
-      test.done();
-    }, {buffered: true});
-    observer.observe();
-  }, "Buffer size");
-</script>
diff --git a/testing/web-platform/tests/reporting/disconnect.html b/testing/web-platform/tests/reporting/disconnect.html
deleted file mode 100644
index 2dc5e8fd2de7..000000000000
--- a/testing/web-platform/tests/reporting/disconnect.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE HTML>
-<meta charset=utf-8>
-<title>Reporting: Disconnect</title>
-<link rel="author" title="Paul Meyer" href="paulmeyer@chromium.org">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/resources/testdriver.js"></script>
-<script src="/resources/testdriver-vendor.js"></script>
-<script>
-  async_test(async function(test) {
-    var observer = new ReportingObserver(function(reports, observer) {
-      test.step(function() {
-        assert_equals(reports.length, 1);
-        assert_equals(reports[0].body.message, "Test message.");
-      });
-      test.done();
-    });
-    observer.observe();
-
-    // The observer should still receive this report even though disconnect()
-    // is called immediately afterwards.
-    await test_driver.generate_test_report("Test message.");
-    observer.disconnect();
-  }, "Disconnect");
-</script>
diff --git a/testing/web-platform/tests/reporting/generateTestReport.html b/testing/web-platform/tests/reporting/generateTestReport.html
deleted file mode 100644
index e3c2735686a0..000000000000
--- a/testing/web-platform/tests/reporting/generateTestReport.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8" />
-<title>Reporting: Generate Test Report</title>
-<link rel="author" title="Paul Meyer" href="paulmeyer@chromium.org">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/resources/testdriver.js"></script>
-<script src="/resources/testdriver-vendor.js"></script>
-<script>
-  // Test that the "generate_test_report" API works.
-  async_test(function(test) {
-    var observer = new ReportingObserver(function(reports) {
-      test.step(function() {
-        assert_equals(reports.length, 1);
-        // Ensure that the contents of the report are valid.
-        assert_equals(reports[0].type, "test");
-        assert_true(reports[0].url.endsWith("reporting/generateTestReport.html"));
-        assert_equals(reports[0].body.message, "Test message.");
-      });
-      test.done();
-    });
-    observer.observe();
-
-    // This should result in a "test" type report being generated and observed.
-    test_driver.generate_test_report("Test message.");
-  }, "Generate Test Report");
-</script>
diff --git a/testing/web-platform/tests/reporting/nestedReport.html b/testing/web-platform/tests/reporting/nestedReport.html
deleted file mode 100644
index 156338ee7465..000000000000
--- a/testing/web-platform/tests/reporting/nestedReport.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE HTML>
-<meta charset=utf-8>
-<title>Reporting: Nested report</title>
-<link rel="author" title="Paul Meyer" href="paulmeyer@chromium.org">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/resources/testdriver.js"></script>
-<script src="/resources/testdriver-vendor.js"></script>
-<script>
-  // Test that reports can be generated within a ReportingObserver
-  // callback. These reports should be received by the same observer.
-  async_test(function(test) {
-    var step = 0;
-    var observer = new ReportingObserver(async function(reports, observer) {
-      test.step(function() {
-        assert_equals(reports.length, 1);
-        assert_equals(reports[0].body.message, "" + step);
-      });
-
-      ++step;
-      if (step == 3)
-        test.done();
-
-      test_driver.generate_test_report("" + step);
-    });
-    observer.observe();
-
-    test_driver.generate_test_report("0");
-  }, "Nested report");
-</script>
diff --git a/testing/web-platform/tests/reporting/order.html b/testing/web-platform/tests/reporting/order.html
deleted file mode 100644
index c43964220c98..000000000000
--- a/testing/web-platform/tests/reporting/order.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML>
-<meta charset=utf-8>
-<title>Reporting: Order</title>
-<link rel="author" title="Paul Meyer" href="paulmeyer@chromium.org">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/resources/testdriver.js"></script>
-<script src="/resources/testdriver-vendor.js"></script>
-<p id="error">No error</p>
-<script>
-  var count = 0;
-  async_test(function(test) {
-    var observer = new ReportingObserver(function(reports) {
-      test.step(function() {
-        // Reports should be received in the same order that they were
-        // generated.
-        for(i in reports) {
-          assert_equals(reports[i].body.message, "" + count++);
-        }
-      });
-
-      if (count == 10)
-        test.done();
-    });
-    observer.observe();
-
-    for (i = 0; i != 10; ++i)
-      test_driver.generate_test_report("" + i);
-  }, "Order");
-</script>
-</body>
-</html>
diff --git a/testing/web-platform/tests/resources/testdriver.js b/testing/web-platform/tests/resources/testdriver.js
index 031be1b7e550..ea380dbd3c32 100644
--- a/testing/web-platform/tests/resources/testdriver.js
+++ b/testing/web-platform/tests/resources/testdriver.js
@@ -194,87 +194,30 @@
          */
         action_sequence: function(actions) {
             return window.test_driver_internal.action_sequence(actions);
-        },
-
-        /**
-         * Generates a test report on the current page
-         *
-         * The generate_test_report function generates a report (to be observed
-         * by ReportingObserver) for testing purposes, as described in
-         * {@link https://w3c.github.io/reporting/#generate-test-report-command}
-         *
-         * @returns {Promise} fulfilled after the report is generated, or
-         *                    rejected if the report generation fails
-         */
-        generate_test_report: function(message) {
-            return window.test_driver_internal.generate_test_report(message);
         }
     };
 
     window.test_driver_internal = {
         /**
-         * This flag should be set to `true` by any code which implements the
-         * internal methods defined below for automation purposes. Doing so
-         * allows the library to signal failure immediately when an automated
-         * implementation of one of the methods is not available.
-         */
-        in_automation: false,
-
-        /**
-         * Waits for a user-initiated click
+         * Triggers a user-initiated click
          *
          * @param {Element} element - element to be clicked
          * @param {{x: number, y: number} coords - viewport coordinates to click at
-         * @returns {Promise} fulfilled after click occurs
+         * @returns {Promise} fulfilled after click occurs or rejected if click fails
          */
         click: function(element, coords) {
-            if (this.in_automation) {
-                return Promise.reject(new Error('Not implemented'));
-            }
-
-            return new Promise(function(resolve, reject) {
-                element.addEventListener("click", resolve);
-            });
+            return Promise.reject(new Error("unimplemented"));
         },
 
         /**
-         * Waits for an element to receive a series of key presses
+         * Triggers a user-initiated click
          *
-         * @param {Element} element - element which should receve key presses
-         * @param {String} keys - keys to expect
-         * @returns {Promise} fulfilled after keys are received or rejected if
-         *                    an incorrect key sequence is received
+         * @param {Element} element - element to be clicked
+         * @param {String} keys - keys to send to the element
+         * @returns {Promise} fulfilled after keys are sent or rejected if click fails
          */
         send_keys: function(element, keys) {
-            if (this.in_automation) {
-                return Promise.reject(new Error('Not implemented'));
-            }
-
-            return new Promise(function(resolve, reject) {
-                var seen = "";
-
-                function remove() {
-                    element.removeEventListener("keydown", onKeyDown);
-                }
-
-                function onKeyDown(event) {
-                    if (event.key.length > 1) {
-                        return;
-                    }
-
-                    seen += event.key;
-
-                    if (keys.indexOf(seen) !== 0) {
-                        reject(new Error("Unexpected key sequence: " + seen));
-                        remove();
-                    } else if (seen === keys) {
-                        resolve();
-                        remove();
-                    }
-                }
-
-                element.addEventListener("keydown", onKeyDown);
-            });
+            return Promise.reject(new Error("unimplemented"));
         },
 
         /**
@@ -295,17 +238,6 @@
          */
         action_sequence: function(actions) {
             return Promise.reject(new Error("unimplemented"));
-        },
-
-        /**
-         * Generates a test report on the current page
-         *
-         * @param {String} message - the message to be contained in the report
-         * @returns {Promise} fulfilled after the report is generated, or
-         *                    rejected if the report generation fails
-         */
-        generate_test_report: function(message) {
-            return Promise.reject(new Error("unimplemented"));
         }
     };
 })();
diff --git a/testing/web-platform/tests/screen-orientation/lock-basic.html b/testing/web-platform/tests/screen-orientation/lock-basic.html
index c42aba783e4c..5b30459bf7fa 100644
--- a/testing/web-platform/tests/screen-orientation/lock-basic.html
+++ b/testing/web-platform/tests/screen-orientation/lock-basic.html
@@ -1,8 +1,6 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/resources/testdriver.js"></script>
-<script src="/resources/testdriver-vendor.js"></script>
 <script>
 test(() => {
   screen.orientation.unlock();
@@ -14,18 +12,11 @@ test(() => {
 }, "Test that screen.orientation.unlock() returns a void value");
 
 promise_test(async t => {
-  await test_driver.bless("request full screen", () => {
-    return document.documentElement.requestFullscreen();
-  });
   const value = await screen.orientation.lock('any');
   assert_equals(value, undefined);
-  return document.exitFullscreen();
 }, "Test that screen.orientation.lock returns a promise which will be fulfilled with a void value.");
 
 promise_test(async t => {
-  await test_driver.bless("request full screen", () => {
-    return document.documentElement.requestFullscreen();
-  });
   const orientations = [
     'any',
     'natural',
@@ -59,13 +50,9 @@ promise_test(async t => {
     }
   }
   screen.orientation.unlock();
-  return document.exitFullscreen();
 }, "Test that screen.orientation.lock returns a pending promise.");
 
 promise_test(async t => {
-  await test_driver.bless("request full screen", () => {
-    return document.documentElement.requestFullscreen();
-  });
   const preType = screen.orientation.type;
   const isPortrait = preType.includes("portrait");
   const newType = `${ isPortrait ? "landscape" : "portrait" }-primary`;
@@ -73,6 +60,5 @@ promise_test(async t => {
   assert_equals(screen.orientation.type, preType, "Must not change orientation until next spin of event loop");
   await p;
   assert_equals(screen.orientation.type, newType);
-  return document.exitFullscreen();
 }, "Test that screen.orientation.lock() is actually async");
 </script>
diff --git a/testing/web-platform/tests/screen-orientation/onchange-event.html b/testing/web-platform/tests/screen-orientation/onchange-event.html
index 401af096631a..538fafc41ec3 100644
--- a/testing/web-platform/tests/screen-orientation/onchange-event.html
+++ b/testing/web-platform/tests/screen-orientation/onchange-event.html
@@ -3,20 +3,13 @@
 <script src="/resources/testharnessreport.js"></script>
 <script>
 promise_test(async t => {
-  await test_driver.bless("request full screen", () => {
-    return document.documentElement.requestFullscreen();
-  });
   const type = screen.orientation.type;
   screen.orientation.onchange = t.unreached_func("change event should not be fired");
   await screen.orientation.lock(type);
   assert_equals(screen.orientation.type, type);
-  return document.exitFullscreen();
 }, "Test that orientationchange event is not fired when the orientation does not change.");
 
 promise_test(async t => {
-  await test_driver.bless("request full screen", () => {
-    return document.documentElement.requestFullscreen();
-  });
   let orientations = [
     'portrait-primary',
     'portrait-secondary',
@@ -34,6 +27,5 @@ promise_test(async t => {
     assert_equals(screen.orientation.type, orientation);
   }
   screen.orientation.unlock();
-  return document.exitFullscreen();
 }, "Test that orientationchange event is fired when the orientation changes.");
 </script>
diff --git a/testing/web-platform/tests/service-workers/service-worker/postmessage-to-client-message-queue.https.html b/testing/web-platform/tests/service-workers/service-worker/postmessage-to-client-message-queue.https.html
index 83e5f4540d14..caa4f9445d3d 100644
--- a/testing/web-platform/tests/service-workers/service-worker/postmessage-to-client-message-queue.https.html
+++ b/testing/web-platform/tests/service-workers/service-worker/postmessage-to-client-message-queue.https.html
@@ -141,12 +141,12 @@ function client_message_queue_enable_test(
     earliest_dispatch,
     description)
 {
-    function assert_state_less_than_equal(state1, state2, explanation) {
+    function later_state(state1, state2) {
         const states = ['init', 'install', 'start', 'finish', 'loaded'];
         const index1 = states.indexOf(state1);
         const index2 = states.indexOf(state2);
-        if (index1 > index2)
-          assert_unreached(explanation);
+        const max_index = Math.max(index1, index2);
+        return states[max_index];
     }
 
     client_message_queue_test('enable-client-message-queue.html', async t => {
@@ -161,13 +161,12 @@ function client_message_queue_enable_test(
 
         // Wait for all messages to get dispatched on the child's
         // ServiceWorkerContainer and then verify that each message
-        // was dispatched after |earliest_dispatch|.
+        // was dispatched while the child was in the correct state.
         const report = await t.frame.report;
         ['init', 'install', 'start'].forEach(state => {
-            const explanation = `Message sent in state '${state}' was dispatched in '${report[state]}', should be dispatched no earlier than '${earliest_dispatch}'`;
-            assert_state_less_than_equal(earliest_dispatch,
-                                         report[state],
-                                         explanation);
+            const dispatch = later_state(state, earliest_dispatch);
+            assert_equals(report[state], dispatch,
+                          `Message sent in state '${state}' dispatched in state '${dispatch}'`);
         });
     }, description);
 }
diff --git a/testing/web-platform/tests/service-workers/service-worker/update-registration-with-type.https.html b/testing/web-platform/tests/service-workers/service-worker/update-registration-with-type.https.html
index e7d3692812eb..b712c30f71e9 100644
--- a/testing/web-platform/tests/service-workers/service-worker/update-registration-with-type.https.html
+++ b/testing/web-platform/tests/service-workers/service-worker/update-registration-with-type.https.html
@@ -2,7 +2,7 @@
 <meta charset="utf-8">
 <title>Service Worker: Update the registration with a different script type.</title>
 <!-- common.js is for guid() -->
-<script src="/common/security-features/resources/common.js"></script>
+<script src="/mixed-content/generic/common.js"></script>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="resources/test-helpers.sub.js"></script>
diff --git a/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-cert_fetch_error-downgraded.tentative.html b/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-cert_fetch_error-downgraded.tentative.html
deleted file mode 100644
index 845b7e01ff28..000000000000
--- a/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-cert_fetch_error-downgraded.tentative.html
+++ /dev/null
@@ -1,64 +0,0 @@
-<!DOCTYPE html>
-<title>SXG reporting test of sxg.failed downgraded from sxg.cert_fetch_error for navigation</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/common/get-host-info.sub.js"></script>
-<script src="/network-error-logging/support/nel.sub.js"></script>
-<script src="../resources/sxg-util.js"></script>
-<body>
-<script>
-const alt_origin = get_host_info().HTTPS_NOTSAMESITE_ORIGIN;
-const test_origin = get_host_info().HTTPS_ORIGIN;
-
-nel_test(async t => {
-  await fetchResourceWithBasicPolicy();
-  const sxg_url =
-      alt_origin + '/signed-exchange/resources/sxg/sxg-cert-not-found.sxg?navigation';
-  const cert_url = test_origin + '/signed-exchange/resources/not_found_certfile.cbor';
-  const message = await openSXGInIframeAndWaitForMessage(t, sxg_url);
-  assert_equals(message.location,
-                innerURLOrigin() + '/signed-exchange/resources/inner-url.html');
-  assert_true(message.is_fallback);
-  assert_true(await reportsExist([
-    {
-      url: sxg_url,
-      user_agent: navigator.userAgent,
-      type: "network-error",
-      body: {
-        phase: "sxg",
-        // The origin of this SXG's certURL is different from the reporting
-        // origin. So the report must be downgraded.
-        type: "sxg.failed",
-        elapsed_time: 0,
-        status_code: 200,
-        referrer: location.href,
-        sxg: {
-          outer_url: sxg_url,
-          inner_url:
-              innerURLOrigin() + '/signed-exchange/resources/inner-url.html',
-          cert_url: [cert_url]
-        }
-      },
-      metadata: {
-        content_type: "application/reports+json",
-      },
-    },
-    {
-      url: sxg_url,
-      user_agent: navigator.userAgent,
-      type: "network-error",
-      body: {
-        phase: "application",
-        type: "ok",
-        status_code: 200,
-        referrer: location.href,
-      },
-      metadata: {
-        content_type: "application/reports+json",
-      },
-    },
-  ]));
-}, 'SXG reporting test of sxg.failed downgraded from sxg.cert_fetch_error for' +
-   ' navigation.');
-</script>
-</body>
diff --git a/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-cert_fetch_error.tentative.html b/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-cert_fetch_error.tentative.html
deleted file mode 100644
index 476af828e636..000000000000
--- a/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-cert_fetch_error.tentative.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<!DOCTYPE html>
-<title>SXG reporting test of sxg.cert_fetch_error for navigation</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/common/get-host-info.sub.js"></script>
-<script src="/network-error-logging/support/nel.sub.js"></script>
-<script src="../resources/sxg-util.js"></script>
-<body>
-<script>
-const alt_origin = get_host_info().HTTPS_NOTSAMESITE_ORIGIN;
-
-nel_test(async t => {
-  await fetchResourceWithBasicPolicy();
-  const sxg_url =
-      alt_origin +
-      '/signed-exchange/resources/sxg/sxg-cert-not-found-on-alt-origin.sxg?navigation';
-  const cert_url =
-      alt_origin + '/signed-exchange/resources/not_found_certfile.cbor';
-  const message = await openSXGInIframeAndWaitForMessage(t, sxg_url);
-  assert_equals(message.location,
-                innerURLOrigin() + '/signed-exchange/resources/inner-url.html');
-  assert_true(message.is_fallback);
-  assert_true(await reportsExist([
-    {
-      url: sxg_url,
-      user_agent: navigator.userAgent,
-      type: "network-error",
-      body: {
-        phase: "sxg",
-        // The origin of this SXG's certURL is same as the reporting origin. So
-        // the report must not be downgraded.
-        type: "sxg.cert_fetch_error",
-        status_code: 200,
-        referrer: location.href,
-        sxg: {
-          outer_url: sxg_url,
-          inner_url:
-              innerURLOrigin() + '/signed-exchange/resources/inner-url.html',
-          cert_url: [cert_url]
-        }
-      },
-      metadata: {
-        content_type: "application/reports+json",
-      },
-    },
-    {
-      url: sxg_url,
-      user_agent: navigator.userAgent,
-      type: "network-error",
-      body: {
-        phase: "application",
-        type: "ok",
-        status_code: 200,
-        referrer: location.href,
-      },
-      metadata: {
-        content_type: "application/reports+json",
-      },
-    },
-    {
-      url: cert_url,
-      user_agent: navigator.userAgent,
-      type: "network-error",
-      body: {
-        phase: "application",
-        type: "http.error",
-        status_code: 404,
-      },
-      metadata: {
-        content_type: "application/reports+json",
-      },
-    },
-  ]));
-}, 'SXG reporting test of sxg.cert_fetch_error for navigation.');
-</script>
-</body>
diff --git a/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-cert_parse_error-downgraded.tentative.html b/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-cert_parse_error-downgraded.tentative.html
deleted file mode 100644
index d962b884e53c..000000000000
--- a/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-cert_parse_error-downgraded.tentative.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<!DOCTYPE html>
-<title>SXG reporting test of sxg.failed downgraded from sxg.cert_parse_error for navigation</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/common/get-host-info.sub.js"></script>
-<script src="/network-error-logging/support/nel.sub.js"></script>
-<script src="../resources/sxg-util.js"></script>
-<body>
-<script>
-const alt_origin = get_host_info().HTTPS_NOTSAMESITE_ORIGIN;
-const test_origin = get_host_info().HTTPS_ORIGIN;
-
-nel_test(async t => {
-  await fetchResourceWithBasicPolicy();
-  const sxg_url =
-      alt_origin +
-      '/signed-exchange/resources/sxg/sxg-invalid-cert-format.sxg?navigation';
-  const cert_url =
-      test_origin + '/signed-exchange/resources/invalid-cert-format.cbor';
-  const message = await openSXGInIframeAndWaitForMessage(t, sxg_url);
-  assert_equals(message.location,
-                innerURLOrigin() + '/signed-exchange/resources/inner-url.html');
-  assert_true(message.is_fallback);
-  assert_true(await reportsExist([
-    {
-      url: sxg_url,
-      user_agent: navigator.userAgent,
-      type: "network-error",
-      body: {
-        phase: "sxg",
-        // The origin of this SXG's certURL is different from the reporting
-        // origin. So the report must be downgraded.
-        type: "sxg.failed",
-        elapsed_time: 0,
-        status_code: 200,
-        referrer: location.href,
-        sxg: {
-          outer_url: sxg_url,
-          inner_url:
-              innerURLOrigin() + '/signed-exchange/resources/inner-url.html',
-          cert_url: [cert_url]
-        }
-      },
-      metadata: {
-        content_type: "application/reports+json",
-      },
-    },
-    {
-      url: sxg_url,
-      user_agent: navigator.userAgent,
-      type: "network-error",
-      body: {
-        phase: "application",
-        type: "ok",
-        status_code: 200,
-        referrer: location.href,
-      },
-      metadata: {
-        content_type: "application/reports+json",
-      },
-    },
-  ]));
-}, 'SXG reporting test of sxg.failed downgraded from sxg.cert_parse_error for navigation.');
-</script>
-</body>
diff --git a/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-cert_parse_error.tentative.html b/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-cert_parse_error.tentative.html
deleted file mode 100644
index 11dc4141b8a6..000000000000
--- a/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-cert_parse_error.tentative.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<!DOCTYPE html>
-<title>SXG reporting test of sxg.cert_parse_error for navigation</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/common/get-host-info.sub.js"></script>
-<script src="/network-error-logging/support/nel.sub.js"></script>
-<script src="../resources/sxg-util.js"></script>
-<body>
-<script>
-const alt_origin = get_host_info().HTTPS_NOTSAMESITE_ORIGIN;
-
-nel_test(async t => {
-  await fetchResourceWithBasicPolicy();
-  const sxg_url =
-      alt_origin +
-      '/signed-exchange/resources/sxg/sxg-invalid-cert-format-on-alt-origin.sxg?navigation';
-  const cert_url =
-      alt_origin + '/signed-exchange/resources/invalid-cert-format.cbor';
-  const message = await openSXGInIframeAndWaitForMessage(t, sxg_url);
-  assert_equals(message.location,
-                innerURLOrigin() + '/signed-exchange/resources/inner-url.html');
-  assert_true(message.is_fallback);
-  assert_true(await reportsExist([
-    {
-      url: sxg_url,
-      user_agent: navigator.userAgent,
-      type: "network-error",
-      body: {
-        phase: "sxg",
-        // The origin of this SXG's certURL is same as the reporting origin. So
-        // the report must not be downgraded.
-        type: "sxg.cert_parse_error",
-        status_code: 200,
-        referrer: location.href,
-        sxg: {
-          outer_url: sxg_url,
-          inner_url:
-              innerURLOrigin() + '/signed-exchange/resources/inner-url.html',
-          cert_url: [cert_url]
-        }
-      },
-      metadata: {
-        content_type: "application/reports+json",
-      },
-    },
-    {
-      url: sxg_url,
-      user_agent: navigator.userAgent,
-      type: "network-error",
-      body: {
-        phase: "application",
-        type: "ok",
-        status_code: 200,
-        referrer: location.href,
-      },
-      metadata: {
-        content_type: "application/reports+json",
-      },
-    },
-    {
-      url: cert_url,
-      user_agent: navigator.userAgent,
-      type: "network-error",
-      body: {
-        phase: "application",
-        type: "ok",
-        status_code: 200,
-      },
-      metadata: {
-        content_type: "application/reports+json",
-      },
-    },
-  ]));
-}, 'SXG reporting test of sxg.cert_parse_error for navigation.');
-</script>
-</body>
diff --git a/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-cert_verification_error-downgraded.tentative.html b/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-cert_verification_error-downgraded.tentative.html
deleted file mode 100644
index a1358e753000..000000000000
--- a/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-cert_verification_error-downgraded.tentative.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<!DOCTYPE html>
-<title>SXG reporting test of sxg.failed downgraded from sxg.cert_verification_error for navigation</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/common/get-host-info.sub.js"></script>
-<script src="/network-error-logging/support/nel.sub.js"></script>
-<script src="../resources/sxg-util.js"></script>
-<body>
-<script>
-const alt_origin = get_host_info().HTTPS_NOTSAMESITE_ORIGIN;
-const test_origin = get_host_info().HTTPS_ORIGIN;
-
-nel_test(async t => {
-  await fetchResourceWithBasicPolicy();
-  const sxg_url =
-      alt_origin +
-      '/signed-exchange/resources/sxg/sxg-validity-period-too-long.sxg?navigation';
-  const cert_url = test_origin + '/signed-exchange/resources/127.0.0.1.sxg.pem.cbor';
-  const message = await openSXGInIframeAndWaitForMessage(t, sxg_url);
-  assert_equals(message.location,
-                innerURLOrigin() + '/signed-exchange/resources/inner-url.html', 'location');
-  assert_true(message.is_fallback, 'is_fallback');
-  assert_true(await reportsExist([
-    {
-      url: sxg_url,
-      user_agent: navigator.userAgent,
-      type: "network-error",
-      body: {
-        phase: "sxg",
-        // The origin of this SXG's certURL is different from the reporting
-        // origin. So the report must be downgraded.
-        type: "sxg.failed",
-        elapsed_time: 0,
-        status_code: 200,
-        referrer: location.href,
-        sxg: {
-          outer_url: sxg_url,
-          inner_url:
-              innerURLOrigin() + '/signed-exchange/resources/inner-url.html',
-          cert_url: [cert_url]
-        }
-      },
-      metadata: {
-        content_type: "application/reports+json",
-      },
-    },
-    {
-      url: sxg_url,
-      user_agent: navigator.userAgent,
-      type: "network-error",
-      body: {
-        phase: "application",
-        type: "ok",
-        status_code: 200,
-        referrer: location.href,
-      },
-      metadata: {
-        content_type: "application/reports+json",
-      },
-    },
-  ]));
-}, 'SXG reporting test of sxg.failed downgraded from ' +
-    'sxg.cert_verification_error for navigation.');
-</script>
-</body>
diff --git a/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-cert_verification_error.tentative.html b/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-cert_verification_error.tentative.html
deleted file mode 100644
index 81520f9df987..000000000000
--- a/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-cert_verification_error.tentative.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<!DOCTYPE html>
-<title>SXG reporting test of sxg.cert_verification_error for navigation</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/common/get-host-info.sub.js"></script>
-<script src="/network-error-logging/support/nel.sub.js"></script>
-<script src="../resources/sxg-util.js"></script>
-<body>
-<script>
-const alt_origin = get_host_info().HTTPS_NOTSAMESITE_ORIGIN;
-
-nel_test(async t => {
-  await fetchResourceWithBasicPolicy();
-  const sxg_url =
-      alt_origin +
-      '/signed-exchange/resources/sxg/sxg-validity-period-too-long-cert-on-alt-origin.sxg?navigation';
-  const cert_url = alt_origin + '/signed-exchange/resources/127.0.0.1.sxg.pem.cbor';
-  const message = await openSXGInIframeAndWaitForMessage(t, sxg_url);
-  assert_equals(message.location,
-                innerURLOrigin() + '/signed-exchange/resources/inner-url.html');
-  assert_true(message.is_fallback);
-  assert_true(await reportsExist([
-    {
-      url: sxg_url,
-      user_agent: navigator.userAgent,
-      type: "network-error",
-      body: {
-        phase: "sxg",
-        type: "sxg.cert_verification_error",
-        status_code: 200,
-        referrer: location.href,
-        sxg: {
-          outer_url: sxg_url,
-          inner_url:
-              innerURLOrigin() + '/signed-exchange/resources/inner-url.html',
-          cert_url: [cert_url]
-        }
-      },
-      metadata: {
-        content_type: "application/reports+json",
-      },
-    },
-    {
-      url: sxg_url,
-      user_agent: navigator.userAgent,
-      type: "network-error",
-      body: {
-        phase: "application",
-        type: "ok",
-        status_code: 200,
-        referrer: location.href,
-      },
-      metadata: {
-        content_type: "application/reports+json",
-      },
-    },
-  ]));
-}, 'SXG reporting test of sxg.cert_verification_error for navigation.');
-</script>
-</body>
diff --git a/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-failed-zero-success-fraction.tentative.html b/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-failed-zero-success-fraction.tentative.html
deleted file mode 100644
index c0e06c8a197b..000000000000
--- a/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-failed-zero-success-fraction.tentative.html
+++ /dev/null
@@ -1,69 +0,0 @@
-<!DOCTYPE html>
-<title>SXG reporting test of sxg.failed for navigation (zero success fraction)</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/common/get-host-info.sub.js"></script>
-<script src="/network-error-logging/support/nel.sub.js"></script>
-<script src="../resources/sxg-util.js"></script>
-<body>
-<script>
-const alt_origin = get_host_info().HTTPS_NOTSAMESITE_ORIGIN;
-const test_origin = get_host_info().HTTPS_ORIGIN;
-
-nel_test(async t => {
-  await fetchResourceWithZeroSuccessFractionPolicy();
-  const sxg_url =
-      alt_origin + '/signed-exchange/resources/sxg/sxg-cert-not-found.sxg?navigation';
-  const cert_url = test_origin + '/signed-exchange/resources/not_found_certfile.cbor';
-  const message = await openSXGInIframeAndWaitForMessage(t, sxg_url);
-  assert_equals(message.location,
-                innerURLOrigin() + '/signed-exchange/resources/inner-url.html');
-  assert_true(message.is_fallback);
-  assert_true(await reportExists(
-    {
-      url: sxg_url,
-      user_agent: navigator.userAgent,
-      type: "network-error",
-      body: {
-        phase: "sxg",
-        // The origin of this SXG's certURL is different from the reporting
-        // origin. So the report must be downgraded.
-        type: "sxg.failed",
-        elapsed_time: 0,
-        status_code: 200,
-        referrer: location.href,
-        sxg: {
-          outer_url: sxg_url,
-          inner_url:
-              innerURLOrigin() + '/signed-exchange/resources/inner-url.html',
-          cert_url: cert_url
-        }
-      },
-      metadata: {
-        content_type: "application/reports+json",
-      },
-    }
-  ), 'SXG error reporting must be downgraded when the cert URL is different ' +
-     'from the reporting origin');
-  assert_false(await reportExists(
-    {
-      url: sxg_url,
-      user_agent: navigator.userAgent,
-      type: "network-error",
-      body: {
-        phase: "application",
-        type: "ok",
-        status_code: 200,
-        referrer: location.href,
-      },
-      metadata: {
-        content_type: "application/reports+json",
-      },
-    }
-  ), 'Succeeded normal NEL report should not be sent when success fraction ' +
-     'is zero.');
-}, 'SXG error report must be downgraded when the cert URL is different from ' +
-   'the reporting origin. And succeeded normal NEL report should not be sent ' +
-   ' when success fraction is zero.');
-</script>
-</body>
diff --git a/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-invalid_integrity_header.tentative.html b/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-invalid_integrity_header.tentative.html
deleted file mode 100644
index aaad0c84b7b5..000000000000
--- a/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-invalid_integrity_header.tentative.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<!DOCTYPE html>
-<title>SXG reporting test of sxg.invalid_integrity_header for navigation</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/common/get-host-info.sub.js"></script>
-<script src="/network-error-logging/support/nel.sub.js"></script>
-<script src="../resources/sxg-util.js"></script>
-<body>
-<script>
-const alt_origin = get_host_info().HTTPS_NOTSAMESITE_ORIGIN;
-const test_origin = get_host_info().HTTPS_ORIGIN;
-
-nel_test(async t => {
-  await fetchResourceWithBasicPolicy();
-  const sxg_url =
-      alt_origin +
-      '/signed-exchange/resources/sxg/sxg-invalid-integrity-header.sxg?navigation';
-  const cert_url = test_origin + '/signed-exchange/resources/127.0.0.1.sxg.pem.cbor';
-  const message = await openSXGInIframeAndWaitForMessage(t, sxg_url);
-  assert_equals(message.location,
-                innerURLOrigin() + '/signed-exchange/resources/inner-url.html');
-  assert_true(message.is_fallback);
-  assert_true(await reportsExist([
-    {
-      url: sxg_url,
-      user_agent: navigator.userAgent,
-      type: "network-error",
-      body: {
-        phase: "sxg",
-        type: "sxg.invalid_integrity_header",
-        status_code: 200,
-        referrer: location.href,
-        sxg: {
-          outer_url: sxg_url,
-          inner_url:
-              innerURLOrigin() + '/signed-exchange/resources/inner-url.html',
-          cert_url: [cert_url]
-        }
-      },
-      metadata: {
-        content_type: "application/reports+json",
-      },
-    },
-    {
-      url: sxg_url,
-      user_agent: navigator.userAgent,
-      type: "network-error",
-      body: {
-        phase: "application",
-        type: "ok",
-        status_code: 200,
-        referrer: location.href,
-      },
-      metadata: {
-        content_type: "application/reports+json",
-      },
-    },
-  ]));
-}, 'SXG reporting test of sxg.invalid_integrity_header for navigation.');
-</script>
-</body>
diff --git a/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-mi_error.tentative.html b/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-mi_error.tentative.html
deleted file mode 100644
index 40d1ae01fc45..000000000000
--- a/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-mi_error.tentative.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<!DOCTYPE html>
-<title>SXG reporting test of sxg.mi_error for navigation</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/common/get-host-info.sub.js"></script>
-<script src="/network-error-logging/support/nel.sub.js"></script>
-<script src="../resources/sxg-util.js"></script>
-<body>
-<script>
-const alt_origin = get_host_info().HTTPS_NOTSAMESITE_ORIGIN;
-const test_origin = get_host_info().HTTPS_ORIGIN;
-
-nel_test(async t => {
-  await fetchResourceWithBasicPolicy();
-  const sxg_url =
-      alt_origin +
-      '/signed-exchange/resources/sxg/sxg-merkle-integrity-error.sxg?navigation';
-  const cert_url = test_origin + '/signed-exchange/resources/127.0.0.1.sxg.pem.cbor';
-  try {
-    const message = await openSXGInIframeAndWaitForMessage(t, sxg_url);
-    if (message.is_fallback) {
-        assert_unreached('Fallback redirect should not have happened');
-    } else {
-        assert_unreached('SXG should not have loaded');
-    }
-  } catch (e) {
-    assert_equals(e, 'timeout');
-  }
-  assert_true(await reportsExist([
-    {
-      url: sxg_url,
-      user_agent: navigator.userAgent,
-      type: "network-error",
-      body: {
-        phase: "sxg",
-        type: "sxg.mi_error",
-        status_code: 200,
-        referrer: location.href,
-        sxg: {
-          outer_url: sxg_url,
-          inner_url:
-              innerURLOrigin() + '/signed-exchange/resources/inner-url.html',
-          cert_url: [cert_url]
-        }
-      },
-      metadata: {
-        content_type: "application/reports+json",
-      },
-    },
-    {
-      url: sxg_url,
-      user_agent: navigator.userAgent,
-      type: "network-error",
-      body: {
-        phase: "application",
-        type: "ok",
-        status_code: 200,
-        referrer: location.href,
-      },
-      metadata: {
-        content_type: "application/reports+json",
-      },
-    }
-  ]));
-}, 'SXG reporting test of sxg.mi_error for navigation.');
-</script>
-</body>
diff --git a/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-ok.tentative.html b/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-ok.tentative.html
deleted file mode 100644
index ee9a50966d8f..000000000000
--- a/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-ok.tentative.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<!DOCTYPE html>
-<title>SXG reporting test of ok for navigation</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/common/get-host-info.sub.js"></script>
-<script src="/network-error-logging/support/nel.sub.js"></script>
-<script src="../resources/sxg-util.js"></script>
-<body>
-<script>
-const alt_origin = get_host_info().HTTPS_NOTSAMESITE_ORIGIN;
-const test_origin = get_host_info().HTTPS_ORIGIN;
-
-nel_test(async t => {
-  await fetchResourceWithBasicPolicy();
-  const sxg_url = alt_origin + '/signed-exchange/resources/sxg/sxg-location.sxg?navigation';
-  const cert_url = test_origin + '/signed-exchange/resources/127.0.0.1.sxg.pem.cbor';
-  const message = await openSXGInIframeAndWaitForMessage(t, sxg_url);
-  assert_equals(message.location,
-                innerURLOrigin() + '/signed-exchange/resources/inner-url.html');
-  assert_false(message.is_fallback);
-  assert_true(await reportsExist([
-    {
-      url: sxg_url,
-      user_agent: navigator.userAgent,
-      type: "network-error",
-      body: {
-        phase: "sxg",
-        type: "ok",
-        status_code: 200,
-        referrer: location.href,
-        sxg: {
-          outer_url: sxg_url,
-          inner_url:
-              innerURLOrigin() + '/signed-exchange/resources/inner-url.html',
-          cert_url: [cert_url]
-        }
-      },
-      metadata: {
-        content_type: "application/reports+json",
-      },
-    },
-    {
-      url: sxg_url,
-      user_agent: navigator.userAgent,
-      type: "network-error",
-      body: {
-        phase: "application",
-        type: "ok",
-        status_code: 200,
-        referrer: location.href,
-      },
-      metadata: {
-        content_type: "application/reports+json",
-      },
-    },
-  ]));
-}, 'SXG success report must be sent for navigation.');
-</script>
-</body>
diff --git a/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-parse_error.tentative.html b/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-parse_error.tentative.html
deleted file mode 100644
index aaaa3872511a..000000000000
--- a/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-parse_error.tentative.html
+++ /dev/null
@@ -1,64 +0,0 @@
-<!DOCTYPE html>
-<title>SXG reporting test of sxg.parse_error for navigation</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/common/get-host-info.sub.js"></script>
-<script src="/network-error-logging/support/nel.sub.js"></script>
-<script src="../resources/sxg-util.js"></script>
-<body>
-<script>
-const alt_origin = get_host_info().HTTPS_NOTSAMESITE_ORIGIN;
-
-nel_test(async t => {
-  await fetchResourceWithBasicPolicy();
-  const sxg_url =
-      alt_origin +
-      '/signed-exchange/resources/sxg/sxg-invalid-format.sxg?navigation';
-  try {
-    const message = await openSXGInIframeAndWaitForMessage(t, sxg_url);
-    if (message.is_fallback) {
-        assert_unreached('Fallback redirect should not have happened');
-    } else {
-        assert_unreached('SXG should not have loaded');
-    }
-  } catch (e) {
-    assert_equals(e, 'timeout');
-  }
-
-  assert_true(await reportsExist([
-    {
-      url: sxg_url,
-      user_agent: navigator.userAgent,
-      type: "network-error",
-      body: {
-        phase: "sxg",
-        type: "sxg.parse_error",
-        status_code: 200,
-        referrer: location.href,
-        sxg: {
-          outer_url: sxg_url,
-          cert_url: []
-        }
-      },
-      metadata: {
-        content_type: "application/reports+json",
-      },
-    },
-    {
-      url: sxg_url,
-      user_agent: navigator.userAgent,
-      type: "network-error",
-      body: {
-        phase: "application",
-        type: "ok",
-        status_code: 200,
-        referrer: location.href,
-      },
-      metadata: {
-        content_type: "application/reports+json",
-      },
-    },
-  ]));
-}, 'SXG reporting test of sxg.parse_error for navigation.');
-</script>
-</body>
diff --git a/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-signature_verification_error-downgraded.tentative.html b/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-signature_verification_error-downgraded.tentative.html
deleted file mode 100644
index 87bbc369f241..000000000000
--- a/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-signature_verification_error-downgraded.tentative.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<!DOCTYPE html>
-<title>SXG reporting test of sxg.failed downgraded from sxg.signature_verification_error for navigation</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/common/get-host-info.sub.js"></script>
-<script src="/network-error-logging/support/nel.sub.js"></script>
-<script src="../resources/sxg-util.js"></script>
-<body>
-<script>
-const alt_origin = get_host_info().HTTPS_NOTSAMESITE_ORIGIN;
-const test_origin = get_host_info().HTTPS_ORIGIN;
-
-nel_test(async t => {
-  await fetchResourceWithBasicPolicy();
-  const sxg_url =
-      alt_origin +
-      '/signed-exchange/resources/sxg/sxg-invalid-cert-sha256.sxg?navigation';
-  const cert_url = test_origin + '/signed-exchange/resources/127.0.0.1.sxg.pem.cbor';
-  const message = await openSXGInIframeAndWaitForMessage(t, sxg_url);
-  assert_equals(message.location,
-                innerURLOrigin() + '/signed-exchange/resources/inner-url.html');
-  assert_true(message.is_fallback);
-  assert_true(await reportsExist([
-    {
-      url: sxg_url,
-      user_agent: navigator.userAgent,
-      type: "network-error",
-      body: {
-        phase: "sxg",
-        // The origin of this SXG's certURL is different from the reporting
-        // origin. So the report must be downgraded.
-        type: "sxg.failed",
-        elapsed_time: 0,
-        status_code: 200,
-        referrer: location.href,
-        sxg: {
-          outer_url: sxg_url,
-          inner_url:
-              innerURLOrigin() + '/signed-exchange/resources/inner-url.html',
-          cert_url: [cert_url]
-        }
-      },
-      metadata: {
-        content_type: "application/reports+json",
-      },
-    },
-    {
-      url: sxg_url,
-      user_agent: navigator.userAgent,
-      type: "network-error",
-      body: {
-        phase: "application",
-        type: "ok",
-        status_code: 200,
-        referrer: location.href,
-      },
-      metadata: {
-        content_type: "application/reports+json",
-      },
-    },
-  ]));
-}, 'SXG reporting test of sxg.failed downgraded from ' +
-   'sxg.signature_verification_error for navigation.');
-</script>
-</body>
diff --git a/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-signature_verification_error.tentative.html b/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-signature_verification_error.tentative.html
deleted file mode 100644
index f57fd4d59670..000000000000
--- a/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-navigation-signature_verification_error.tentative.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<!DOCTYPE html>
-<title>SXG reporting test of sxg.signature_verification_error for navigation</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/common/get-host-info.sub.js"></script>
-<script src="/network-error-logging/support/nel.sub.js"></script>
-<script src="../resources/sxg-util.js"></script>
-<body>
-<script>
-const alt_origin = get_host_info().HTTPS_NOTSAMESITE_ORIGIN;
-
-nel_test(async t => {
-  await fetchResourceWithBasicPolicy();
-  const sxg_url =
-      alt_origin +
-      '/signed-exchange/resources/sxg/sxg-invalid-cert-sha256-cert-on-alt-origin.sxg?navigation';
-  const cert_url = alt_origin + '/signed-exchange/resources/127.0.0.1.sxg.pem.cbor';
-  const message = await openSXGInIframeAndWaitForMessage(t, sxg_url);
-  assert_equals(message.location,
-                innerURLOrigin() + '/signed-exchange/resources/inner-url.html');
-  assert_true(message.is_fallback);
-  assert_true(await reportsExist([
-    {
-      url: sxg_url,
-      user_agent: navigator.userAgent,
-      type: "network-error",
-      body: {
-        phase: "sxg",
-        type: "sxg.signature_verification_error",
-        status_code: 200,
-        referrer: location.href,
-        sxg: {
-          outer_url: sxg_url,
-          inner_url:
-              innerURLOrigin() + '/signed-exchange/resources/inner-url.html',
-          cert_url: [cert_url]
-        }
-      },
-      metadata: {
-        content_type: "application/reports+json",
-      },
-    },
-    {
-      url: sxg_url,
-      user_agent: navigator.userAgent,
-      type: "network-error",
-      body: {
-        phase: "application",
-        type: "ok",
-        status_code: 200,
-        referrer: location.href,
-      },
-      metadata: {
-        content_type: "application/reports+json",
-      },
-    },
-  ]));
-}, 'SXG reporting test of sxg.signature_verification_error for navigation.');
-</script>
-</body>
diff --git a/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-cert_fetch_error-downgraded.tentative.html b/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-cert_fetch_error-downgraded.tentative.html
deleted file mode 100644
index f663f35ce761..000000000000
--- a/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-cert_fetch_error-downgraded.tentative.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<!DOCTYPE html>
-<title>SXG reporting test of sxg.failed downgraded from sxg.cert_fetch_error for prefetch</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/common/get-host-info.sub.js"></script>
-<script src="/network-error-logging/support/nel.sub.js"></script>
-<script src="../resources/sxg-util.js"></script>
-<body>
-<script>
-const alt_origin = get_host_info().HTTPS_NOTSAMESITE_ORIGIN;
-const test_origin = get_host_info().HTTPS_ORIGIN;
-
-nel_test(async t => {
-  await fetchResourceWithBasicPolicy();
-  const sxg_url =
-      alt_origin + '/signed-exchange/resources/sxg/sxg-cert-not-found.sxg?prefetch';
-  const cert_url =
-      test_origin + '/signed-exchange/resources/not_found_certfile.cbor';
-  addPrefetch(sxg_url);
-  assert_true(await reportsExist([
-    {
-      url: sxg_url,
-      user_agent: navigator.userAgent,
-      type: "network-error",
-      body: {
-        phase: "sxg",
-        // The origin of this SXG's certURL is different from the reporting
-        // origin. So the report must be downgraded.
-        type: "sxg.failed",
-        elapsed_time: 0,
-        status_code: 200,
-        referrer: location.href,
-        sxg: {
-          outer_url: sxg_url,
-          inner_url:
-              innerURLOrigin() + '/signed-exchange/resources/inner-url.html',
-          cert_url: [cert_url]
-        }
-      },
-      metadata: {
-        content_type: "application/reports+json",
-      },
-    },
-    {
-      url: sxg_url,
-      user_agent: navigator.userAgent,
-      type: "network-error",
-      body: {
-        phase: "application",
-        type: "ok",
-        status_code: 200,
-        referrer: location.href,
-      },
-      metadata: {
-        content_type: "application/reports+json",
-      },
-    },
-  ]));
-}, 'SXG reporting test of sxg.failed downgraded from ' +
-   'sxg.cert_fetch_error for prefetch.');
-</script>
-</body>
diff --git a/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-cert_fetch_error.tentative.html b/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-cert_fetch_error.tentative.html
deleted file mode 100644
index c17fc5c02986..000000000000
--- a/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-cert_fetch_error.tentative.html
+++ /dev/null
@@ -1,73 +0,0 @@
-<!DOCTYPE html>
-<title>SXG reporting test of sxg.cert_fetch_error for prefetch</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/common/get-host-info.sub.js"></script>
-<script src="/network-error-logging/support/nel.sub.js"></script>
-<script src="../resources/sxg-util.js"></script>
-<body>
-<script>
-const alt_origin = get_host_info().HTTPS_NOTSAMESITE_ORIGIN;
-
-nel_test(async t => {
-  await fetchResourceWithBasicPolicy();
-  const sxg_url =
-      alt_origin +
-      '/signed-exchange/resources/sxg/sxg-cert-not-found-on-alt-origin.sxg?prefetch';
-  const cert_url =
-      alt_origin + '/signed-exchange/resources/not_found_certfile.cbor';
-  addPrefetch(sxg_url);
-  assert_true(await reportsExist([
-    {
-      url: sxg_url,
-      user_agent: navigator.userAgent,
-      type: "network-error",
-      body: {
-        phase: "sxg",
-        // The origin of this SXG's certURL is same as the reporting origin. So
-        // the report must not be downgraded.
-        type: "sxg.cert_fetch_error",
-        status_code: 200,
-        referrer: location.href,
-        sxg: {
-          outer_url: sxg_url,
-          inner_url:
-              innerURLOrigin() + '/signed-exchange/resources/inner-url.html',
-          cert_url: [cert_url]
-        }
-      },
-      metadata: {
-        content_type: "application/reports+json",
-      },
-    },
-    {
-      url: sxg_url,
-      user_agent: navigator.userAgent,
-      type: "network-error",
-      body: {
-        phase: "application",
-        type: "ok",
-        status_code: 200,
-        referrer: location.href,
-      },
-      metadata: {
-        content_type: "application/reports+json",
-      },
-    },
-    {
-      url: cert_url,
-      user_agent: navigator.userAgent,
-      type: "network-error",
-      body: {
-        phase: "application",
-        type: "http.error",
-        status_code: 404,
-      },
-      metadata: {
-        content_type: "application/reports+json",
-      },
-    },
-  ]));
-}, 'SXG reporting test of sxg.cert_fetch_error for prefetch.');
-</script>
-</body>
diff --git a/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-cert_parse_error-downgraded.tentative.html b/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-cert_parse_error-downgraded.tentative.html
deleted file mode 100644
index f1a5eb17f621..000000000000
--- a/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-cert_parse_error-downgraded.tentative.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<!DOCTYPE html>
-<title>SXG reporting test of sxg.failed downgraded from sxg.cert_parse_error for prefetch</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/common/get-host-info.sub.js"></script>
-<script src="/network-error-logging/support/nel.sub.js"></script>
-<script src="../resources/sxg-util.js"></script>
-<body>
-<script>
-const alt_origin = get_host_info().HTTPS_NOTSAMESITE_ORIGIN;
-const test_origin = get_host_info().HTTPS_ORIGIN;
-
-nel_test(async t => {
-  await fetchResourceWithBasicPolicy();
-  const sxg_url =
-      alt_origin +
-      '/signed-exchange/resources/sxg/sxg-invalid-cert-format.sxg?prefetch';
-  const cert_url =
-      test_origin + '/signed-exchange/resources/invalid-cert-format.cbor';
-  addPrefetch(sxg_url);
-  assert_true(await reportsExist([
-    {
-      url: sxg_url,
-      user_agent: navigator.userAgent,
-      type: "network-error",
-      body: {
-        phase: "sxg",
-        // The origin of this SXG's certURL is different from the reporting
-        // origin. So the report must be downgraded.
-        type: "sxg.failed",
-        elapsed_time: 0,
-        status_code: 200,
-        referrer: location.href,
-        sxg: {
-          outer_url: sxg_url,
-          inner_url:
-              innerURLOrigin() + '/signed-exchange/resources/inner-url.html',
-          cert_url: [cert_url]
-        }
-      },
-      metadata: {
-        content_type: "application/reports+json",
-      },
-    },
-    {
-      url: sxg_url,
-      user_agent: navigator.userAgent,
-      type: "network-error",
-      body: {
-        phase: "application",
-        type: "ok",
-        status_code: 200,
-        referrer: location.href,
-      },
-      metadata: {
-        content_type: "application/reports+json",
-      },
-    },
-  ]));
-}, 'SXG reporting test of sxg.failed downgraded from sxg.cert_parse_error for' +
-    ' prefetch.');
-</script>
-</body>
diff --git a/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-cert_parse_error.tentative.html b/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-cert_parse_error.tentative.html
deleted file mode 100644
index 00f41c0861c7..000000000000
--- a/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-cert_parse_error.tentative.html
+++ /dev/null
@@ -1,73 +0,0 @@
-<!DOCTYPE html>
-<title>SXG reporting test of sxg.cert_parse_error for prefetch</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/common/get-host-info.sub.js"></script>
-<script src="/network-error-logging/support/nel.sub.js"></script>
-<script src="../resources/sxg-util.js"></script>
-<body>
-<script>
-const alt_origin = get_host_info().HTTPS_NOTSAMESITE_ORIGIN;
-
-nel_test(async t => {
-  await fetchResourceWithBasicPolicy();
-  const sxg_url =
-      alt_origin +
-      '/signed-exchange/resources/sxg/sxg-invalid-cert-format-on-alt-origin.sxg?prefetch';
-  const cert_url =
-      alt_origin + '/signed-exchange/resources/invalid-cert-format.cbor';
-  addPrefetch(sxg_url);
-  assert_true(await reportsExist([
-    {
-      url: sxg_url,
-      user_agent: navigator.userAgent,
-      type: "network-error",
-      body: {
-        phase: "sxg",
-        // The origin of this SXG's certURL is same as the reporting origin. So
-        // the report must not be downgraded.
-        type: "sxg.cert_parse_error",
-        status_code: 200,
-        referrer: location.href,
-        sxg: {
-          outer_url: sxg_url,
-          inner_url:
-              innerURLOrigin() + '/signed-exchange/resources/inner-url.html',
-          cert_url: [cert_url]
-        }
-      },
-      metadata: {
-        content_type: "application/reports+json",
-      },
-    },
-    {
-      url: sxg_url,
-      user_agent: navigator.userAgent,
-      type: "network-error",
-      body: {
-        phase: "application",
-        type: "ok",
-        status_code: 200,
-        referrer: location.href,
-      },
-      metadata: {
-        content_type: "application/reports+json",
-      },
-    },
-    {
-      url: cert_url,
-      user_agent: navigator.userAgent,
-      type: "network-error",
-      body: {
-        phase: "application",
-        type: "ok",
-        status_code: 200,
-      },
-      metadata: {
-        content_type: "application/reports+json",
-      },
-    },
-  ]));
-}, 'SXG reporting test of sxg.cert_parse_error for prefetch.');
-</script>
-</body>
diff --git a/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-cert_verification_error-downgraded.tentative.html b/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-cert_verification_error-downgraded.tentative.html
deleted file mode 100644
index 4836dc1b9466..000000000000
--- a/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-cert_verification_error-downgraded.tentative.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<!DOCTYPE html>
-<title>SXG reporting test of sxg.failed downgraded from sxg.cert_verification_error for prefetch</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/common/get-host-info.sub.js"></script>
-<script src="/network-error-logging/support/nel.sub.js"></script>
-<script src="../resources/sxg-util.js"></script>
-<body>
-<script>
-const alt_origin = get_host_info().HTTPS_NOTSAMESITE_ORIGIN;
-const test_origin = get_host_info().HTTPS_ORIGIN;
-
-nel_test(async t => {
-  await fetchResourceWithBasicPolicy();
-  const sxg_url =
-      alt_origin +
-      '/signed-exchange/resources/sxg/sxg-validity-period-too-long.sxg?prefetch';
-  const cert_url = test_origin + '/signed-exchange/resources/127.0.0.1.sxg.pem.cbor';
-  addPrefetch(sxg_url);
-  assert_true(await reportsExist([
-    {
-      url: sxg_url,
-      user_agent: navigator.userAgent,
-      type: "network-error",
-      body: {
-        phase: "sxg",
-        // The origin of this SXG's certURL is different from the reporting
-        // origin. So the report must be downgraded.
-        type: "sxg.failed",
-        elapsed_time: 0,
-        status_code: 200,
-        referrer: location.href,
-        sxg: {
-          outer_url: sxg_url,
-          inner_url:
-              innerURLOrigin() + '/signed-exchange/resources/inner-url.html',
-          cert_url: [cert_url]
-        }
-      },
-      metadata: {
-        content_type: "application/reports+json",
-      },
-    },
-    {
-      url: sxg_url,
-      user_agent: navigator.userAgent,
-      type: "network-error",
-      body: {
-        phase: "application",
-        type: "ok",
-        status_code: 200,
-        referrer: location.href,
-      },
-      metadata: {
-        content_type: "application/reports+json",
-      },
-    },
-  ]));
-}, 'SXG reporting test of sxg.failed downgraded from ' +
-   'sxg.cert_verification_error for prefetch.');
-</script>
-</body>
diff --git a/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-cert_verification_error.tentative.html b/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-cert_verification_error.tentative.html
deleted file mode 100644
index 441a17af1052..000000000000
--- a/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-cert_verification_error.tentative.html
+++ /dev/null
@@ -1,57 +0,0 @@
-<!DOCTYPE html>
-<title>SXG reporting test of sxg.cert_verification_error for prefetch</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/common/get-host-info.sub.js"></script>
-<script src="/network-error-logging/support/nel.sub.js"></script>
-<script src="../resources/sxg-util.js"></script>
-<body>
-<script>
-const alt_origin = get_host_info().HTTPS_NOTSAMESITE_ORIGIN;
-
-nel_test(async t => {
-  await fetchResourceWithBasicPolicy();
-  const sxg_url =
-      alt_origin +
-      '/signed-exchange/resources/sxg/sxg-validity-period-too-long-cert-on-alt-origin.sxg?prefetch';
-  const cert_url = alt_origin + '/signed-exchange/resources/127.0.0.1.sxg.pem.cbor';
-  addPrefetch(sxg_url);
-  assert_true(await reportsExist([
-    {
-      url: sxg_url,
-      user_agent: navigator.userAgent,
-      type: "network-error",
-      body: {
-        phase: "sxg",
-        type: "sxg.cert_verification_error",
-        status_code: 200,
-        referrer: location.href,
-        sxg: {
-          outer_url: sxg_url,
-          inner_url:
-              innerURLOrigin() + '/signed-exchange/resources/inner-url.html',
-          cert_url: [cert_url]
-        }
-      },
-      metadata: {
-        content_type: "application/reports+json",
-      },
-    },
-    {
-      url: sxg_url,
-      user_agent: navigator.userAgent,
-      type: "network-error",
-      body: {
-        phase: "application",
-        type: "ok",
-        status_code: 200,
-        referrer: location.href,
-      },
-      metadata: {
-        content_type: "application/reports+json",
-      },
-    },
-  ]));
-}, 'SXG reporting test of sxg.cert_verification_error for prefetch.');
-</script>
-</body>
diff --git a/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-failed-zero-success-feaction.tentative.html b/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-failed-zero-success-feaction.tentative.html
deleted file mode 100644
index b0f7103053ba..000000000000
--- a/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-failed-zero-success-feaction.tentative.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<!DOCTYPE html>
-<title>SXG reporting test of sxg.failed for prefetch (zero success fraction)</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/common/get-host-info.sub.js"></script>
-<script src="/network-error-logging/support/nel.sub.js"></script>
-<script src="../resources/sxg-util.js"></script>
-<body>
-<script>
-const alt_origin = get_host_info().HTTPS_NOTSAMESITE_ORIGIN;
-const test_origin = get_host_info().HTTPS_ORIGIN;
-
-nel_test(async t => {
-  await fetchResourceWithZeroSuccessFractionPolicy();
-  const sxg_url =
-      alt_origin + '/signed-exchange/resources/sxg/sxg-cert-not-found.sxg?prefetch';
-  const cert_url =
-      test_origin + '/signed-exchange/resources/not_found_certfile.cbor';
-  addPrefetch(sxg_url);
-  assert_true(await reportExists(
-    {
-      url: sxg_url,
-      user_agent: navigator.userAgent,
-      type: "network-error",
-      body: {
-        phase: "sxg",
-        // The origin of this SXG's certURL is different from the reporting
-        // origin. So the report must be downgraded.
-        type: "sxg.failed",
-        elapsed_time: 0,
-        status_code: 200,
-        referrer: location.href,
-        sxg: {
-          outer_url: sxg_url,
-          inner_url:
-              innerURLOrigin() + '/signed-exchange/resources/inner-url.html',
-          cert_url: [cert_url]
-        }
-      },
-      metadata: {
-        content_type: "application/reports+json",
-      },
-    },
-  ), 'SXG error reporting must be downgraded when the cert URL is different ' +
-     'from the reporting origin');
-  assert_false(await reportExists(
-    {
-      url: sxg_url,
-      user_agent: navigator.userAgent,
-      type: "network-error",
-      body: {
-        phase: "application",
-        type: "ok",
-        status_code: 200,
-        referrer: location.href,
-      },
-      metadata: {
-        content_type: "application/reports+json",
-      },
-    }
-  ), 'Succeeded normal NEL report should not be sent when success fraction ' +
-     'is zero.');
-}, 'SXG error report must be downgraded when the cert URL is different from ' +
-   'the reporting origin. And succeeded normal NEL report should not be sent ' +
-   ' when success fraction is zero.');
-</script>
-</body>
diff --git a/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-invalid_integrity_header.tentative.html b/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-invalid_integrity_header.tentative.html
deleted file mode 100644
index 1fd431c1a0b0..000000000000
--- a/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-invalid_integrity_header.tentative.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<!DOCTYPE html>
-<title>SXG reporting test of sxg.invalid_integrity_header for prefetch</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/common/get-host-info.sub.js"></script>
-<script src="/network-error-logging/support/nel.sub.js"></script>
-<script src="../resources/sxg-util.js"></script>
-<body>
-<script>
-const alt_origin = get_host_info().HTTPS_NOTSAMESITE_ORIGIN;
-const test_origin = get_host_info().HTTPS_ORIGIN;
-
-nel_test(async t => {
-  await fetchResourceWithBasicPolicy();
-  const sxg_url =
-      alt_origin +
-      '/signed-exchange/resources/sxg/sxg-invalid-integrity-header.sxg?prefetch';
-  const cert_url = test_origin + '/signed-exchange/resources/127.0.0.1.sxg.pem.cbor';
-  addPrefetch(sxg_url);
-  assert_true(await reportsExist([
-    {
-      url: sxg_url,
-      user_agent: navigator.userAgent,
-      type: "network-error",
-      body: {
-        phase: "sxg",
-        type: "sxg.invalid_integrity_header",
-        status_code: 200,
-        referrer: location.href,
-        sxg: {
-          outer_url: sxg_url,
-          inner_url:
-              innerURLOrigin() + '/signed-exchange/resources/inner-url.html',
-          cert_url: [cert_url]
-        }
-      },
-      metadata: {
-        content_type: "application/reports+json",
-      },
-    },
-    {
-      url: sxg_url,
-      user_agent: navigator.userAgent,
-      type: "network-error",
-      body: {
-        phase: "application",
-        type: "ok",
-        status_code: 200,
-        referrer: location.href,
-      },
-      metadata: {
-        content_type: "application/reports+json",
-      },
-    },
-  ]));
-}, 'SXG reporting test of sxg.invalid_integrity_header for prefetch.');
-</script>
-</body>
diff --git a/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-mi_error.tentative.html b/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-mi_error.tentative.html
deleted file mode 100644
index 2bbf0e8f2582..000000000000
--- a/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-mi_error.tentative.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<!DOCTYPE html>
-<title>SXG reporting test of sxg.mi_error for prefetch</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/common/get-host-info.sub.js"></script>
-<script src="/network-error-logging/support/nel.sub.js"></script>
-<script src="../resources/sxg-util.js"></script>
-<body>
-<script>
-const alt_origin = get_host_info().HTTPS_NOTSAMESITE_ORIGIN;
-const test_origin = get_host_info().HTTPS_ORIGIN;
-
-nel_test(async t => {
-  await fetchResourceWithBasicPolicy();
-  const sxg_url =
-      alt_origin +
-      '/signed-exchange/resources/sxg/sxg-merkle-integrity-error.sxg?prefetch';
-  const cert_url = test_origin + '/signed-exchange/resources/127.0.0.1.sxg.pem.cbor';
-  addPrefetch(sxg_url);
-  assert_true(await reportsExist([
-    {
-      url: sxg_url,
-      user_agent: navigator.userAgent,
-      type: "network-error",
-      body: {
-        phase: "sxg",
-        type: "sxg.mi_error",
-        status_code: 200,
-        referrer: location.href,
-        sxg: {
-          outer_url: sxg_url,
-          inner_url:
-              innerURLOrigin() + '/signed-exchange/resources/inner-url.html',
-          cert_url: [cert_url]
-        }
-      },
-      metadata: {
-        content_type: "application/reports+json",
-      },
-    },
-    {
-      url: sxg_url,
-      user_agent: navigator.userAgent,
-      type: "network-error",
-      body: {
-        phase: "application",
-        type: "ok",
-        status_code: 200,
-        referrer: location.href,
-      },
-      metadata: {
-        content_type: "application/reports+json",
-      },
-    }
-  ]));
-}, 'SXG reporting test of sxg.mi_error for prefetch.');
-</script>
-</body>
diff --git a/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-ok.tentative.html b/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-ok.tentative.html
deleted file mode 100644
index fb5fb58c9f70..000000000000
--- a/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-ok.tentative.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE html>
-<title>SXG reporting test of ok for prefetch</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/common/get-host-info.sub.js"></script>
-<script src="/network-error-logging/support/nel.sub.js"></script>
-<script src="../resources/sxg-util.js"></script>
-<body>
-<script>
-const alt_origin = get_host_info().HTTPS_NOTSAMESITE_ORIGIN;
-const test_origin = get_host_info().HTTPS_ORIGIN;
-
-nel_test(async t => {
-  await fetchResourceWithBasicPolicy();
-  const sxg_url = alt_origin + '/signed-exchange/resources/sxg/sxg-location.sxg?prefetch';
-  const cert_url = test_origin + '/signed-exchange/resources/127.0.0.1.sxg.pem.cbor';
-  addPrefetch(sxg_url);
-  assert_true(await reportsExist([
-    {
-      url: sxg_url,
-      user_agent: navigator.userAgent,
-      type: "network-error",
-      body: {
-        phase: "sxg",
-        type: "ok",
-        status_code: 200,
-        referrer: location.href,
-        sxg: {
-          outer_url: sxg_url,
-          inner_url:
-              innerURLOrigin() + '/signed-exchange/resources/inner-url.html',
-          cert_url: [cert_url]
-        }
-      },
-      metadata: {
-        content_type: "application/reports+json",
-      },
-    },
-    {
-      url: sxg_url,
-      user_agent: navigator.userAgent,
-      type: "network-error",
-      body: {
-        phase: "application",
-        type: "ok",
-        status_code: 200,
-        referrer: location.href,
-      },
-      metadata: {
-        content_type: "application/reports+json",
-      },
-    },
-  ]));
-}, 'SXG success report must be sent for prefetching.');
-</script>
-</body>
diff --git a/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-parse_error.tentative.html b/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-parse_error.tentative.html
deleted file mode 100644
index 171baf1b4a93..000000000000
--- a/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-parse_error.tentative.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<!DOCTYPE html>
-<title>SXG reporting test of sxg.parse_error for prefetch</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/common/get-host-info.sub.js"></script>
-<script src="/network-error-logging/support/nel.sub.js"></script>
-<script src="../resources/sxg-util.js"></script>
-<body>
-<script>
-const alt_origin = get_host_info().HTTPS_NOTSAMESITE_ORIGIN;
-
-nel_test(async t => {
-  await fetchResourceWithBasicPolicy();
-  const sxg_url =
-      alt_origin +
-      '/signed-exchange/resources/sxg/sxg-invalid-format.sxg?prefetch';
-  addPrefetch(sxg_url);
-  assert_true(await reportsExist([
-    {
-      url: sxg_url,
-      user_agent: navigator.userAgent,
-      type: "network-error",
-      body: {
-        phase: "sxg",
-        type: "sxg.parse_error",
-        status_code: 200,
-        referrer: location.href,
-        sxg: {
-          outer_url: sxg_url,
-          cert_url: []
-        }
-      },
-      metadata: {
-        content_type: "application/reports+json",
-      },
-    },
-    {
-      url: sxg_url,
-      user_agent: navigator.userAgent,
-      type: "network-error",
-      body: {
-        phase: "application",
-        type: "ok",
-        status_code: 200,
-        referrer: location.href,
-      },
-      metadata: {
-        content_type: "application/reports+json",
-      },
-    },
-  ]));
-}, 'SXG reporting test of sxg.parse_error for prefetch.');
-</script>
-</body>
diff --git a/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-signature_verification_error-downgraded.tentative.html b/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-signature_verification_error-downgraded.tentative.html
deleted file mode 100644
index 7340b75e35eb..000000000000
--- a/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-signature_verification_error-downgraded.tentative.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<!DOCTYPE html>
-<title>SXG reporting test of sxg.failed downgraded from sxg.signature_verification_error for prefetch</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/common/get-host-info.sub.js"></script>
-<script src="/network-error-logging/support/nel.sub.js"></script>
-<script src="../resources/sxg-util.js"></script>
-<body>
-<script>
-const alt_origin = get_host_info().HTTPS_NOTSAMESITE_ORIGIN;
-const test_origin = get_host_info().HTTPS_ORIGIN;
-
-nel_test(async t => {
-  await fetchResourceWithBasicPolicy();
-  const sxg_url =
-      alt_origin +
-      '/signed-exchange/resources/sxg/sxg-invalid-cert-sha256.sxg?prefetch';
-  const cert_url = test_origin + '/signed-exchange/resources/127.0.0.1.sxg.pem.cbor';
-  addPrefetch(sxg_url);
-  assert_true(await reportsExist([
-    {
-      url: sxg_url,
-      user_agent: navigator.userAgent,
-      type: "network-error",
-      body: {
-        phase: "sxg",
-        // The origin of this SXG's certURL is different from the reporting
-        // origin. So the report must be downgraded.
-        type: "sxg.failed",
-        elapsed_time: 0,
-        status_code: 200,
-        referrer: location.href,
-        sxg: {
-          outer_url: sxg_url,
-          inner_url:
-              innerURLOrigin() + '/signed-exchange/resources/inner-url.html',
-          cert_url: [cert_url]
-        }
-      },
-      metadata: {
-        content_type: "application/reports+json",
-      },
-    },
-    {
-      url: sxg_url,
-      user_agent: navigator.userAgent,
-      type: "network-error",
-      body: {
-        phase: "application",
-        type: "ok",
-        status_code: 200,
-        referrer: location.href,
-      },
-      metadata: {
-        content_type: "application/reports+json",
-      },
-    },
-  ]));
-}, 'SXG reporting test of sxg.failed downgraded from ' +
-   'sxg.signature_verification_error for prefetch.');
-</script>
-</body>
diff --git a/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-signature_verification_error.tentative.html b/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-signature_verification_error.tentative.html
deleted file mode 100644
index d552c4a8c339..000000000000
--- a/testing/web-platform/tests/signed-exchange/reporting/sxg-reporting-prefetch-signature_verification_error.tentative.html
+++ /dev/null
@@ -1,57 +0,0 @@
-<!DOCTYPE html>
-<title>SXG reporting test of sxg.signature_verification_error for prefetch</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/common/get-host-info.sub.js"></script>
-<script src="/network-error-logging/support/nel.sub.js"></script>
-<script src="../resources/sxg-util.js"></script>
-<body>
-<script>
-const alt_origin = get_host_info().HTTPS_NOTSAMESITE_ORIGIN;
-
-nel_test(async t => {
-  await fetchResourceWithBasicPolicy();
-  const sxg_url =
-      alt_origin +
-      '/signed-exchange/resources/sxg/sxg-invalid-cert-sha256-cert-on-alt-origin.sxg?prefetch';
-  const cert_url = alt_origin + '/signed-exchange/resources/127.0.0.1.sxg.pem.cbor';
-  addPrefetch(sxg_url);
-  assert_true(await reportsExist([
-    {
-      url: sxg_url,
-      user_agent: navigator.userAgent,
-      type: "network-error",
-      body: {
-        phase: "sxg",
-        type: "sxg.signature_verification_error",
-        status_code: 200,
-        referrer: location.href,
-        sxg: {
-          outer_url: sxg_url,
-          inner_url:
-              innerURLOrigin() + '/signed-exchange/resources/inner-url.html',
-          cert_url: [cert_url]
-        }
-      },
-      metadata: {
-        content_type: "application/reports+json",
-      },
-    },
-    {
-      url: sxg_url,
-      user_agent: navigator.userAgent,
-      type: "network-error",
-      body: {
-        phase: "application",
-        type: "ok",
-        status_code: 200,
-        referrer: location.href,
-      },
-      metadata: {
-        content_type: "application/reports+json",
-      },
-    },
-  ]));
-}, 'SXG reporting test of sxg.signature_verification_error for prefetch.');
-</script>
-</body>
diff --git a/testing/web-platform/tests/signed-exchange/resources/generate-test-sxgs.sh b/testing/web-platform/tests/signed-exchange/resources/generate-test-sxgs.sh
index bae4ce0eaed3..7c953940cb30 100755
--- a/testing/web-platform/tests/signed-exchange/resources/generate-test-sxgs.sh
+++ b/testing/web-platform/tests/signed-exchange/resources/generate-test-sxgs.sh
@@ -7,7 +7,6 @@ inner_url_origin=https://127.0.0.1:8444
 # the fly.
 wpt_test_origin=https://web-platform.test:8444
 wpt_test_remote_origin=https://www1.web-platform.test:8444
-wpt_test_alt_origin=https://not-web-platform.test:8444
 cert_url_origin=$wpt_test_origin
 sxg_content_type='content-type: application/signed-exchange;v=b3'
 
@@ -41,22 +40,6 @@ gen-signedexchange \
   -o sxg/sxg-location.sxg \
   -miRecordSize 100
 
-# A valid Signed Exchange. The origin of certUrl is the "alt" origin where NEL
-# policy is installed in reporting tests.
-gen-signedexchange \
-  -version $sxg_version \
-  -uri $inner_url_origin/signed-exchange/resources/inner-url.html \
-  -status 200 \
-  -content sxg-location.html \
-  -certificate $certfile \
-  -certUrl $wpt_test_alt_origin/signed-exchange/resources/$certfile.cbor \
-  -validityUrl $inner_url_origin/signed-exchange/resources/resource.validity.msg \
-  -privateKey $keyfile \
-  -date 2018-04-01T00:00:00Z \
-  -expire 168h \
-  -o sxg/sxg-location-cert-on-alt-origin.sxg \
-  -miRecordSize 100
-
 # A signed exchange of unsupported version.
 gen-signedexchange \
   -version 1b2 \
@@ -171,38 +154,6 @@ gen-signedexchange \
   -miRecordSize 100 \
   -ignoreErrors true
 
-# certUrl is 404 and the origin of certUrl is different from the "alt" origin
-# where NEL policy is installed in reporting tests.
-gen-signedexchange \
-  -version $sxg_version \
-  -uri $inner_url_origin/signed-exchange/resources/inner-url.html \
-  -status 200 \
-  -content sxg-location.html \
-  -certificate $certfile \
-  -certUrl $cert_url_origin/signed-exchange/resources/not_found_certfile.cbor \
-  -validityUrl $inner_url_origin/signed-exchange/resources/resource.validity.msg \
-  -privateKey $keyfile \
-  -date 2018-04-01T00:00:00Z \
-  -expire 168h \
-  -o sxg/sxg-cert-not-found.sxg \
-  -miRecordSize 100
-
-# certUrl is 404 and the origin of certUrl is the "alt" origin where NEL policy
-# is installed in reporting tests.
-gen-signedexchange \
-  -version $sxg_version \
-  -uri $inner_url_origin/signed-exchange/resources/inner-url.html \
-  -status 200 \
-  -content sxg-location.html \
-  -certificate $certfile \
-  -certUrl $wpt_test_alt_origin/signed-exchange/resources/not_found_certfile.cbor \
-  -validityUrl $inner_url_origin/signed-exchange/resources/resource.validity.msg \
-  -privateKey $keyfile \
-  -date 2018-04-01T00:00:00Z \
-  -expire 168h \
-  -o sxg/sxg-cert-not-found-on-alt-origin.sxg \
-  -miRecordSize 100
-
 # certUrl is 404 and fallback URL is another signed exchange.
 gen-signedexchange \
   -version $sxg_version \
@@ -219,38 +170,6 @@ gen-signedexchange \
   -miRecordSize 100 \
   -ignoreErrors true
 
-# certUrl is an invalid cert and the origin of certUrl is different from the
-# "alt" origin where NEL policy is installed in reporting tests.
-gen-signedexchange \
-  -version $sxg_version \
-  -uri $inner_url_origin/signed-exchange/resources/inner-url.html \
-  -status 200 \
-  -content sxg-location.html \
-  -certificate $certfile \
-  -certUrl $cert_url_origin/signed-exchange/resources/invalid-cert-format.cbor \
-  -validityUrl $inner_url_origin/signed-exchange/resources/resource.validity.msg \
-  -privateKey $keyfile \
-  -date 2018-04-01T00:00:00Z \
-  -expire 168h \
-  -o sxg/sxg-invalid-cert-format.sxg \
-  -miRecordSize 100
-
-# certUrl is an invalid cert and the origin of certUrl is the "alt" origin where
-# NEL policy is installed in reporting tests.
-gen-signedexchange \
-  -version $sxg_version \
-  -uri $inner_url_origin/signed-exchange/resources/inner-url.html \
-  -status 200 \
-  -content sxg-location.html \
-  -certificate $certfile \
-  -certUrl $wpt_test_alt_origin/signed-exchange/resources/invalid-cert-format.cbor \
-  -validityUrl $inner_url_origin/signed-exchange/resources/resource.validity.msg \
-  -privateKey $keyfile \
-  -date 2018-04-01T00:00:00Z \
-  -expire 168h \
-  -o sxg/sxg-invalid-cert-format-on-alt-origin.sxg \
-  -miRecordSize 100
-
 # Nested signed exchange.
 gen-signedexchange \
   -version $sxg_version \
@@ -353,56 +272,4 @@ gen-signedexchange \
   -miRecordSize 100 \
   -ignoreErrors true
 
-
-
-# Signed Exchange with payload integrity error.
-echo 'garbage' | cat sxg/sxg-location.sxg - >sxg/sxg-merkle-integrity-error.sxg
-
-# An invalid signed exchange which integrity header is invalid.
-cat sxg/sxg-location.sxg |
-  sed 's/digest\/mi-sha256-03/digest\/mi-sha256-xx/' \
-    > sxg/sxg-invalid-integrity-header.sxg
-
-# An invalid signed exchange which cert-sha256 is invalid.
-dummy_sha256=`echo "dummy" | openssl dgst -binary -sha256 | base64`
-cat sxg/sxg-location.sxg |
-  sed "s/cert-sha256=\*[^*]*\*;/cert-sha256=*$dummy_sha256*;/" \
-    > sxg/sxg-invalid-cert-sha256.sxg
-cat sxg/sxg-location-cert-on-alt-origin.sxg |
-  sed "s/cert-sha256=\*[^*]*\*;/cert-sha256=*$dummy_sha256*;/" \
-    > sxg/sxg-invalid-cert-sha256-cert-on-alt-origin.sxg
-
-# An invalid signed exchange which validity period is too long.
-gen-signedexchange \
-  -version $sxg_version \
-  -uri $inner_url_origin/signed-exchange/resources/inner-url.html \
-  -status 200 \
-  -content sxg-location.html \
-  -certificate $certfile \
-  -certUrl $cert_url_origin/signed-exchange/resources/$certfile.cbor \
-  -validityUrl $inner_url_origin/signed-exchange/resources/resource.validity.msg \
-  -privateKey $keyfile \
-  -date 2018-04-01T00:00:00Z \
-  -expire 300h \
-  -o sxg/sxg-validity-period-too-long.sxg \
-  -miRecordSize 100 \
-  -ignoreErrors true
-
-# An invalid signed exchange which validity period is too long. The origin of
-# certUrl is the "alt" origin where NEL policy is installed in reporting tests.
-gen-signedexchange \
-  -version $sxg_version \
-  -uri $inner_url_origin/signed-exchange/resources/inner-url.html \
-  -status 200 \
-  -content sxg-location.html \
-  -certificate $certfile \
-  -certUrl $wpt_test_alt_origin/signed-exchange/resources/$certfile.cbor \
-  -validityUrl $inner_url_origin/signed-exchange/resources/resource.validity.msg \
-  -privateKey $keyfile \
-  -date 2018-04-01T00:00:00Z \
-  -expire 300h \
-  -o sxg/sxg-validity-period-too-long-cert-on-alt-origin.sxg \
-  -miRecordSize 100 \
-  -ignoreErrors true
-
 rm -fr $tmpdir
diff --git a/testing/web-platform/tests/signed-exchange/resources/invalid-cert-format.cbor b/testing/web-platform/tests/signed-exchange/resources/invalid-cert-format.cbor
deleted file mode 100644
index 82f15ff924af..000000000000
--- a/testing/web-platform/tests/signed-exchange/resources/invalid-cert-format.cbor
+++ /dev/null
@@ -1 +0,0 @@
-This is an invalid certificate file.
diff --git a/testing/web-platform/tests/signed-exchange/resources/invalid-cert-format.cbor.headers b/testing/web-platform/tests/signed-exchange/resources/invalid-cert-format.cbor.headers
deleted file mode 100644
index d581d5987ea0..000000000000
--- a/testing/web-platform/tests/signed-exchange/resources/invalid-cert-format.cbor.headers
+++ /dev/null
@@ -1 +0,0 @@
-Content-Type: application/cert-chain+cbor
diff --git a/testing/web-platform/tests/signed-exchange/resources/sxg-util.js b/testing/web-platform/tests/signed-exchange/resources/sxg-util.js
index 7abb3cf20790..67439c8a6e4f 100644
--- a/testing/web-platform/tests/signed-exchange/resources/sxg-util.js
+++ b/testing/web-platform/tests/signed-exchange/resources/sxg-util.js
@@ -65,10 +65,3 @@ function runReferrerTests(test_cases) {
     }, 'Referrer of SignedHTTPExchange test : ' + JSON.stringify(test_case));
   }
 }
-
-function addPrefetch(url) {
-  const link = document.createElement('link');
-  link.rel = 'prefetch';
-  link.href = url;
-  document.body.appendChild(link);
-}
diff --git a/testing/web-platform/tests/signed-exchange/resources/sxg/sxg-cert-not-found-on-alt-origin.sxg b/testing/web-platform/tests/signed-exchange/resources/sxg/sxg-cert-not-found-on-alt-origin.sxg
deleted file mode 100644
index 2a7dbf6fa69a..000000000000
Binary files a/testing/web-platform/tests/signed-exchange/resources/sxg/sxg-cert-not-found-on-alt-origin.sxg and /dev/null differ
diff --git a/testing/web-platform/tests/signed-exchange/resources/sxg/sxg-cert-not-found.sxg b/testing/web-platform/tests/signed-exchange/resources/sxg/sxg-cert-not-found.sxg
deleted file mode 100644
index 072125400abb..000000000000
Binary files a/testing/web-platform/tests/signed-exchange/resources/sxg/sxg-cert-not-found.sxg and /dev/null differ
diff --git a/testing/web-platform/tests/signed-exchange/resources/sxg/sxg-invalid-cert-format-on-alt-origin.sxg b/testing/web-platform/tests/signed-exchange/resources/sxg/sxg-invalid-cert-format-on-alt-origin.sxg
deleted file mode 100644
index 62acedd390e1..000000000000
Binary files a/testing/web-platform/tests/signed-exchange/resources/sxg/sxg-invalid-cert-format-on-alt-origin.sxg and /dev/null differ
diff --git a/testing/web-platform/tests/signed-exchange/resources/sxg/sxg-invalid-cert-format.sxg b/testing/web-platform/tests/signed-exchange/resources/sxg/sxg-invalid-cert-format.sxg
deleted file mode 100644
index 30e4fcd91249..000000000000
Binary files a/testing/web-platform/tests/signed-exchange/resources/sxg/sxg-invalid-cert-format.sxg and /dev/null differ
diff --git a/testing/web-platform/tests/signed-exchange/resources/sxg/sxg-invalid-cert-sha256-cert-on-alt-origin.sxg b/testing/web-platform/tests/signed-exchange/resources/sxg/sxg-invalid-cert-sha256-cert-on-alt-origin.sxg
deleted file mode 100644
index 066a3cc0a4d4..000000000000
Binary files a/testing/web-platform/tests/signed-exchange/resources/sxg/sxg-invalid-cert-sha256-cert-on-alt-origin.sxg and /dev/null differ
diff --git a/testing/web-platform/tests/signed-exchange/resources/sxg/sxg-invalid-cert-sha256.sxg b/testing/web-platform/tests/signed-exchange/resources/sxg/sxg-invalid-cert-sha256.sxg
deleted file mode 100644
index 46d2bb1386ea..000000000000
Binary files a/testing/web-platform/tests/signed-exchange/resources/sxg/sxg-invalid-cert-sha256.sxg and /dev/null differ
diff --git a/testing/web-platform/tests/signed-exchange/resources/sxg/sxg-invalid-format.sxg b/testing/web-platform/tests/signed-exchange/resources/sxg/sxg-invalid-format.sxg
deleted file mode 100644
index 3fbb151b5ca3..000000000000
--- a/testing/web-platform/tests/signed-exchange/resources/sxg/sxg-invalid-format.sxg
+++ /dev/null
@@ -1 +0,0 @@
-This is an invalid Signed Exchange.
diff --git a/testing/web-platform/tests/signed-exchange/resources/sxg/sxg-invalid-integrity-header.sxg b/testing/web-platform/tests/signed-exchange/resources/sxg/sxg-invalid-integrity-header.sxg
deleted file mode 100644
index 95d358245c90..000000000000
Binary files a/testing/web-platform/tests/signed-exchange/resources/sxg/sxg-invalid-integrity-header.sxg and /dev/null differ
diff --git a/testing/web-platform/tests/signed-exchange/resources/sxg/sxg-location-cert-on-alt-origin.sxg b/testing/web-platform/tests/signed-exchange/resources/sxg/sxg-location-cert-on-alt-origin.sxg
deleted file mode 100644
index a2ddc77951ce..000000000000
Binary files a/testing/web-platform/tests/signed-exchange/resources/sxg/sxg-location-cert-on-alt-origin.sxg and /dev/null differ
diff --git a/testing/web-platform/tests/signed-exchange/resources/sxg/sxg-merkle-integrity-error.sxg b/testing/web-platform/tests/signed-exchange/resources/sxg/sxg-merkle-integrity-error.sxg
deleted file mode 100644
index 0c6dce01da27..000000000000
Binary files a/testing/web-platform/tests/signed-exchange/resources/sxg/sxg-merkle-integrity-error.sxg and /dev/null differ
diff --git a/testing/web-platform/tests/signed-exchange/resources/sxg/sxg-validity-period-too-long-cert-on-alt-origin.sxg b/testing/web-platform/tests/signed-exchange/resources/sxg/sxg-validity-period-too-long-cert-on-alt-origin.sxg
deleted file mode 100644
index 294f97b097a4..000000000000
Binary files a/testing/web-platform/tests/signed-exchange/resources/sxg/sxg-validity-period-too-long-cert-on-alt-origin.sxg and /dev/null differ
diff --git a/testing/web-platform/tests/signed-exchange/resources/sxg/sxg-validity-period-too-long.sxg b/testing/web-platform/tests/signed-exchange/resources/sxg/sxg-validity-period-too-long.sxg
deleted file mode 100644
index e90d9bc66de7..000000000000
Binary files a/testing/web-platform/tests/signed-exchange/resources/sxg/sxg-validity-period-too-long.sxg and /dev/null differ
diff --git a/testing/web-platform/tests/signed-exchange/sxg-merkle-integrity-error.tentative.html b/testing/web-platform/tests/signed-exchange/sxg-merkle-integrity-error.tentative.html
deleted file mode 100644
index 5f923d205421..000000000000
--- a/testing/web-platform/tests/signed-exchange/sxg-merkle-integrity-error.tentative.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE html>
-<title>SignedHTTPExchange with payload integrity error</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/common/get-host-info.sub.js"></script>
-<script src="./resources/sxg-util.js"></script>
-<body>
-<script>
-promise_test(async (t) => {
-  try {
-    const sxgUrl = get_host_info().HTTPS_ORIGIN + '/signed-exchange/resources/sxg/sxg-merkle-integrity-error.sxg';
-    const message = await openSXGInIframeAndWaitForMessage(t, sxgUrl);
-    if (message.is_fallback) {
-        assert_unreached('Fallback redirect should not have happened');
-    } else {
-        assert_unreached('SXG should not have loaded');
-    }
-  } catch (e) {
-    assert_equals(e, 'timeout');
-  }
-}, "SignedHTTPExchange with payload integrity error");
-
-</script>
-</body>
diff --git a/testing/web-platform/tests/signed-exchange/sxg-prefetch-merkle-integrity-error.tentative.html b/testing/web-platform/tests/signed-exchange/sxg-prefetch-merkle-integrity-error.tentative.html
deleted file mode 100644
index 2086c38545d7..000000000000
--- a/testing/web-platform/tests/signed-exchange/sxg-prefetch-merkle-integrity-error.tentative.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE html>
-<title>Prefetching SignedHTTPExchange with payload integrity error should fail</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/common/get-host-info.sub.js"></script>
-<script src="./resources/sxg-util.js"></script>
-<body>
-<script>
-promise_test(async (t) => {
-  const sxgUrl = get_host_info().HTTPS_ORIGIN + '/signed-exchange/resources/sxg/sxg-merkle-integrity-error.sxg';
-  await new Promise(resolve => {
-    const link = document.createElement('link');
-    link.rel = 'prefetch';
-    link.href = sxgUrl;
-    link.addEventListener('error', t.step_func(() => {
-        resolve();
-    }));
-    link.addEventListener('load', t.step_func(() => {
-        assert_unreached('Prefetch should fail');
-    }));
-    document.body.appendChild(link);
-  });
-}, "Prefetching SignedHTTPExchange with payload integrity error should fail");
-
-</script>
-</body>
diff --git a/testing/web-platform/tests/streams/writable-streams/brand-checks.any.js b/testing/web-platform/tests/streams/writable-streams/brand-checks.any.js
index 66296ab3d356..968cb4c653aa 100644
--- a/testing/web-platform/tests/streams/writable-streams/brand-checks.any.js
+++ b/testing/web-platform/tests/streams/writable-streams/brand-checks.any.js
@@ -103,11 +103,6 @@ promise_test(t => {
                              [fakeWSDefaultWriter(), realWS(), realWSDefaultController(), undefined, null]);
 }, 'WritableStreamDefaultWriter.prototype.close enforces a brand check');
 
-test(() => {
-  methodThrowsForAll(WriterProto, 'releaseLock',
-                     [fakeWSDefaultWriter(), realWS(), realWSDefaultController(), undefined, null]);
-}, 'WritableStreamDefaultWriter.prototype.releaseLock enforces a brand check');
-
 test(() => {
   methodThrowsForAll(WritableStreamDefaultController.prototype, 'error',
                      [fakeWSDefaultController(), realWS(), realWSDefaultWriter(), undefined, null]);
diff --git a/testing/web-platform/tests/streams/writable-streams/close.any.js b/testing/web-platform/tests/streams/writable-streams/close.any.js
index 284bb16e1f5c..21f361f1f30b 100644
--- a/testing/web-platform/tests/streams/writable-streams/close.any.js
+++ b/testing/web-platform/tests/streams/writable-streams/close.any.js
@@ -399,15 +399,3 @@ promise_test(t => {
     });
   });
 }, 'close() should not reject until no sink methods are in flight');
-
-promise_test(() => {
-  const ws = new WritableStream();
-  const writer1 = ws.getWriter();
-  return writer1.close().then(() => {
-    writer1.releaseLock();
-    const writer2 = ws.getWriter();
-    const ready = writer2.ready;
-    assert_equals(ready.constructor, Promise);
-    return ready;
-  });
-}, 'ready promise should be initialised as fulfilled for a writer on a closed stream');
diff --git a/testing/web-platform/tests/streams/writable-streams/write.any.js b/testing/web-platform/tests/streams/writable-streams/write.any.js
index c936ef55af99..28fcf650e9f5 100644
--- a/testing/web-platform/tests/streams/writable-streams/write.any.js
+++ b/testing/web-platform/tests/streams/writable-streams/write.any.js
@@ -275,10 +275,3 @@ promise_test(t => {
     promise_rejects(t, error1, writer.write(), 'write() should be rejected')
   ]);
 }, 'write() on a stream with HWM 0 should not cause the ready Promise to resolve');
-
-promise_test(t => {
-  const ws = new WritableStream();
-  const writer = ws.getWriter();
-  writer.releaseLock();
-  return promise_rejects(t, new TypeError(), writer.write(), 'write should reject');
-}, 'writing to a released writer should reject the returned promise');
diff --git a/testing/web-platform/tests/svg/embedded/image-embedding-svg-with-viewport-units-inline-style.svg b/testing/web-platform/tests/svg/embedded/image-embedding-svg-with-viewport-units-inline-style.svg
index 7ef2655dc91c..7880fcf501c0 100644
--- a/testing/web-platform/tests/svg/embedded/image-embedding-svg-with-viewport-units-inline-style.svg
+++ b/testing/web-platform/tests/svg/embedded/image-embedding-svg-with-viewport-units-inline-style.svg
@@ -3,7 +3,7 @@
      xmlns:h="http://www.w3.org/1999/xhtml">
   <metadata>
     <title>&lt;image&gt; embedding SVG image with viewport units</title>
-    <h:link rel="match" href="reference/green-rect-100x100.svg"/>
+    <h:link rel="match" href="support/green-rect-100x100.svg"/>
   </metadata>
   <image xlink:href="data:image/svg+xml,&lt;svg xmlns='http://www.w3.org/2000/svg'&gt;&lt;rect style='width: 50vw; height: 50vh' fill='green'/&gt;&lt;/svg&gt;"
          width="200" height="200"/>
diff --git a/testing/web-platform/tests/svg/embedded/image-embedding-svg-with-viewport-units.svg b/testing/web-platform/tests/svg/embedded/image-embedding-svg-with-viewport-units.svg
index 653856de21bc..6feb54b392f4 100644
--- a/testing/web-platform/tests/svg/embedded/image-embedding-svg-with-viewport-units.svg
+++ b/testing/web-platform/tests/svg/embedded/image-embedding-svg-with-viewport-units.svg
@@ -3,7 +3,7 @@
      xmlns:h="http://www.w3.org/1999/xhtml">
   <metadata>
     <title>&lt;image&gt; embedding SVG image with viewport units</title>
-    <h:link rel="match" href="reference/green-rect-100x100.svg"/>
+    <h:link rel="match" href="support/green-rect-100x100.svg"/>
   </metadata>
   <image xlink:href="data:image/svg+xml,&lt;svg xmlns='http://www.w3.org/2000/svg'&gt;&lt;rect width='50vw' height='50vh' fill='green'/&gt;&lt;/svg&gt;"
          width="200" height="200"/>
diff --git a/testing/web-platform/tests/svg/embedded/reference/green-rect-100x100.svg b/testing/web-platform/tests/svg/embedded/support/green-rect-100x100.svg
similarity index 100%
rename from testing/web-platform/tests/svg/embedded/reference/green-rect-100x100.svg
rename to testing/web-platform/tests/svg/embedded/support/green-rect-100x100.svg
diff --git a/testing/web-platform/tests/svg/geometry/parsing/ry-invalid.svg b/testing/web-platform/tests/svg/geometry/parsing/ry-invalid.svg
index 5938ae830d52..7a25a1ec0e61 100644
--- a/testing/web-platform/tests/svg/geometry/parsing/ry-invalid.svg
+++ b/testing/web-platform/tests/svg/geometry/parsing/ry-invalid.svg
@@ -2,10 +2,10 @@
 <svg xmlns="http://www.w3.org/2000/svg"
      xmlns:h="http://www.w3.org/1999/xhtml"
      width="800px" height="8000px">
-  <title>SVG Geometry Properties: parsing ry with invalid values</title>
+  <title>SVG Geometry Properties: parsing rx with invalid values</title>
   <metadata>
     <h:link rel="help" href="https://svgwg.org/svg2-draft/geometry.html#RY"/>
-    <h:meta name="assert" content="ry supports only the grammar '&lt;length-percentage&gt; | auto'."/>
+    <h:meta name="assert" content="rx supports only the grammar '&lt;length-percentage&gt; | auto'."/>
   </metadata>
   <g id="target"></g>
   <h:script src="/resources/testharness.js"/>
@@ -13,10 +13,10 @@
   <h:script src="/css/support/parsing-testcommon.js"/>
   <script><![CDATA[
 
-test_invalid_value("ry", "10");
-test_invalid_value("ry", "none");
-test_invalid_value("ry", "10px 20px");
-test_invalid_value("ry", "-1px");
+test_invalid_value("rx", "10");
+test_invalid_value("rx", "none");
+test_invalid_value("rx", "10px 20px");
+test_invalid_value("rx", "-1px");
 
   ]]></script>
 </svg>
diff --git a/testing/web-platform/tests/svg/geometry/parsing/ry-valid.svg b/testing/web-platform/tests/svg/geometry/parsing/ry-valid.svg
index 178c0c007d64..e92e2cf6410b 100644
--- a/testing/web-platform/tests/svg/geometry/parsing/ry-valid.svg
+++ b/testing/web-platform/tests/svg/geometry/parsing/ry-valid.svg
@@ -2,10 +2,10 @@
 <svg xmlns="http://www.w3.org/2000/svg"
      xmlns:h="http://www.w3.org/1999/xhtml"
      width="800px" height="8000px">
-  <title>SVG Geometry Properties: parsing ry with valid values</title>
+  <title>SVG Geometry Properties: parsing rx with valid values</title>
   <metadata>
     <h:link rel="help" href="https://svgwg.org/svg2-draft/geometry.html#RY"/>
-    <h:meta name="assert" content="ry supports the full grammar '&lt;length-percentage&gt; | auto'."/>
+    <h:meta name="assert" content="rx supports the full grammar '&lt;length-percentage&gt; | auto'."/>
   </metadata>
   <g id="target"></g>
   <h:script src="/resources/testharness.js"/>
@@ -13,13 +13,13 @@
   <h:script src="/css/support/parsing-testcommon.js"/>
   <script><![CDATA[
 
-test_valid_value("ry", "auto");
+test_valid_value("rx", "auto");
 
-test_valid_value("ry", "0", "0px");
-test_valid_value("ry", "1px");
-test_valid_value("ry", "calc(2em + 3ex)");
-test_valid_value("ry", "4%");
-test_valid_value("ry", "5vh");
+test_valid_value("rx", "0", "0px");
+test_valid_value("rx", "1px");
+test_valid_value("rx", "calc(2em + 3ex)");
+test_valid_value("rx", "4%");
+test_valid_value("rx", "5vh");
 
   ]]></script>
 </svg>
diff --git a/testing/web-platform/tests/svg/geometry/svg-image-intrinsic-size-with-cssstyle-auto-dynamic-image-change.html b/testing/web-platform/tests/svg/geometry/svg-image-intrinsic-size-with-cssstyle-auto-dynamic-image-change.html
deleted file mode 100644
index 8d5e2e982e82..000000000000
--- a/testing/web-platform/tests/svg/geometry/svg-image-intrinsic-size-with-cssstyle-auto-dynamic-image-change.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE html>
-<title>Test <svg:image>'s sizing with css size as auto, with dynamic image change</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<link rel="help" href="https://svgwg.org/svg2-draft/single-page.html#geometry-Sizing"/>
-<link rel="help" href="https://svgwg.org/svg2-draft/single-page.html#embedded-Placement"/>
-<svg height="0">
-  <image width="128" height="128" xlink:href="/images/green-256x256.png" style="width:auto; height:auto"/>
-</svg>
-<script>
-async_test(function(t) {
-  var image = document.querySelector('image');
-  window.onload = t.step_func(function() {
-    var rectBBox = image.getBBox();
-    assert_equals(rectBBox.width, 256);
-    assert_equals(rectBBox.height, 256);
-    image.setAttributeNS("http://www.w3.org/1999/xlink","href","data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' width='64' height='64'></svg>");
-    image.onload = t.step_func_done(function() {
-        var rectBBox = image.getBBox();
-        assert_equals(rectBBox.width, 64);
-        assert_equals(rectBBox.height, 64);
-    });
-  });
-});
-</script>
\ No newline at end of file
diff --git a/testing/web-platform/tests/svg/geometry/svg-image-intrinsic-size-with-cssstyle-auto.html b/testing/web-platform/tests/svg/geometry/svg-image-intrinsic-size-with-cssstyle-auto.html
deleted file mode 100644
index 6b49f6229643..000000000000
--- a/testing/web-platform/tests/svg/geometry/svg-image-intrinsic-size-with-cssstyle-auto.html
+++ /dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE html>
-<title><svg:image> 'auto' sizing </title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<link rel="help" href="https://svgwg.org/svg2-draft/single-page.html#geometry-Sizing"/>
-<link rel="help" href="https://svgwg.org/svg2-draft/single-page.html#embedded-Placement"/>
-<svg height="0">
-  <image width="64" height="64" xlink:href="/images/green-256x256.png" />
-  <image width="128" height="64" xlink:href="/images/green-256x256.png" style="width:auto"/>
-  <image width="64" height="128" xlink:href="/images/green-256x256.png" style="height:auto"/>
-  <image width="128" height="64" xlink:href="/images/green-256x256.png" style="width:auto; height:auto"/>
-  <image width="50" height="50"
-         xlink:href="data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg'></svg>"/>
-  <image width="50" height="50"
-         xlink:href="data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' width='200' height='100'></svg>" style='width:auto; height:auto'/>
-  <image width="50" height="50"
-         xlink:href="data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' width='200' height='100'></svg>" style='width:auto;'/>
-  <image xlink:href="data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' width='200' height='100'></svg>" style='width:auto;'/>
-  <image height="50"
-         xlink:href="data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' width='200' height='100'></svg>" style='width:auto;'/>
-  <image width="50"
-         xlink:href="data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' width='200' height='100'></svg>" style='height:auto;'/>
-  <image width="200" height="200"
-         xlink:href="data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg'></svg>" style='width:auto; height:auto'/>
-  <image height="200"
-         xlink:href="data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg'></svg>" style='width:auto; height:auto'/>
-  <image width="200"
-         xlink:href="data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg'></svg>" style='width:auto; height:auto'/>
-  <image xlink:href="data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg'></svg>"/>
-  <image width="60" height="60" xlink:href="data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 400 100'></svg>"/>
-  <image width="60" height="60" xlink:href="data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 400 100'></svg>" style='width:auto'/>
-  <image width="60" height="60" xlink:href="data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 400 100'></svg>" style='height:auto'/>
-  <image width="60" height="60" xlink:href="data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 400 100'></svg>" style='width:auto; height:auto'/>
-  <image width="60" height="60" xlink:href="data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' width='200' viewBox='0 0 400 100'></svg>"/>
-  <image width="60" height="60" xlink:href="data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' width='200' viewBox='0 0 400 100'></svg>" style='width:auto'/>
-  <image width="60" height="60" xlink:href="data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' width='200' viewBox='0 0 400 100'></svg>" style='height:auto'/>
-  <image width="60" height="60" xlink:href="data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' width='200' viewBox='0 0 400 100'></svg>" style='width:auto; height:auto'/>
-  <image width="60" height="60" xlink:href="data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' height='100' viewBox='0 0 400 100'></svg>"/>
-  <image width="60" height="60" xlink:href="data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' height='100' viewBox='0 0 400 100'></svg>" style='width:auto'/>
-  <image width="60" height="60" xlink:href="data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' height='100' viewBox='0 0 400 100'></svg>" style='height:auto'/>
-  <image width="60" height="60" xlink:href="data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' height='100' viewBox='0 0 400 100'></svg>" style='width:auto; height:auto'/>
-  <image width="60" height="60" xlink:href="data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' width='200' height='100' viewBox='0 0 400 100'></svg>"/>
-  <image width="60" height="60" xlink:href="data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' width='200' height='100' viewBox='0 0 400 100'></svg>" style='width:auto'/>
-  <image width="60" height="60" xlink:href="data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' width='200' height='100' viewBox='0 0 400 100'></svg>" style='height:auto'/>
-  <image width="60" height="60" xlink:href="data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' width='200' height='100' viewBox='0 0 400 100'></svg>" style='width:auto; height:auto'/>
-</svg>
-<script>
-var expectedBoxes = [
-  { dimensions: [64, 64], description: "256x256 png image, attributes width='64' height='64'"},
-  { dimensions: [64, 64], description: "256x256 png image, attributes width='128' height='64' and CSS 'width:auto'"},
-  { dimensions: [64, 64], description: "256x256 png image, attributes width='64' height='128' and CSS 'height:auto'"},
-  { dimensions: [256, 256], description: "256x256 png image, attributes width='64' height='64' and CSS 'width:auto; height:auto'"},
-  { dimensions: [50, 50], description: "default sized svg image, attributes width='50' height='50'"},
-  { dimensions: [200, 100], description: "200x100 svg image, attributes width='50' height='50' and CSS 'width:auto; height:auto'"},
-  { dimensions: [100, 50], description: "200x100 svg image, attributes width='50' height='50' and CSS 'width:auto'"},
-  { dimensions: [200, 100], description: "200x100 svg image, without attributes width and height and CSS 'width:auto'"},
-  { dimensions: [100, 50], description: "200x100 svg image, attributes height='50' and 'width:auto'"},
-  { dimensions: [50, 25], description: "200x100 svg image, attributes width='50' and CSS height:auto"},
-  { dimensions: [300, 150], description: "default sized svg image, attributes width='200' height='200' and CSS 'width:auto; height:auto'"},
-  { dimensions: [300, 150], description: "default sized svg image, attributes height='200' and CSS 'width:auto; height:auto'"},
-  { dimensions: [300, 150], description: "default sized svg image, attributes width='200' and CSS 'width:auto; height:auto'"},
-  { dimensions: [300, 150], description: "default sized svg image, without attributes width and height, no css width/height specified"},
-  { dimensions: [60, 60], description: "default sized svg image viewBox='0 0 400 100', attributes width='60' height='60' and no css width/height specified"},
-  { dimensions: [240, 60], description: "default sized svg image viewBox='0 0 400 100', attributes width='60' height='60' and CSS 'width:auto'"},
-  { dimensions: [60, 15], description: "default sized svg image viewBox='0 0 400 100', attributes width='60' height='60' and CSS 'height:auto'"},
-  { dimensions: [300, 75], description: "default sized svg image viewBox='0 0 400 100', attributes width='60' height='60' and CSS 'width:auto; height:auto'"},
-  { dimensions: [60, 60], description: "svg image width='200' viewBox='0 0 400 100', attributes width='60' height='60' and no css width/height specified"},
-  { dimensions: [240, 60], description: "svg image width='200' viewBox='0 0 400 100', attributes width='60' height='60' and CSS 'width:auto'"},
-  { dimensions: [60, 15], description: "svg image width='200' viewBox='0 0 400 100', attributes width='60' height='60' and CSS 'height:auto'"},
-  { dimensions: [200, 50], description: "svg image width='200' viewBox='0 0 400 100', attributes width='60' height='60' and CSS 'width:auto; height:auto'"},
-  { dimensions: [60, 60], description: "svg image height='100' viewBox='0 0 400 100', attributes width='60' height='60' and no css width/height specified"},
-  { dimensions: [240, 60], description: "svg image height='100' viewBox='0 0 400 100', attributes width='60' height='60' and CSS 'width:auto'"},
-  { dimensions: [60, 15], description: "svg image height='100' viewBox='0 0 400 100', attributes width='60' height='60' and CSS 'height:auto'"},
-  { dimensions: [400, 100], description: "svg image height='100' viewBox='0 0 400 100', attributes width='60' height='60' and CSS 'width:auto; height:auto'"},
-  { dimensions: [60, 60], description: "200x100 svg image viewBox='0 0 400 100', attributes width='60' height='60' and no css width/height specified"},
-  { dimensions: [120, 60], description: "200x100 svg image viewBox='0 0 400 100', attributes width='60' height='60' and CSS 'width:auto'"},
-  { dimensions: [60, 30], description: "200x100 svg image viewBox='0 0 400 100', attributes width='60' height='60' and CSS 'height:auto'"},
-  { dimensions: [200, 100], description: "200x100 svg image viewBox='0 0 400 100', attributes width='60' height='60' and CSS 'width:auto; height:auto'"},
-];
-
-var images = document.getElementsByTagName('image');
-for (var i = 0, length = images.length; i < length; ++i) {
-     async_test(function(t) {
-        var image = images[i];
-        image.expectedBox = expectedBoxes[i];
-        image.onload = t.step_func_done(function() {
-            var rectBBox = image.getBBox();
-            assert_equals(rectBBox.width, image.expectedBox.dimensions[0]);
-            assert_equals(rectBBox.height, image.expectedBox.dimensions[1]);
-        });
-     }, document.title + ' with ' + expectedBoxes[i].description);
-}
-</script>
\ No newline at end of file
diff --git a/testing/web-platform/tests/svg/pservers/reftests/radialgradient-fully-overlapping.svg b/testing/web-platform/tests/svg/pservers/reftests/radialgradient-fully-overlapping.svg
deleted file mode 100644
index e16bb4ab9171..000000000000
--- a/testing/web-platform/tests/svg/pservers/reftests/radialgradient-fully-overlapping.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:h="http://www.w3.org/1999/xhtml">
-  <title>Radial gradient with overlapping start and end circles</title>
-  <metadata>
-    <h:link rel="help" href="https://svgwg.org/svg2-draft/pservers.html#RadialGradientNotes"/>
-    <h:link rel="match" href="reference/green-100x100.svg"/>
-    <h:meta name="assert" content="If the start circle fully overlaps with the end circle, no gradient is drawn."/>
-  </metadata>
-
-  <rect width="100" height="100" fill="green"/>
-
-  <radialGradient id="fully_overlapping" r="100" fr="100">
-    <stop stop-color="red"/>
-    <stop stop-color="red" offset="1"/>
-  </radialGradient>
-  <rect width="100" height="100" fill="url(#fully_overlapping) orange"/>
-</svg>
diff --git a/testing/web-platform/tests/svg/shapes/reftests/disabled-shapes-01.svg b/testing/web-platform/tests/svg/shapes/reftests/disabled-shapes-01.svg
index 3091ca7b0152..d92eea169a69 100644
--- a/testing/web-platform/tests/svg/shapes/reftests/disabled-shapes-01.svg
+++ b/testing/web-platform/tests/svg/shapes/reftests/disabled-shapes-01.svg
@@ -4,7 +4,7 @@
     <h:link rel="help" href="https://svgwg.org/svg2-draft/shapes.html#RectElement"/>
     <h:link rel="help" href="https://svgwg.org/svg2-draft/shapes.html#CircleElement"/>
     <h:link rel="help" href="https://svgwg.org/svg2-draft/shapes.html#EllipseElement"/>
-    <h:link rel="match" href="reference/empty.svg"/>
+    <h:link rel="match" href="support/empty.svg"/>
   </metadata>
   <g stroke="red" stroke-width="100">
     <g transform="translate(50, 50)">
diff --git a/testing/web-platform/tests/svg/shapes/reftests/reference/empty.svg b/testing/web-platform/tests/svg/shapes/reftests/support/empty.svg
similarity index 100%
rename from testing/web-platform/tests/svg/shapes/reftests/reference/empty.svg
rename to testing/web-platform/tests/svg/shapes/reftests/support/empty.svg
diff --git a/testing/web-platform/tests/tools/ci/azure/fyi_hook.yml b/testing/web-platform/tests/tools/ci/azure/fyi_hook.yml
deleted file mode 100644
index ddfbe3d3cf8e..000000000000
--- a/testing/web-platform/tests/tools/ci/azure/fyi_hook.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-# This job is used to get a run into wpt.fyi and staging.wpt.fyi, by notifying
-# them with the build number and artifact to use.
-
-parameters:
-  dependsOn: ''
-  artifactName: ''
-
-jobs:
-- job: ${{ parameters.dependsOn }}_hook
-  displayName: 'wpt.fyi hook: ${{ parameters.artifactName }}'
-  dependsOn: ${{ parameters.dependsOn }}
-  pool:
-    vmImage: 'ubuntu-16.04'
-  steps:
-  - script: curl -s -S -d "artifact=${{ parameters.artifactName }}" -X POST https://wpt.fyi/api/checks/azure/$(Build.BuildId)
-    displayName: 'Invoke wpt.fyi hook'
-  - script: curl -s -S -d "artifact=${{ parameters.artifactName }}" -X POST https://staging.wpt.fyi/api/checks/azure/$(Build.BuildId)
-    displayName: 'Invoke staging.wpt.fyi hook'
diff --git a/testing/web-platform/tests/tools/ci/before_install.sh b/testing/web-platform/tests/tools/ci/before_install.sh
old mode 100755
new mode 100644
diff --git a/testing/web-platform/tests/tools/ci/ci_built_diff.sh b/testing/web-platform/tests/tools/ci/ci_built_diff.sh
index 709cc2aa7e68..81bf098f56aa 100755
--- a/testing/web-platform/tests/tools/ci/ci_built_diff.sh
+++ b/testing/web-platform/tests/tools/ci/ci_built_diff.sh
@@ -1,4 +1,3 @@
-#!/bin/bash
 set -ex
 
 SCRIPT_DIR=$(cd $(dirname "$0") && pwd -P)
diff --git a/testing/web-platform/tests/tools/ci/ci_lint.sh b/testing/web-platform/tests/tools/ci/ci_lint.sh
index bf98f209eba1..fe8bbfb8cf92 100755
--- a/testing/web-platform/tests/tools/ci/ci_lint.sh
+++ b/testing/web-platform/tests/tools/ci/ci_lint.sh
@@ -1,4 +1,3 @@
-#!/bin/bash
 set -ex
 
 SCRIPT_DIR=$(cd $(dirname "$0") && pwd -P)
diff --git a/testing/web-platform/tests/tools/ci/ci_manifest.sh b/testing/web-platform/tests/tools/ci/ci_manifest.sh
index 7d0d5ca04189..695fd457d130 100755
--- a/testing/web-platform/tests/tools/ci/ci_manifest.sh
+++ b/testing/web-platform/tests/tools/ci/ci_manifest.sh
@@ -1,4 +1,3 @@
-#!/bin/bash
 set -ex
 
 SCRIPT_DIR=$(cd $(dirname "$0") && pwd -P)
diff --git a/testing/web-platform/tests/tools/ci/lib.sh b/testing/web-platform/tests/tools/ci/lib.sh
index 8d5e6aef73b4..7c0b8253a906 100644
--- a/testing/web-platform/tests/tools/ci/lib.sh
+++ b/testing/web-platform/tests/tools/ci/lib.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 hosts_fixup() {
     echo "travis_fold:start:hosts_fixup"
     echo "Rewriting hosts file"
diff --git a/testing/web-platform/tests/tools/ci/taskcluster-run.py b/testing/web-platform/tests/tools/ci/taskcluster-run.py
index 78c50a6285e8..2b3270c17aaa 100755
--- a/testing/web-platform/tests/tools/ci/taskcluster-run.py
+++ b/testing/web-platform/tests/tools/ci/taskcluster-run.py
@@ -6,7 +6,6 @@ import logging
 import os
 import shutil
 import subprocess
-import sys
 
 browser_specific_args = {
     "firefox": ["--install-browser"]
@@ -39,7 +38,8 @@ def main(product, commit_range, wpt_args):
     )
     logger.addHandler(handler)
 
-    subprocess.call(['python', './wpt', 'manifest-download'])
+    child = subprocess.Popen(['python', './wpt', 'manifest-download'])
+    child.wait()
 
     if commit_range:
         logger.info(
@@ -65,9 +65,7 @@ def main(product, commit_range, wpt_args):
 
     logger.info("Executing command: %s" % " ".join(command))
 
-    retcode = subprocess.call(command)
-    if retcode != 0:
-        sys.exit(retcode)
+    subprocess.check_call(command)
 
     wptreport = find_wptreport(wpt_args)
     if wptreport:
diff --git a/testing/web-platform/tests/tools/docker/start.sh b/testing/web-platform/tests/tools/docker/start.sh
index 0675a0af2da2..bfc7e9960abf 100755
--- a/testing/web-platform/tests/tools/docker/start.sh
+++ b/testing/web-platform/tests/tools/docker/start.sh
@@ -1,5 +1,3 @@
-#!/bin/bash
-
 # This script is embedded in the docker image, and so the image must be updated when changes
 # to the script are made. To do this, assuming you have docker installed:
 # In tools/docker/ :
@@ -10,6 +8,7 @@
 # Update the `image` specified in the project's .taskcluster.yml file
 
 
+#!/bin/bash
 set -ex
 
 REMOTE=${1:-https://github.com/web-platform-tests/wpt}
diff --git a/testing/web-platform/tests/tools/manifest/sourcefile.py b/testing/web-platform/tests/tools/manifest/sourcefile.py
index f3e49662c1fa..d2e5df855263 100644
--- a/testing/web-platform/tests/tools/manifest/sourcefile.py
+++ b/testing/web-platform/tests/tools/manifest/sourcefile.py
@@ -335,7 +335,7 @@ class SourceFile(object):
     def name_is_reference(self):
         """Check if the file name matches the conditions for the file to
         be a reference file (not a reftest)"""
-        return "/reference/" in self.url or bool(reference_file_re.search(self.name))
+        return "/reference/" in self.url or "/reftest/" in self.url or bool(reference_file_re.search(self.name))
 
     @property
     def markup_type(self):
diff --git a/testing/web-platform/tests/tools/manifest/update.py b/testing/web-platform/tests/tools/manifest/update.py
old mode 100755
new mode 100644
diff --git a/testing/web-platform/tests/tools/pywebsocket/mod_pywebsocket/memorizingfile.py b/testing/web-platform/tests/tools/pywebsocket/mod_pywebsocket/memorizingfile.py
index ba70ceb4e29e..07bcbd5876cc 100644
--- a/testing/web-platform/tests/tools/pywebsocket/mod_pywebsocket/memorizingfile.py
+++ b/testing/web-platform/tests/tools/pywebsocket/mod_pywebsocket/memorizingfile.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+#
 # Copyright 2011, Google Inc.
 # All rights reserved.
 #
diff --git a/testing/web-platform/tests/tools/requirements_flake8.txt b/testing/web-platform/tests/tools/requirements_flake8.txt
index b134409614cc..970f00416dc8 100644
--- a/testing/web-platform/tests/tools/requirements_flake8.txt
+++ b/testing/web-platform/tests/tools/requirements_flake8.txt
@@ -1,4 +1,4 @@
-flake8==3.7.7
+flake8==3.6.0
 pycodestyle==2.5.0
 pyflakes==2.1.0
 pep8-naming==0.7.0
diff --git a/testing/web-platform/tests/tools/wpt/browser.py b/testing/web-platform/tests/tools/wpt/browser.py
index a813dd0af8d7..a5098b9de53b 100644
--- a/testing/web-platform/tests/tools/wpt/browser.py
+++ b/testing/web-platform/tests/tools/wpt/browser.py
@@ -5,13 +5,10 @@ import shutil
 import stat
 import subprocess
 import tempfile
-import urlparse
 from abc import ABCMeta, abstractmethod
 from datetime import datetime, timedelta
 from distutils.spawn import find_executable
 
-import requests
-
 from utils import call, get, untar, unzip
 
 uname = platform.uname()
@@ -96,28 +93,30 @@ class Firefox(Browser):
     def install(self, dest=None, channel="nightly"):
         """Install Firefox."""
 
-        import mozinstall
-
-        product = {
-            "nightly": "firefox-nightly-latest-ssl",
-            "beta": "firefox-beta-latest-ssl",
-            "stable": "firefox-beta-latest-ssl"
+        branch = {
+            "nightly": "mozilla-central",
+            "beta": "mozilla-beta",
+            "stable": "mozilla-stable"
+        }
+        scraper = {
+            "nightly": "daily",
+            "beta": "release",
+            "stable": "release"
+        }
+        version = {
+            "stable": "latest",
+            "beta": "latest-beta",
+            "nightly": "latest"
         }
 
-        os_builds = {
-            ("linux", "x86"): "linux",
-            ("linux", "x86_64"): "linux64",
-            ("win", "x86"): "win",
-            ("win", "x86_64"): "win64",
-            ("macos", "x86_64"): "osx",
-        }
-        os_key = (self.platform, uname[4])
-
-        if channel not in product:
+        if channel not in branch:
             raise ValueError("Unrecognised release channel: %s" % channel)
 
-        if os_key not in os_builds:
-            raise ValueError("Unsupported platform: %s %s" % os_key)
+        from mozdownload import FactoryScraper
+        import mozinstall
+
+        if self.platform is None:
+            raise ValueError("Unable to construct a valid Firefox package name for current platform")
 
         if dest is None:
             # os.getcwd() doesn't include the venv path
@@ -125,35 +124,17 @@ class Firefox(Browser):
 
         dest = os.path.join(dest, "browsers", channel)
 
-        if not os.path.exists(dest):
-            os.makedirs(dest)
+        scraper = FactoryScraper(scraper[channel],
+                                 branch=branch[channel],
+                                 version=version[channel],
+                                 destination=dest)
 
-        url = "https://download.mozilla.org/?product=%s&os=%s&lang=en-US" % (product[channel],
-                                                                             os_builds[os_key])
-        self.logger.info("Downloading Firefox from %s" % url)
-        resp = requests.get(url)
+        self.logger.info("Downloading Firefox from %s" % scraper.url)
 
-        filename = None
-
-        content_disposition = resp.headers.get('content-disposition')
-        if content_disposition:
-            filenames = re.findall("filename=(.+)", content_disposition)
-            if filenames:
-                filename = filenames[0]
-
-        if not filename:
-            filename = urlparse.urlsplit(resp.url).path.rsplit("/", 1)[1]
-
-        if not filename:
-            filename = "firefox.tar.bz2"
-
-        installer_path = os.path.join(dest, filename)
-
-        with open(installer_path, "w") as f:
-            f.write(resp.content)
+        filename = scraper.download()
 
         try:
-            mozinstall.install(installer_path, dest)
+            mozinstall.install(filename, dest)
         except mozinstall.mozinstall.InstallError:
             if self.platform == "macos" and os.path.exists(os.path.join(dest, self.application_name.get(channel, "Firefox Nightly.app"))):
                 # mozinstall will fail if nightly is already installed in the venv because
@@ -163,7 +144,7 @@ class Firefox(Browser):
             else:
                 raise
 
-        os.remove(installer_path)
+        os.remove(filename)
         return self.find_binary_path(dest)
 
     def find_binary_path(self,path=None, channel="nightly"):
@@ -469,7 +450,7 @@ class Chrome(Browser):
                 return None
             m = re.match(r"Google Chrome (.*)", version_string)
             if not m:
-                self.logger.warning("Failed to extract version from: %s", version_string)
+                self.logger.warning("Failed to extract version from: s%", version_string)
                 return None
             return m.group(1)
         self.logger.warning("Unable to extract version from binary on Windows.")
@@ -668,7 +649,7 @@ class Safari(Browser):
             return None
         m = re.match(r"Included with Safari (.*)", version_string)
         if not m:
-            self.logger.warning("Failed to extract version from: %s", version_string)
+            self.logger.warning("Failed to extract version from: s%", version_string)
             return None
         return m.group(1)
 
diff --git a/testing/web-platform/tests/tools/wpt/utils.py b/testing/web-platform/tests/tools/wpt/utils.py
index f98687feb517..fa60230389de 100644
--- a/testing/web-platform/tests/tools/wpt/utils.py
+++ b/testing/web-platform/tests/tools/wpt/utils.py
@@ -5,11 +5,6 @@ import tarfile
 import zipfile
 from io import BytesIO
 
-try:
-    from typing import Any
-except ImportError:
-    pass
-
 logger = logging.getLogger(__name__)
 
 
diff --git a/testing/web-platform/tests/tools/wptrunner/requirements_firefox.txt b/testing/web-platform/tests/tools/wptrunner/requirements_firefox.txt
index ee84d840f814..656d57f4b200 100644
--- a/testing/web-platform/tests/tools/wptrunner/requirements_firefox.txt
+++ b/testing/web-platform/tests/tools/wptrunner/requirements_firefox.txt
@@ -1,8 +1,8 @@
 marionette_driver==2.7.0
 mozprofile==2.2.0
 mozprocess==1.0.0
-mozcrash==1.1.0
-mozrunner==7.4.0
+mozcrash == 1.0
+mozrunner==7.3.0
 mozleak==0.2
 mozinstall==2.0.0
 mozdownload==1.25
diff --git a/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/fennec.py b/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/fennec.py
index 45c83d9b816c..b8e4ebc4aeb9 100644
--- a/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/fennec.py
+++ b/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/fennec.py
@@ -146,7 +146,7 @@ class FennecBrowser(FirefoxBrowser):
                                       "network.preload": True})
         if self.test_type == "reftest":
             self.logger.info("Setting android reftest preferences")
-            self.profile.set_preferences({"browser.viewport.desktopWidth": 800,
+            self.profile.set_preferences({"browser.viewport.desktopWidth": 600,
                                           # Disable high DPI
                                           "layout.css.devPixelsPerPx": "1.0",
                                           # Ensure that the full browser element
diff --git a/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/sauce_setup/edge-prerun.bat b/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/sauce_setup/edge-prerun.bat
old mode 100755
new mode 100644
diff --git a/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/sauce_setup/safari-prerun.sh b/testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/sauce_setup/safari-prerun.sh
old mode 100755
new mode 100644
diff --git a/testing/web-platform/tests/tools/wptrunner/wptrunner/executors/base.py b/testing/web-platform/tests/tools/wptrunner/wptrunner/executors/base.py
index 377488db019a..0e54eca778b3 100644
--- a/testing/web-platform/tests/tools/wptrunner/wptrunner/executors/base.py
+++ b/testing/web-platform/tests/tools/wptrunner/wptrunner/executors/base.py
@@ -152,11 +152,6 @@ class TestExecutor(object):
         if self.protocol is not None:
             self.protocol.teardown()
 
-    def reset(self):
-        """Re-initialize internal state to facilitate repeated test execution
-        as implemented by the `--rerun` command-line argument."""
-        pass
-
     def run_test(self, test):
         """Run a particular test.
 
@@ -272,9 +267,6 @@ class RefTestImplementation(object):
         self.message.append("%s %s" % (test.url, rv[0]))
         return True, rv
 
-    def reset(self):
-        self.screenshot_cache.clear()
-
     def is_pass(self, lhs_hash, rhs_hash, relation):
         assert relation in ("==", "!=")
         self.message.append("Testing %s %s %s" % (lhs_hash, relation, rhs_hash))
@@ -517,8 +509,7 @@ class CallbackHandler(object):
         self.actions = {
             "click": ClickAction(self.logger, self.protocol),
             "send_keys": SendKeysAction(self.logger, self.protocol),
-            "action_sequence": ActionSequenceAction(self.logger, self.protocol),
-            "generate_test_report": GenerateTestReportAction(self.logger, self.protocol)
+            "action_sequence": ActionSequenceAction(self.logger, self.protocol)
         }
 
     def __call__(self, result):
@@ -602,13 +593,3 @@ class ActionSequenceAction(object):
     def get_element(self, selector):
         element = self.protocol.select.element_by_selector(selector)
         return element
-
-class GenerateTestReportAction(object):
-    def __init__(self, logger, protocol):
-        self.logger = logger
-        self.protocol = protocol
-
-    def __call__(self, payload):
-        message = payload["message"]
-        self.logger.debug("Generating test report: %s" % message)
-        self.protocol.generate_test_report.generate_test_report(message)
diff --git a/testing/web-platform/tests/tools/wptrunner/wptrunner/executors/executormarionette.py b/testing/web-platform/tests/tools/wptrunner/wptrunner/executors/executormarionette.py
index 7d800cf8c98b..5791cdae957b 100644
--- a/testing/web-platform/tests/tools/wptrunner/wptrunner/executors/executormarionette.py
+++ b/testing/web-platform/tests/tools/wptrunner/wptrunner/executors/executormarionette.py
@@ -780,9 +780,6 @@ class MarionetteRefTestExecutor(RefTestExecutor):
             self.logger.warning("Exception during reftest teardown:\n%s" %
                                 traceback.format_exc(e))
 
-    def reset(self):
-        self.implementation.reset(**self.implementation_kwargs)
-
     def is_alive(self):
         return self.protocol.is_alive
 
@@ -864,10 +861,6 @@ class InternalRefTestImplementation(object):
         self.executor.protocol.marionette.set_context(self.executor.protocol.marionette.CONTEXT_CHROME)
         self.executor.protocol.marionette._send_message("reftest:setup", data)
 
-    def reset(self, screenshot=None):
-        self.teardown()
-        self.setup(screenshot)
-
     def run_test(self, test):
         references = self.get_references(test)
         timeout = (test.timeout * 1000) * self.timeout_multiplier
@@ -875,9 +868,7 @@ class InternalRefTestImplementation(object):
                                                              {"test": self.executor.test_url(test),
                                                               "references": references,
                                                               "expected": test.expected(),
-                                                              "timeout": timeout,
-                                                              "width": 800,
-                                                              "height": 600})["value"]
+                                                              "timeout": timeout})["value"]
         return rv
 
     def get_references(self, node):
diff --git a/testing/web-platform/tests/tools/wptrunner/wptrunner/executors/executorselenium.py b/testing/web-platform/tests/tools/wptrunner/wptrunner/executors/executorselenium.py
index 0d97f0f2d93c..1ec1393a26b3 100644
--- a/testing/web-platform/tests/tools/wptrunner/wptrunner/executors/executorselenium.py
+++ b/testing/web-platform/tests/tools/wptrunner/wptrunner/executors/executorselenium.py
@@ -213,6 +213,9 @@ class SeleniumProtocol(Protocol):
                                                                             resolve_ip=False),
                                           desired_capabilities=self.capabilities)
 
+    def after_conect(self):
+        pass
+
     def teardown(self):
         self.logger.debug("Hanging up on Selenium session")
         try:
@@ -359,9 +362,6 @@ class SeleniumRefTestExecutor(RefTestExecutor):
         with open(os.path.join(here, "reftest-wait_webdriver.js")) as f:
             self.wait_script = f.read()
 
-    def reset(self):
-        self.implementation.reset()
-
     def is_alive(self):
         return self.protocol.is_alive()
 
@@ -372,8 +372,7 @@ class SeleniumRefTestExecutor(RefTestExecutor):
             """return [window.outerWidth - window.innerWidth,
                        window.outerHeight - window.innerHeight];"""
         )
-        self.protocol.webdriver.set_window_size(0, 0)
-        self.protocol.webdriver.set_window_position(800 + width_offset, 600 + height_offset)
+        self.protocol.webdriver.set_window_rect(0, 0, 600 + width_offset, 600 + height_offset)
 
         result = self.implementation.run_test(test)
 
diff --git a/testing/web-platform/tests/tools/wptrunner/wptrunner/executors/executorservo.py b/testing/web-platform/tests/tools/wptrunner/wptrunner/executors/executorservo.py
index fd4d032adcbf..0c3aeda4eb13 100644
--- a/testing/web-platform/tests/tools/wptrunner/wptrunner/executors/executorservo.py
+++ b/testing/web-platform/tests/tools/wptrunner/wptrunner/executors/executorservo.py
@@ -183,9 +183,6 @@ class ServoRefTestExecutor(ProcessTestExecutor):
         self.tempdir = tempfile.mkdtemp()
         self.hosts_path = write_hosts_file(server_config)
 
-    def reset(self):
-        self.implementation.reset()
-
     def teardown(self):
         try:
             os.unlink(self.hosts_path)
@@ -214,7 +211,7 @@ class ServoRefTestExecutor(ProcessTestExecutor):
             for pref, value in test.environment.get('prefs', {}).iteritems():
                 command += ["--pref", "%s=%s" % (pref, value)]
 
-            command += ["--resolution", viewport_size or "800x600"]
+            command += ["--resolution", viewport_size or "600x600"]
 
             if self.browser.ca_certificate_path:
                 command += ["--certificate-path", self.browser.ca_certificate_path]
diff --git a/testing/web-platform/tests/tools/wptrunner/wptrunner/executors/executorservodriver.py b/testing/web-platform/tests/tools/wptrunner/wptrunner/executors/executorservodriver.py
index 427d5b3f73b3..b9a9c3810dd8 100644
--- a/testing/web-platform/tests/tools/wptrunner/wptrunner/executors/executorservodriver.py
+++ b/testing/web-platform/tests/tools/wptrunner/wptrunner/executors/executorservodriver.py
@@ -260,9 +260,6 @@ class ServoWebDriverRefTestExecutor(RefTestExecutor):
         with open(os.path.join(here, "reftest-wait_webdriver.js")) as f:
             self.wait_script = f.read()
 
-    def reset(self):
-        self.implementation.reset()
-
     def is_alive(self):
         return self.protocol.is_alive()
 
diff --git a/testing/web-platform/tests/tools/wptrunner/wptrunner/executors/executorwebdriver.py b/testing/web-platform/tests/tools/wptrunner/wptrunner/executors/executorwebdriver.py
index 73f5fcf84a8e..92d5576a6e71 100644
--- a/testing/web-platform/tests/tools/wptrunner/wptrunner/executors/executorwebdriver.py
+++ b/testing/web-platform/tests/tools/wptrunner/wptrunner/executors/executorwebdriver.py
@@ -20,8 +20,7 @@ from .protocol import (BaseProtocolPart,
                        ClickProtocolPart,
                        SendKeysProtocolPart,
                        ActionSequenceProtocolPart,
-                       TestDriverProtocolPart,
-                       GenerateTestReportProtocolPart)
+                       TestDriverProtocolPart)
 from ..testrunner import Stop
 
 import webdriver as client
@@ -189,15 +188,6 @@ class WebDriverTestDriverProtocolPart(TestDriverProtocolPart):
         self.webdriver.execute_script("window.postMessage(%s, '*')" % json.dumps(obj))
 
 
-class WebDriverGenerateTestReportProtocolPart(GenerateTestReportProtocolPart):
-    def setup(self):
-        self.webdriver = self.parent.webdriver
-
-    def generate_test_report(self, message):
-        json_message = {"message": message}
-        self.webdriver.send_session_command("POST", "reporting/generate_test_report", json_message)
-
-
 class WebDriverProtocol(Protocol):
     implements = [WebDriverBaseProtocolPart,
                   WebDriverTestharnessProtocolPart,
@@ -205,8 +195,7 @@ class WebDriverProtocol(Protocol):
                   WebDriverClickProtocolPart,
                   WebDriverSendKeysProtocolPart,
                   WebDriverActionSequenceProtocolPart,
-                  WebDriverTestDriverProtocolPart,
-                  WebDriverGenerateTestReportProtocolPart]
+                  WebDriverTestDriverProtocolPart]
 
     def __init__(self, executor, browser, capabilities, **kwargs):
         super(WebDriverProtocol, self).__init__(executor, browser)
@@ -225,6 +214,9 @@ class WebDriverProtocol(Protocol):
         self.webdriver.start()
 
 
+    def after_conect(self):
+        pass
+
     def teardown(self):
         self.logger.debug("Hanging up on WebDriver session")
         try:
@@ -405,9 +397,6 @@ class WebDriverRefTestExecutor(RefTestExecutor):
         with open(os.path.join(here, "reftest-wait_webdriver.js")) as f:
             self.wait_script = f.read()
 
-    def reset(self):
-        self.implementation.reset()
-
     def is_alive(self):
         return self.protocol.is_alive()
 
@@ -417,7 +406,7 @@ class WebDriverRefTestExecutor(RefTestExecutor):
                        window.outerHeight - window.innerHeight];"""
         )
         self.protocol.webdriver.window.position = (0, 0)
-        self.protocol.webdriver.window.size = (800 + width_offset, 600 + height_offset)
+        self.protocol.webdriver.window.size = (600 + width_offset, 600 + height_offset)
 
         result = self.implementation.run_test(test)
 
diff --git a/testing/web-platform/tests/tools/wptrunner/wptrunner/executors/protocol.py b/testing/web-platform/tests/tools/wptrunner/wptrunner/executors/protocol.py
index d08b74bfc36a..aa3565e5726a 100644
--- a/testing/web-platform/tests/tools/wptrunner/wptrunner/executors/protocol.py
+++ b/testing/web-platform/tests/tools/wptrunner/wptrunner/executors/protocol.py
@@ -265,7 +265,6 @@ class ClickProtocolPart(ProtocolPart):
         :param element: A protocol-specific handle to an element."""
         pass
 
-
 class SendKeysProtocolPart(ProtocolPart):
     """Protocol part for performing trusted clicks"""
     __metaclass__ = ABCMeta
@@ -281,20 +280,6 @@ class SendKeysProtocolPart(ProtocolPart):
         pass
 
 
-class GenerateTestReportProtocolPart(ProtocolPart):
-    """Protocol part for generating test reports"""
-    __metaclass__ = ABCMeta
-
-    name = "generate_test_report"
-
-    @abstractmethod
-    def generate_test_report(self, message):
-        """Generate a test report.
-
-        :param message: The message to be contained in the report."""
-        pass
-
-
 class ActionSequenceProtocolPart(ProtocolPart):
     """Protocol part for performing trusted clicks"""
     __metaclass__ = ABCMeta
diff --git a/testing/web-platform/tests/tools/wptrunner/wptrunner/executors/reftest.js b/testing/web-platform/tests/tools/wptrunner/wptrunner/executors/reftest.js
index 1ba98c686f09..97b3cacafc28 100644
--- a/testing/web-platform/tests/tools/wptrunner/wptrunner/executors/reftest.js
+++ b/testing/web-platform/tests/tools/wptrunner/wptrunner/executors/reftest.js
@@ -1 +1 @@
-var win = window.open("about:blank", "test", "left=0,top=0,width=800,height=600");
+var win = window.open("about:blank", "test", "left=0,top=0,width=600,height=600");
diff --git a/testing/web-platform/tests/tools/wptrunner/wptrunner/formatters.py b/testing/web-platform/tests/tools/wptrunner/wptrunner/formatters.py
old mode 100644
new mode 100755
diff --git a/testing/web-platform/tests/tools/wptrunner/wptrunner/testdriver-extra.js b/testing/web-platform/tests/tools/wptrunner/wptrunner/testdriver-extra.js
index 09d7c2908671..ca61caf51e8e 100644
--- a/testing/web-platform/tests/tools/wptrunner/wptrunner/testdriver-extra.js
+++ b/testing/web-platform/tests/tools/wptrunner/wptrunner/testdriver-extra.js
@@ -51,8 +51,6 @@
         return selector;
     };
 
-    window.test_driver_internal.in_automation = true;
-
     window.test_driver_internal.click = function(element) {
         const selector = get_selector(element);
         const pending_promise = new Promise(function(resolve, reject) {
@@ -90,13 +88,4 @@
         window.__wptrunner_message_queue.push({"type": "action", "action": "action_sequence", "actions": actions});
         return pending_promise;
     };
-
-    window.test_driver_internal.generate_test_report = function(message) {
-        const pending_promise = new Promise(function(resolve, reject) {
-            pending_resolve = resolve;
-            pending_reject = reject;
-        });
-        window.__wptrunner_message_queue.push({"type": "action", "action": "generate_test_report", "message": message});
-        return pending_promise;
-    };
 })();
diff --git a/testing/web-platform/tests/tools/wptrunner/wptrunner/testrunner.py b/testing/web-platform/tests/tools/wptrunner/wptrunner/testrunner.py
index 3d9f2dc8f499..53c4cf3fea88 100644
--- a/testing/web-platform/tests/tools/wptrunner/wptrunner/testrunner.py
+++ b/testing/web-platform/tests/tools/wptrunner/wptrunner/testrunner.py
@@ -89,7 +89,6 @@ class TestRunner(object):
         the associated methods"""
         self.setup()
         commands = {"run_test": self.run_test,
-                    "reset": self.reset,
                     "stop": self.stop,
                     "wait": self.wait}
         while True:
@@ -107,9 +106,6 @@ class TestRunner(object):
     def stop(self):
         return Stop
 
-    def reset(self):
-        self.executor.reset()
-
     def run_test(self, test):
         try:
             return self.executor.run_test(test)
@@ -542,7 +538,6 @@ class TestRunnerManager(threading.Thread):
         self.logger.test_start(self.state.test.id)
         if self.rerun > 1:
             self.logger.info("Run %d/%d" % (self.run_count, self.rerun))
-            self.send_message("reset")
         self.run_count += 1
         self.send_message("run_test", self.state.test)
 
@@ -642,6 +637,7 @@ class TestRunnerManager(threading.Thread):
                 # We are starting a new group of tests, so force a restart
                 restart = True
         else:
+            test = test
             test_group = self.state.test_group
             group_metadata = self.state.group_metadata
         if restart:
diff --git a/testing/web-platform/tests/tools/wptserve/wptserve/request.py b/testing/web-platform/tests/tools/wptserve/wptserve/request.py
index 1b1061ba7b7a..aa6306a533e2 100644
--- a/testing/web-platform/tests/tools/wptserve/wptserve/request.py
+++ b/testing/web-platform/tests/tools/wptserve/wptserve/request.py
@@ -593,7 +593,9 @@ class MultiDict(dict):
                 values = [values]
 
             for value in values:
-                if not value.filename:
+                if value.filename:
+                    value = value
+                else:
                     value = value.value
                 self.add(key, value)
         return self
diff --git a/testing/web-platform/tests/trusted-types/trusted-types-report-only.tentative.https.html b/testing/web-platform/tests/trusted-types/trusted-types-report-only.tentative.https.html
deleted file mode 100644
index f33183b49069..000000000000
--- a/testing/web-platform/tests/trusted-types/trusted-types-report-only.tentative.https.html
+++ /dev/null
@@ -1,89 +0,0 @@
-<!DOCTYPE html>
-<head>
-  <script src="/resources/testharness.js"></script>
-  <script src="/resources/testharnessreport.js"></script>
-  <script src="/content-security-policy/support/testharness-helper.js"></script>
-</head>
-<body>
-
-  <!-- Some elements for the tests to act on. -->
-  <a id="anchor" href="#">anchor</a>
-  <div id="div"></div>
-  <script id="script-src" src=""></script>
-  <script id="script"></script>
-
-  <script>
-  // CSP insists the "trusted-types: ..." directives are deliverd as headers
-  // (rather than as "<meta http-equiv" tags). This test assumes the following
-  // headers are set in the .headers file:
-  //
-  //   Content-Security-Policy-Report-Only: trusted-types ...; report-uri ...
-
-  // Return function that returns a promise that resolves on the given
-  // violation report.
-  function expect_violation(filter) {
-    return new Promise((resolve, reject) => {
-      function handler(e) {
-        if (e.originalPolicy.includes(filter)) {
-          document.removeEventListener("securitypolicyviolation", handler);
-          e.stopPropagation();
-          resolve(e);
-        }
-      }
-      document.addEventListener("securitypolicyviolation", handler);
-    });
-  }
-
-  // A sample policy we use to test TrustedTypes.createPolicy behaviour.
-  const id = x => x;
-  const policy = TrustedTypes.createPolicy("two", {
-    createHTML: id,
-    createScriptURL: id,
-    createURL: id,
-    createScript: id,
-  });
-
-
-  promise_test(t => {
-    let p = expect_violation("trusted-types two");
-    document.getElementById("anchor").href = "#abc";
-    assert_true(document.getElementById("anchor").href.endsWith("#abc"));
-    return p;
-  }, "Trusted Type violation report-only: assign string to url");
-
-  promise_test(t => {
-    let p = expect_violation("trusted-types two");
-    document.getElementById("div").innerHTML = "abc";
-    assert_equals(document.getElementById("div").textContent, "abc");
-    return p;
-  }, "Trusted Type violation report-only: assign string to html");
-
-  promise_test(t => {
-    let p = expect_violation("trusted-types two");
-    document.getElementById("script-src").src = "#";
-    assert_true(document.getElementById("script-src").src.endsWith("#"));
-    return p;
-  }, "Trusted Type violation report-only: assign string to script.src");
-
-  promise_test(t => {
-    let p = expect_violation("trusted-types two");
-    document.getElementById("script").innerHTML = "con" + "sole.log('Hello');";
-    assert_true(document.getElementById("script").textContent.startsWith("consol"));
-    return p;
-  }, "Trusted Type violation report-only: assign string to script content");
-
-  promise_test(t => {
-    let p = expect_violation("trusted-types two");
-    document.getElementById("anchor").href = "#def";
-    return p.then(report => {
-      assert_equals(report.documentURI, "" + window.location);
-      assert_equals(report.disposition, "report");
-      assert_equals(report.effectiveDirective, "trusted-types");
-      assert_equals(report.violatedDirective, "trusted-types");
-      assert_true(report.originalPolicy.startsWith("trusted-types two;"));
-    });
-  }, "Trusted Type violation report: check report contents");
-
-  </script>
-
-</body>
diff --git a/testing/web-platform/tests/trusted-types/trusted-types-report-only.tentative.https.html.headers b/testing/web-platform/tests/trusted-types/trusted-types-report-only.tentative.https.html.headers
deleted file mode 100644
index b38cfae2cb20..000000000000
--- a/testing/web-platform/tests/trusted-types/trusted-types-report-only.tentative.https.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Content-Security-Policy-Report-Only: trusted-types two; report-uri /content-security-policy/resources/dummy-report.php
diff --git a/testing/web-platform/tests/trusted-types/trusted-types-reporting-check-report.https.html b/testing/web-platform/tests/trusted-types/trusted-types-reporting-check-report.https.html
deleted file mode 100644
index 111907788d27..000000000000
--- a/testing/web-platform/tests/trusted-types/trusted-types-reporting-check-report.https.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <script src="/resources/testharness.js"></script>
-  <script src="/resources/testharnessreport.js"></script>
-  <title>Check Trusted Type violation reports</title>
-
-<!-- We assume these HTTP headers are set on the request:
-
-  Set-Cookie: trusted-types-reporting-check-report={{$id:uuid()}}; Path=/trusted-types/
-  Content-Security-Policy-Report-Only: \
-     trusted-types one two; \
-     report-uri ../content-security-policy/support/report.py?op=put&reportID={{$id}}
--->
-</head>
-<body>
-  <script>
-    TrustedTypes.createPolicy("three", {});
-  </script>
-  <script async defer src='../content-security-policy/support/checkReport.sub.js?reportField=violated-directive&reportValue=trusted-types'></script>
-</body>
-</html>
diff --git a/testing/web-platform/tests/trusted-types/trusted-types-reporting-check-report.https.html.sub.headers b/testing/web-platform/tests/trusted-types/trusted-types-reporting-check-report.https.html.sub.headers
deleted file mode 100644
index 5830239f5ca4..000000000000
--- a/testing/web-platform/tests/trusted-types/trusted-types-reporting-check-report.https.html.sub.headers
+++ /dev/null
@@ -1,6 +0,0 @@
-Expires: Mon, 26 Jul 1997 05:00:00 GMT
-Cache-Control: no-store, no-cache, must-revalidate
-Cache-Control: post-check=0, pre-check=0, false
-Pragma: no-cache
-Set-Cookie: trusted-types-reporting-check-report={{$id:uuid()}}; Path=/trusted-types/
-Content-Security-Policy-Report-Only: trusted-types one two; report-uri ../content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/testing/web-platform/tests/trusted-types/trusted-types-reporting.tentative.https.html b/testing/web-platform/tests/trusted-types/trusted-types-reporting.tentative.https.html
deleted file mode 100644
index 3074895ba13f..000000000000
--- a/testing/web-platform/tests/trusted-types/trusted-types-reporting.tentative.https.html
+++ /dev/null
@@ -1,143 +0,0 @@
-<!DOCTYPE html>
-<head>
-  <script src="/resources/testharness.js"></script>
-  <script src="/resources/testharnessreport.js"></script>
-  <script src="/content-security-policy/support/testharness-helper.js"></script>
-</head>
-<body>
-  <script>
-  // CSP insists the "trusted-types: ..." directives are deliverd as headers
-  // (rather than as "<meta http-equiv" tags). This test assumes the following
-  // headers are set in the .headers file:
-  //
-  //   Content-Security-Policy: trusted-types one
-  //   Content-Security-Policy-Report-Only: trusted-types two; report-uri ...
-  //   Content-Security-Policy: plugin-types bla/blubb
-  //
-  // The last rule is there so we can provoke a CSP violation report at will.
-  // The intent is that in order to test that a violation has *not* been thrown
-  // (and without resorting to abominations like timeouts), we force a *another*
-  // CSP violation (by violating the img-src rule) and when that event is
-  // processed we can we sure that an earlier event - if it indeed occurred -
-  // must have already been processed.
-
-  const url = "" + document.location;
-
-  // Return function that returns a promise that resolves on the given
-  // violation report.
-  //
-  // filter_arg - iff function, call it with the event object.
-  //              Else, string-ify and compare against event.originalPolicy.
-  function promise_violation(filter_arg) {
-    return _ => new Promise((resolve, reject) => {
-      function handler(e) {
-        let matches = (filter_arg instanceof Function)
-            ? filter_arg(e)
-            : (e.originalPolicy.includes(filter_arg));
-        if (matches) {
-          document.removeEventListener("securitypolicyviolation", handler);
-          e.stopPropagation();
-          resolve(e);
-        }
-      }
-      document.addEventListener("securitypolicyviolation", handler);
-    });
-  }
-
-  // Like assert_throws, but we don't care about the exact error. We just want
-  // to run the code and continue.
-  function expect_throws(fn) {
-    try { fn(); assert_unreached(); } catch (err) { /* ignore */ }
-  }
-
-  // A sample policy we use to test TrustedTypes.createPolicy behaviour.
-  const id = x => x;
-  const a_policy = {
-    createHTML: id,
-    createScriptURL: id,
-    createURL: id,
-    createScript: id,
-  };
-
-  // Provoke/wait for a CSP violation, in order to be sure that all previous
-  // CSP violations have been delivered.
-  function promise_flush() {
-    return promise_violation("plugin-types bla/blubb");
-  }
-  function flush() {
-   expect_throws(_ => {
-      var o = document.createElement('object');
-      o.type = "application/x-shockwave-flash";
-      document.body.appendChild(o);
-    });
-  }
-
-
-  promise_test(t => {
-    let p = Promise.resolve()
-        .then(promise_violation("trusted-types one"))
-        .then(promise_violation("trusted-types two"))
-        .then(promise_flush());
-    expect_throws(_ => TrustedTypes.createPolicy("three", a_policy));
-    flush();
-    return p;
-  }, "Trusted Type violation report: creating a forbidden policy.");
-
-  promise_test(t => {
-    let p = promise_flush()();
-    expect_throws(_ => TrustedTypes.createPolicy("two", a_policy));
-    flush();
-    return p;
-  }, "Trusted Type violation report: creating a report-only-forbidden policy.");
-
-  promise_test(t => {
-    let p = Promise.resolve()
-        .then(promise_violation("trusted-types two"))
-        .then(promise_flush());
-    TrustedTypes.createPolicy("one", a_policy, {exposed: true});
-    flush();
-    return p;
-  }, "Trusted Type violation report: creating a forbidden-but-not-reported policy.");
-
-  promise_test(t => {
-    let p = promise_violation("trusted-types two")();
-    expect_throws(_ => document.getElementById("anchor").href = url);
-    return p;
-  }, "Trusted Type violation report: assign string to url");
-
-  promise_test(t => {
-    let p = promise_violation("trusted-types two")();
-    expect_throws(_ => document.getElementById("div").innerHTML = "abc");
-    return p;
-  }, "Trusted Type violation report: assign string to html");
-
-  // In the following tests, we rely on the previous tests to have successfully
-  // created an exposed, no-op policy "one". Let's briefly test that.
-  promise_test(t => {
-    assert_true(!!TrustedTypes.getExposedPolicy("one"));
-    return Promise.resolve();
-  }, "By now, the \"one\" policy should have been created.");
-
-  promise_test(t => {
-    let p = promise_flush()();
-    document.getElementById("anchor").href =
-        TrustedTypes.getExposedPolicy("one").createURL("#");
-    flush();
-    return p;
-  }, "Trusted Type violation report: assign trusted URL to url; no report");
-
-  promise_test(t => {
-    let p = promise_flush()();
-    document.getElementById("div").innerHTML =
-        TrustedTypes.getExposedPolicy("one").createHTML("abc");
-    flush();
-    return p;
-  }, "Trusted Type violation report: assign trusted HTML to html; no report");
-
-  </script>
-
-  <!-- Some elements for the tests to act on. -->
-  <a id="anchor" href="">anchor</a>
-  <div id="div"></div>
-
-</body>
diff --git a/testing/web-platform/tests/trusted-types/trusted-types-reporting.tentative.https.html.headers b/testing/web-platform/tests/trusted-types/trusted-types-reporting.tentative.https.html.headers
deleted file mode 100644
index 8093b8474d68..000000000000
--- a/testing/web-platform/tests/trusted-types/trusted-types-reporting.tentative.https.html.headers
+++ /dev/null
@@ -1,4 +0,0 @@
-Content-Security-Policy: trusted-types one
-Content-Security-Policy-Report-Only: trusted-types two; report-uri /content-security-policy/resources/dummy-report.php
-Content-Security-Policy: plugin-types bla/blubb
-
diff --git a/testing/web-platform/tests/upgrade-insecure-requests/animation-worklet-import-upgrade.https.html b/testing/web-platform/tests/upgrade-insecure-requests/animation-worklet-import-upgrade.https.html
index 5f65f2357fa4..38e89eb8bd6e 100644
--- a/testing/web-platform/tests/upgrade-insecure-requests/animation-worklet-import-upgrade.https.html
+++ b/testing/web-platform/tests/upgrade-insecure-requests/animation-worklet-import-upgrade.https.html
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./support/testharness-helper.sub.js"></script>
-<script src="/common/security-features/resources/common.js"></script>
+<script src="/mixed-content/generic/common.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
 </head>
diff --git a/testing/web-platform/tests/upgrade-insecure-requests/animation-worklet-redirect-upgrade.https.html b/testing/web-platform/tests/upgrade-insecure-requests/animation-worklet-redirect-upgrade.https.html
index 0e2c86e83a63..87d0d2aa2a96 100644
--- a/testing/web-platform/tests/upgrade-insecure-requests/animation-worklet-redirect-upgrade.https.html
+++ b/testing/web-platform/tests/upgrade-insecure-requests/animation-worklet-redirect-upgrade.https.html
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./support/testharness-helper.sub.js"></script>
-<script src="/common/security-features/resources/common.js"></script>
+<script src="/mixed-content/generic/common.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
 </head>
diff --git a/testing/web-platform/tests/upgrade-insecure-requests/animation-worklet-upgrade.https.html b/testing/web-platform/tests/upgrade-insecure-requests/animation-worklet-upgrade.https.html
index 208e324a9963..8a68b2d94ab1 100644
--- a/testing/web-platform/tests/upgrade-insecure-requests/animation-worklet-upgrade.https.html
+++ b/testing/web-platform/tests/upgrade-insecure-requests/animation-worklet-upgrade.https.html
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./support/testharness-helper.sub.js"></script>
-<script src="/common/security-features/resources/common.js"></script>
+<script src="/mixed-content/generic/common.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
 </head>
diff --git a/testing/web-platform/tests/upgrade-insecure-requests/audio-worklet-import-upgrade.https.html b/testing/web-platform/tests/upgrade-insecure-requests/audio-worklet-import-upgrade.https.html
index d8d44a6a0e5d..56d7259647c3 100644
--- a/testing/web-platform/tests/upgrade-insecure-requests/audio-worklet-import-upgrade.https.html
+++ b/testing/web-platform/tests/upgrade-insecure-requests/audio-worklet-import-upgrade.https.html
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./support/testharness-helper.sub.js"></script>
-<script src="/common/security-features/resources/common.js"></script>
+<script src="/mixed-content/generic/common.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
 </head>
diff --git a/testing/web-platform/tests/upgrade-insecure-requests/audio-worklet-redirect-upgrade.https.html b/testing/web-platform/tests/upgrade-insecure-requests/audio-worklet-redirect-upgrade.https.html
index 63848c60d8c1..2e1984f60174 100644
--- a/testing/web-platform/tests/upgrade-insecure-requests/audio-worklet-redirect-upgrade.https.html
+++ b/testing/web-platform/tests/upgrade-insecure-requests/audio-worklet-redirect-upgrade.https.html
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./support/testharness-helper.sub.js"></script>
-<script src="/common/security-features/resources/common.js"></script>
+<script src="/mixed-content/generic/common.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
 </head>
diff --git a/testing/web-platform/tests/upgrade-insecure-requests/audio-worklet-upgrade.https.html b/testing/web-platform/tests/upgrade-insecure-requests/audio-worklet-upgrade.https.html
index 52f1c4d5f696..91d52adbdd3e 100644
--- a/testing/web-platform/tests/upgrade-insecure-requests/audio-worklet-upgrade.https.html
+++ b/testing/web-platform/tests/upgrade-insecure-requests/audio-worklet-upgrade.https.html
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./support/testharness-helper.sub.js"></script>
-<script src="/common/security-features/resources/common.js"></script>
+<script src="/mixed-content/generic/common.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
 </head>
diff --git a/testing/web-platform/tests/upgrade-insecure-requests/iframe-redirect-upgrade.https.html b/testing/web-platform/tests/upgrade-insecure-requests/iframe-redirect-upgrade.https.html
index 4b4a21ce9195..72047493f173 100644
--- a/testing/web-platform/tests/upgrade-insecure-requests/iframe-redirect-upgrade.https.html
+++ b/testing/web-platform/tests/upgrade-insecure-requests/iframe-redirect-upgrade.https.html
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./support/testharness-helper.sub.js"></script>
-<script src="/common/security-features/resources/common.js"></script>
+<script src="/mixed-content/generic/common.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
 </head>
diff --git a/testing/web-platform/tests/upgrade-insecure-requests/iframe-upgrade.https.html b/testing/web-platform/tests/upgrade-insecure-requests/iframe-upgrade.https.html
index 53c9997ec2d0..60c5aaaf95e7 100644
--- a/testing/web-platform/tests/upgrade-insecure-requests/iframe-upgrade.https.html
+++ b/testing/web-platform/tests/upgrade-insecure-requests/iframe-upgrade.https.html
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./support/testharness-helper.sub.js"></script>
-<script src="/common/security-features/resources/common.js"></script>
+<script src="/mixed-content/generic/common.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
 </head>
diff --git a/testing/web-platform/tests/upgrade-insecure-requests/image-redirect-upgrade.https.html b/testing/web-platform/tests/upgrade-insecure-requests/image-redirect-upgrade.https.html
index 5c7d8934c2e9..69c3f1469e7a 100644
--- a/testing/web-platform/tests/upgrade-insecure-requests/image-redirect-upgrade.https.html
+++ b/testing/web-platform/tests/upgrade-insecure-requests/image-redirect-upgrade.https.html
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./support/testharness-helper.sub.js"></script>
-<script src="/common/security-features/resources/common.js"></script>
+<script src="/mixed-content/generic/common.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
 </head>
diff --git a/testing/web-platform/tests/upgrade-insecure-requests/image-upgrade.https.html b/testing/web-platform/tests/upgrade-insecure-requests/image-upgrade.https.html
index 6f897050d48e..5ab6306ed461 100644
--- a/testing/web-platform/tests/upgrade-insecure-requests/image-upgrade.https.html
+++ b/testing/web-platform/tests/upgrade-insecure-requests/image-upgrade.https.html
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./support/testharness-helper.sub.js"></script>
-<script src="/common/security-features/resources/common.js"></script>
+<script src="/mixed-content/generic/common.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
 </head>
diff --git a/testing/web-platform/tests/upgrade-insecure-requests/layout-worklet-import-upgrade.https.html b/testing/web-platform/tests/upgrade-insecure-requests/layout-worklet-import-upgrade.https.html
index 6e9ae4d36f20..ffc73afc42ab 100644
--- a/testing/web-platform/tests/upgrade-insecure-requests/layout-worklet-import-upgrade.https.html
+++ b/testing/web-platform/tests/upgrade-insecure-requests/layout-worklet-import-upgrade.https.html
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./support/testharness-helper.sub.js"></script>
-<script src="/common/security-features/resources/common.js"></script>
+<script src="/mixed-content/generic/common.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
 </head>
diff --git a/testing/web-platform/tests/upgrade-insecure-requests/layout-worklet-redirect-upgrade.https.html b/testing/web-platform/tests/upgrade-insecure-requests/layout-worklet-redirect-upgrade.https.html
index d04165f32c39..c9c953170011 100644
--- a/testing/web-platform/tests/upgrade-insecure-requests/layout-worklet-redirect-upgrade.https.html
+++ b/testing/web-platform/tests/upgrade-insecure-requests/layout-worklet-redirect-upgrade.https.html
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./support/testharness-helper.sub.js"></script>
-<script src="/common/security-features/resources/common.js"></script>
+<script src="/mixed-content/generic/common.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
 </head>
diff --git a/testing/web-platform/tests/upgrade-insecure-requests/layout-worklet-upgrade.https.html b/testing/web-platform/tests/upgrade-insecure-requests/layout-worklet-upgrade.https.html
index 191ac12d3cab..7cbdff3902c1 100644
--- a/testing/web-platform/tests/upgrade-insecure-requests/layout-worklet-upgrade.https.html
+++ b/testing/web-platform/tests/upgrade-insecure-requests/layout-worklet-upgrade.https.html
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./support/testharness-helper.sub.js"></script>
-<script src="/common/security-features/resources/common.js"></script>
+<script src="/mixed-content/generic/common.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
 </head>
diff --git a/testing/web-platform/tests/upgrade-insecure-requests/module-worker-import-upgrade.https.html b/testing/web-platform/tests/upgrade-insecure-requests/module-worker-import-upgrade.https.html
index 22c1600e1360..0522051ebd49 100644
--- a/testing/web-platform/tests/upgrade-insecure-requests/module-worker-import-upgrade.https.html
+++ b/testing/web-platform/tests/upgrade-insecure-requests/module-worker-import-upgrade.https.html
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./support/testharness-helper.sub.js"></script>
-<script src="/common/security-features/resources/common.js"></script>
+<script src="/mixed-content/generic/common.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
 </head>
diff --git a/testing/web-platform/tests/upgrade-insecure-requests/module-worker-redirect-upgrade.https.html b/testing/web-platform/tests/upgrade-insecure-requests/module-worker-redirect-upgrade.https.html
index 936a7944b465..132663e3652b 100644
--- a/testing/web-platform/tests/upgrade-insecure-requests/module-worker-redirect-upgrade.https.html
+++ b/testing/web-platform/tests/upgrade-insecure-requests/module-worker-redirect-upgrade.https.html
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./support/testharness-helper.sub.js"></script>
-<script src="/common/security-features/resources/common.js"></script>
+<script src="/mixed-content/generic/common.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
 </head>
diff --git a/testing/web-platform/tests/upgrade-insecure-requests/module-worker-upgrade.https.html b/testing/web-platform/tests/upgrade-insecure-requests/module-worker-upgrade.https.html
index 6de610a302f8..a4be5ed45a9d 100644
--- a/testing/web-platform/tests/upgrade-insecure-requests/module-worker-upgrade.https.html
+++ b/testing/web-platform/tests/upgrade-insecure-requests/module-worker-upgrade.https.html
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./support/testharness-helper.sub.js"></script>
-<script src="/common/security-features/resources/common.js"></script>
+<script src="/mixed-content/generic/common.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
 </head>
diff --git a/testing/web-platform/tests/upgrade-insecure-requests/paint-worklet-import-upgrade.https.html b/testing/web-platform/tests/upgrade-insecure-requests/paint-worklet-import-upgrade.https.html
index da52df5c9984..96d68e260bbc 100644
--- a/testing/web-platform/tests/upgrade-insecure-requests/paint-worklet-import-upgrade.https.html
+++ b/testing/web-platform/tests/upgrade-insecure-requests/paint-worklet-import-upgrade.https.html
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./support/testharness-helper.sub.js"></script>
-<script src="/common/security-features/resources/common.js"></script>
+<script src="/mixed-content/generic/common.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
 </head>
diff --git a/testing/web-platform/tests/upgrade-insecure-requests/paint-worklet-redirect-upgrade.https.html b/testing/web-platform/tests/upgrade-insecure-requests/paint-worklet-redirect-upgrade.https.html
index b70c103da4c6..0675c6ab0cbe 100644
--- a/testing/web-platform/tests/upgrade-insecure-requests/paint-worklet-redirect-upgrade.https.html
+++ b/testing/web-platform/tests/upgrade-insecure-requests/paint-worklet-redirect-upgrade.https.html
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./support/testharness-helper.sub.js"></script>
-<script src="/common/security-features/resources/common.js"></script>
+<script src="/mixed-content/generic/common.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
 </head>
diff --git a/testing/web-platform/tests/upgrade-insecure-requests/paint-worklet-upgrade.https.html b/testing/web-platform/tests/upgrade-insecure-requests/paint-worklet-upgrade.https.html
index 3f2790a10922..b4f1aac04dea 100644
--- a/testing/web-platform/tests/upgrade-insecure-requests/paint-worklet-upgrade.https.html
+++ b/testing/web-platform/tests/upgrade-insecure-requests/paint-worklet-upgrade.https.html
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./support/testharness-helper.sub.js"></script>
-<script src="/common/security-features/resources/common.js"></script>
+<script src="/mixed-content/generic/common.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
 </head>
diff --git a/testing/web-platform/tests/upgrade-insecure-requests/support/generate.py b/testing/web-platform/tests/upgrade-insecure-requests/support/generate.py
index 8c8cca212730..2676d0c68dea 100644
--- a/testing/web-platform/tests/upgrade-insecure-requests/support/generate.py
+++ b/testing/web-platform/tests/upgrade-insecure-requests/support/generate.py
@@ -13,7 +13,7 @@ template = '''<!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./support/testharness-helper.sub.js"></script>
-<script src="/common/security-features/resources/common.js"></script>
+<script src="/mixed-content/generic/common.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
 </head>
diff --git a/testing/web-platform/tests/upgrade-insecure-requests/support/testharness-helper.sub.js b/testing/web-platform/tests/upgrade-insecure-requests/support/testharness-helper.sub.js
index 70378edd15e6..8b58eb956042 100644
--- a/testing/web-platform/tests/upgrade-insecure-requests/support/testharness-helper.sub.js
+++ b/testing/web-platform/tests/upgrade-insecure-requests/support/testharness-helper.sub.js
@@ -1,9 +1,3 @@
-// Used by common.js.
-function wrapResult(server_data) {
-  // Currently the returned value is not used in mixed-content tests.
-  return null;
-}
-
 const Host = {
   SAME_ORIGIN: "same-origin",
   CROSS_ORIGIN: "cross-origin",
diff --git a/testing/web-platform/tests/upgrade-insecure-requests/worker-redirect-upgrade.https.html b/testing/web-platform/tests/upgrade-insecure-requests/worker-redirect-upgrade.https.html
index 486965c43869..19fbb1fc5af3 100644
--- a/testing/web-platform/tests/upgrade-insecure-requests/worker-redirect-upgrade.https.html
+++ b/testing/web-platform/tests/upgrade-insecure-requests/worker-redirect-upgrade.https.html
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./support/testharness-helper.sub.js"></script>
-<script src="/common/security-features/resources/common.js"></script>
+<script src="/mixed-content/generic/common.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
 </head>
diff --git a/testing/web-platform/tests/upgrade-insecure-requests/worker-subresource-fetch-redirect-upgrade.https.html b/testing/web-platform/tests/upgrade-insecure-requests/worker-subresource-fetch-redirect-upgrade.https.html
index b2ce2cfe4043..91ff96d978c3 100644
--- a/testing/web-platform/tests/upgrade-insecure-requests/worker-subresource-fetch-redirect-upgrade.https.html
+++ b/testing/web-platform/tests/upgrade-insecure-requests/worker-subresource-fetch-redirect-upgrade.https.html
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./support/testharness-helper.sub.js"></script>
-<script src="/common/security-features/resources/common.js"></script>
+<script src="/mixed-content/generic/common.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
 </head>
diff --git a/testing/web-platform/tests/upgrade-insecure-requests/worker-subresource-fetch-upgrade.https.html b/testing/web-platform/tests/upgrade-insecure-requests/worker-subresource-fetch-upgrade.https.html
index 1639363e898b..9fb4f853452c 100644
--- a/testing/web-platform/tests/upgrade-insecure-requests/worker-subresource-fetch-upgrade.https.html
+++ b/testing/web-platform/tests/upgrade-insecure-requests/worker-subresource-fetch-upgrade.https.html
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./support/testharness-helper.sub.js"></script>
-<script src="/common/security-features/resources/common.js"></script>
+<script src="/mixed-content/generic/common.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
 </head>
diff --git a/testing/web-platform/tests/upgrade-insecure-requests/worker-upgrade.https.html b/testing/web-platform/tests/upgrade-insecure-requests/worker-upgrade.https.html
index 2b0a6a757a2c..9f2cea16b935 100644
--- a/testing/web-platform/tests/upgrade-insecure-requests/worker-upgrade.https.html
+++ b/testing/web-platform/tests/upgrade-insecure-requests/worker-upgrade.https.html
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./support/testharness-helper.sub.js"></script>
-<script src="/common/security-features/resources/common.js"></script>
+<script src="/mixed-content/generic/common.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
 </head>
diff --git a/testing/web-platform/tests/wasm/jsapi/memory/constructor.any.js b/testing/web-platform/tests/wasm/jsapi/memory/constructor.any.js
index cef713fe0fe7..11e309fe654f 100644
--- a/testing/web-platform/tests/wasm/jsapi/memory/constructor.any.js
+++ b/testing/web-platform/tests/wasm/jsapi/memory/constructor.any.js
@@ -8,18 +8,15 @@ function assert_Memory(memory, expected) {
 
   // https://github.com/WebAssembly/spec/issues/840
   assert_equals(memory.buffer, memory.buffer, "buffer should be idempotent");
-  const isShared = !!expected.shared;
-  const bufferType = isShared ? self.SharedArrayBuffer : ArrayBuffer;
-  assert_equals(Object.getPrototypeOf(memory.buffer), bufferType.prototype,
-                'prototype of buffer');
+  assert_equals(Object.getPrototypeOf(memory.buffer), ArrayBuffer.prototype,
+                "prototype of buffer");
+  assert_true(Object.isExtensible(memory.buffer), "buffer extensibility");
   assert_equals(memory.buffer.byteLength, 0x10000 * expected.size, "size of buffer");
   if (expected.size > 0) {
     const array = new Uint8Array(memory.buffer);
     assert_equals(array[0], 0, "first element of buffer");
     assert_equals(array[array.byteLength - 1], 0, "last element of buffer");
   }
-  assert_equals(isShared, Object.isFrozen(memory.buffer), "buffer frozen");
-  assert_not_equals(Object.isExtensible(memory.buffer), isShared, "buffer extensibility");
 }
 
 test(() => {
@@ -86,10 +83,6 @@ test(() => {
   assert_throws(new RangeError(), () => new WebAssembly.Memory({ "initial": 10, "maximum": 9 }));
 }, "Initial value exceeds maximum");
 
-test(() => {
-  assert_throws(new TypeError(), () => new WebAssembly.Memory({ "initial": 10, "shared": true }));
-}, "Shared memory without maximum");
-
 test(() => {
   const proxy = new Proxy({}, {
     has(o, x) {
@@ -135,47 +128,6 @@ test(() => {
   ]);
 }, "Order of evaluation for descriptor");
 
-test(t => {
-  const order = [];
-
-  new WebAssembly.Memory({
-    get maximum() {
-      order.push("maximum");
-      return {
-        valueOf() {
-          order.push("maximum valueOf");
-          return 1;
-        },
-      };
-    },
-
-    get initial() {
-      order.push("initial");
-      return {
-        valueOf() {
-          order.push("initial valueOf");
-          return 1;
-        },
-      };
-    },
-
-    get shared() {
-      order.push("shared");
-      return {
-        valueOf: t.unreached_func("should not call shared valueOf"),
-      };
-    },
-  });
-
-  assert_array_equals(order, [
-    "initial",
-    "initial valueOf",
-    "maximum",
-    "maximum valueOf",
-    "shared",
-  ]);
-}, "Order of evaluation for descriptor (with shared)");
-
 test(() => {
   const argument = { "initial": 0 };
   const memory = new WebAssembly.Memory(argument);
@@ -193,9 +145,3 @@ test(() => {
   const memory = new WebAssembly.Memory(argument, {});
   assert_Memory(memory, { "size": 0 });
 }, "Stray argument");
-
-test(() => {
-  const argument = { "initial": 4, "maximum": 10, shared: true };
-  const memory = new WebAssembly.Memory(argument);
-  assert_Memory(memory, { "size": 4, "shared": true });
-}, "Shared memory");
diff --git a/testing/web-platform/tests/wasm/jsapi/memory/grow.any.js b/testing/web-platform/tests/wasm/jsapi/memory/grow.any.js
index 11c41942510b..1ccfb946756f 100644
--- a/testing/web-platform/tests/wasm/jsapi/memory/grow.any.js
+++ b/testing/web-platform/tests/wasm/jsapi/memory/grow.any.js
@@ -2,8 +2,7 @@
 
 function assert_ArrayBuffer(actual, expected, message) {
   // https://github.com/WebAssembly/spec/issues/840
-  const bufferType = expected.shared ? self.SharedArrayBuffer : ArrayBuffer;
-  assert_equals(Object.getPrototypeOf(actual), bufferType.prototype,
+  assert_equals(Object.getPrototypeOf(actual), ArrayBuffer.prototype,
                 `${message}: prototype`);
   if (expected.detached) {
     // https://github.com/tc39/ecma262/issues/678
@@ -184,29 +183,3 @@ test(() => {
   assert_ArrayBuffer(oldMemory, { "detached": true }, "Old buffer after growing");
   assert_ArrayBuffer(newMemory, { "size": 2 }, "New buffer after growing");
 }, "Stray argument");
-
-test(() => {
-  const argument = { "initial": 1, "maximum": 2, "shared": true };
-  const memory = new WebAssembly.Memory(argument);
-  const oldMemory = memory.buffer;
-  assert_ArrayBuffer(oldMemory, { "size": 1, "shared": true }, "Buffer before growing");
-
-  const result = memory.grow(1);
-  assert_equals(result, 1);
-
-  const newMemory = memory.buffer;
-  assert_not_equals(oldMemory, newMemory);
-  assert_ArrayBuffer(oldMemory, { "size": 1, "shared": true }, "Old buffer after growing");
-  assert_ArrayBuffer(newMemory, { "size": 2, "shared": true }, "New buffer after growing");
-
-  // The old and new buffers must have the same value for the
-  // [[ArrayBufferData]] internal slot.
-  const oldArray = new Uint8Array(oldMemory);
-  const newArray = new Uint8Array(newMemory);
-  assert_equals(oldArray[0], 0, "old first element");
-  assert_equals(newArray[0], 0, "new first element");
-  oldArray[0] = 1;
-  assert_equals(oldArray[0], 1, "old first element");
-  assert_equals(newArray[0], 1, "new first element");
-
-}, "Growing shared memory does not detach old buffer");
diff --git a/testing/web-platform/tests/wasm/jsapi/module/customSections.any.js b/testing/web-platform/tests/wasm/jsapi/module/customSections.any.js
index 387d4e4a3174..04c5abed5243 100644
--- a/testing/web-platform/tests/wasm/jsapi/module/customSections.any.js
+++ b/testing/web-platform/tests/wasm/jsapi/module/customSections.any.js
@@ -156,7 +156,9 @@ test(() => {
   assert_sections(WebAssembly.Module.customSections(module, "na\uFFFDme"), [
     bytes,
   ]);
-  assert_sections(WebAssembly.Module.customSections(module, "na\uDC01me"), []);
+  assert_sections(WebAssembly.Module.customSections(module, "na\uDC01me"), [
+    bytes,
+  ]);
 }, "Custom sections with U+FFFD");
 
 test(() => {
diff --git a/testing/web-platform/tests/wasm/jsapi/table/get-set.any.js b/testing/web-platform/tests/wasm/jsapi/table/get-set.any.js
index ce9681142012..c9884d9ab359 100644
--- a/testing/web-platform/tests/wasm/jsapi/table/get-set.any.js
+++ b/testing/web-platform/tests/wasm/jsapi/table/get-set.any.js
@@ -3,7 +3,7 @@
 // META: script=/wasm/jsapi/wasm-module-builder.js
 // META: script=assertions.js
 
-let functions = {};
+let functions;
 setup(() => {
   const builder = new WasmModuleBuilder();
 
diff --git a/testing/web-platform/tests/wasm/jsapi/wasm-module-builder.js b/testing/web-platform/tests/wasm/jsapi/wasm-module-builder.js
index d7dd08b2a603..e13f4157873b 100644
--- a/testing/web-platform/tests/wasm/jsapi/wasm-module-builder.js
+++ b/testing/web-platform/tests/wasm/jsapi/wasm-module-builder.js
@@ -98,12 +98,6 @@ class WasmFunctionBuilder {
   }
 
   addBody(body) {
-    const bodyCopy = body.slice();
-    bodyCopy.push(kExprEnd);
-    return this.addBodyWithEnd(bodyCopy);
-  }
-
-  addBodyWithEnd(body) {
     this.body = body;
     return this;
   }
@@ -268,11 +262,6 @@ class WasmModuleBuilder {
     return this.setTableBounds(length);
   }
 
-  // TODO(ssauleau): legacy, remove this
-  setTableLength(min, max = undefined) {
-    return this.setTableBounds(min, max);
-  }
-
   toArray(debug = false) {
     let binary = new Binary;
     let wasm = this;
diff --git a/testing/web-platform/tests/web-animations/README.md b/testing/web-platform/tests/web-animations/README.md
index 75493ce57b4c..f6efbf977f95 100644
--- a/testing/web-platform/tests/web-animations/README.md
+++ b/testing/web-platform/tests/web-animations/README.md
@@ -19,7 +19,7 @@ Guidelines for writing tests
 
     Instead, try something like:
 
-    > *   `/web-animations/timing-model/animations/setting-the-start-time-of-an-animation.html`<br>
+    > *   `/web-animations/timing-model/animations/set-the-animation-start-time.html`<br>
     >     Tests all the branches and inputs to the procedure as defined in the
     >     spec (using the `Animation.startTime` API).
     > *   `/web-animations/interfaces/Animation/startTime.html`<br>
diff --git a/testing/web-platform/tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html b/testing/web-platform/tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html
index 3700bfa8ce80..b69cb0e81259 100644
--- a/testing/web-platform/tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html
+++ b/testing/web-platform/tests/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html
@@ -26,7 +26,7 @@
             // Experimentally determined thresholds.  DO NOT relax these values
             // to far from these values to make the tests pass.
             const errorThreshold = 9.0957e-5;
-            const snrThreshold = 85.580;
+            const snrThreshold = 85.586;
 
             // Informative message
             should(sampleRate, 'Test 1: context.sampleRate')
diff --git a/testing/web-platform/tests/webgl/webgl1-idlharness.any.js b/testing/web-platform/tests/webgl/webgl1-idlharness.any.js
index 2cf803952306..884def896cb4 100644
--- a/testing/web-platform/tests/webgl/webgl1-idlharness.any.js
+++ b/testing/web-platform/tests/webgl/webgl1-idlharness.any.js
@@ -1,6 +1,5 @@
 // META: script=/resources/WebIDLParser.js
 // META: script=/resources/idlharness.js
-// META: timeout=long
 
 // https://www.khronos.org/registry/webgl/specs/latest/1.0/
 
diff --git a/testing/web-platform/tests/webgl/webgl2-idlharness.any.js b/testing/web-platform/tests/webgl/webgl2-idlharness.any.js
index c8efcd031fe5..97edfa18285d 100644
--- a/testing/web-platform/tests/webgl/webgl2-idlharness.any.js
+++ b/testing/web-platform/tests/webgl/webgl2-idlharness.any.js
@@ -1,6 +1,5 @@
 // META: script=/resources/WebIDLParser.js
 // META: script=/resources/idlharness.js
-// META: timeout=long
 
 // https://www.khronos.org/registry/webgl/specs/latest/1.0/
 
diff --git a/testing/web-platform/tests/webrtc/RTCPeerConnection-onsignalingstatechanged.https.html b/testing/web-platform/tests/webrtc/RTCPeerConnection-onsignalingstatechanged.https.html
deleted file mode 100644
index fc3182d3d59e..000000000000
--- a/testing/web-platform/tests/webrtc/RTCPeerConnection-onsignalingstatechanged.https.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!doctype html>
-<meta charset=utf-8>
-<title>RTCPeerConnection onsignalingstatechanged</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="RTCPeerConnection-helper.js"></script>
-<script>
-
-promise_test(async t => {
-  const [track] = (await navigator.mediaDevices.getUserMedia({video: true})).getTracks();
-  t.add_cleanup(() => track.stop());
-  const pc1 = new RTCPeerConnection();
-  t.add_cleanup(() => pc1.close());
-  const pc2 = new RTCPeerConnection();
-  t.add_cleanup(() => pc2.close());
-  pc1.addTrack(track, new MediaStream());
-  await pc1.setLocalDescription(await pc1.createOffer());
-  await pc2.setRemoteDescription(pc1.localDescription);
-  const signalingStateChangeResolver = new Resolver();
-  pc2.onsignalingstatechange = t.step_func(e => {
-    const transceiver = pc2.getTransceivers()[0];
-    assert_equals(pc2.signalingState, "stable");
-    assert_equals(transceiver.currentDirection, "recvonly");
-    signalingStateChangeResolver.resolve();
-  });
-  await pc2.setLocalDescription(await pc2.createAnswer());
-  await signalingStateChangeResolver;
-});
-
-</script>
diff --git a/testing/web-platform/tests/webrtc/RTCRtpSender-transport.https.html b/testing/web-platform/tests/webrtc/RTCRtpSender-transport.https.html
index fb8aaaf8ec3f..c687911d09d2 100644
--- a/testing/web-platform/tests/webrtc/RTCRtpSender-transport.https.html
+++ b/testing/web-platform/tests/webrtc/RTCRtpSender-transport.https.html
@@ -69,14 +69,10 @@
       }
       await callee.setRemoteDescription(offer);
       const [callee_transceiver1, callee_transceiver2] = callee.getTransceivers();
-      // According to spec, setRemoteDescription only updates the transports
-      // if the remote description is an answer.
-      assert_equals(callee_transceiver1.receiver.transport, null);
-      assert_equals(callee_transceiver2.receiver.transport, null);
-      const answer = await callee.createAnswer();
-      await callee.setLocalDescription(answer);
       assert_not_equals(callee_transceiver1.receiver.transport, null);
       assert_not_equals(callee_transceiver2.receiver.transport, null);
+      const answer = await callee.createAnswer();
+      await callee.setLocalDescription(answer);
       // At this point, bundle should have kicked in.
       assert_equals(callee_transceiver1.receiver.transport,
                     callee_transceiver2.receiver.transport);
diff --git a/testing/web-platform/tests/webvtt/rendering/cues-with-video/processing-model/regions/support/scroll_up.vtt b/testing/web-platform/tests/webvtt/rendering/cues-with-video/processing-model/regions/support/scroll_up.vtt
index c2c2ff36ba48..0b88020d29f6 100644
--- a/testing/web-platform/tests/webvtt/rendering/cues-with-video/processing-model/regions/support/scroll_up.vtt
+++ b/testing/web-platform/tests/webvtt/rendering/cues-with-video/processing-model/regions/support/scroll_up.vtt
@@ -1,4 +1,4 @@
-WEBVTT
+WEVTT
 
 REGION
 id:1
diff --git a/testing/web-platform/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre_wrapped-ref.html b/testing/web-platform/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre_wrapped-ref.html
index f568217a1470..ac208c8f1299 100644
--- a/testing/web-platform/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre_wrapped-ref.html
+++ b/testing/web-platform/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue/white-space_pre_wrapped-ref.html
@@ -18,7 +18,6 @@ body { margin:0 }
     width: 40%;
     font-family: sans-serif;
     text-align: center;
-    overflow: hidden;
 }
 .cue > span {
     background: rgba(0,0,0,0.8);
@@ -26,4 +25,4 @@ body { margin:0 }
     white-space: pre
 }
 </style>
-<div class="video"><span class="cue"><span>A A  A   A	A		A		A	A   A  A A</span></span></div>
+<div class="video"><span class="cue"><span>A A  A   A	A	<br>	A		<br>A	A   A  A A</span></span></div>
diff --git a/testing/web-platform/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_pre_wrapped-ref.html b/testing/web-platform/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_pre_wrapped-ref.html
index b8b6025c31d1..4acb7779df94 100644
--- a/testing/web-platform/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_pre_wrapped-ref.html
+++ b/testing/web-platform/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_white-space_pre_wrapped-ref.html
@@ -17,7 +17,6 @@ body { margin:0 }
     right: 0;
     width: 50%;
     text-align: center;
-    overflow: hidden;
 }
 .cue > span {
     font-family: sans-serif;
@@ -27,4 +26,4 @@ body { margin:0 }
     white-space: pre
 }
 </style>
-<div class="video"><span class="cue"><span>This is a test subtitle that most likely 	will span over several rows since it's a pretty long cue with a lot of text.</span></span></div>
+<div class="video"><span class="cue"><span>This is a test subtitle that most <br>likely 	will span over several <br>rows since it's a pretty long cue <br>with a lot of text.</span></span></div>
diff --git a/testing/web-platform/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_pre_wrapped-ref.html b/testing/web-platform/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_pre_wrapped-ref.html
index a681294feccb..1c91eb7578f8 100644
--- a/testing/web-platform/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_pre_wrapped-ref.html
+++ b/testing/web-platform/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_pre_wrapped-ref.html
@@ -17,7 +17,6 @@ body { margin:0 }
     right: 0;
     width: 50%;
     text-align: center;
-    overflow: hidden;
 }
 .cue > span {
     font-family: sans-serif;
@@ -26,4 +25,4 @@ body { margin:0 }
     white-space: pre
 }
 </style>
-<div class="video"><span class="cue"><span>This is a test subtitle that most likely 	will span over several rows since it's a pretty long cue with a lot of text.</span></span></div>
+<div class="video"><span class="cue"><span>This is a test subtitle that most <br>likely 	will span over several <br>rows since it's a pretty long cue <br>with a lot of text.</span></span></div>
diff --git a/testing/web-platform/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_pre_wrapped-ref.html b/testing/web-platform/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_pre_wrapped-ref.html
index 3eb92d702acd..afcc80c13402 100644
--- a/testing/web-platform/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_pre_wrapped-ref.html
+++ b/testing/web-platform/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/italic_object/italic_white-space_pre_wrapped-ref.html
@@ -17,7 +17,6 @@ body { margin:0 }
     right: 0;
     width: 50%;
     text-align: center;
-    overflow: hidden;
 }
 .cue > span {
     font-family: sans-serif;
@@ -27,4 +26,4 @@ body { margin:0 }
     white-space: pre
 }
 </style>
-<div class="video"><span class="cue"><span>This is a test subtitle that most likely 	will span over several rows since it's a pretty long cue with a lot of text.</span></span></div>
+<div class="video"><span class="cue"><span>This is a test subtitle that most <br>likely 	will span over several <br>rows since it's a pretty long cue <br>with a lot of text.</span></span></div>
diff --git a/testing/web-platform/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_pre_wrapped-ref.html b/testing/web-platform/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_pre_wrapped-ref.html
index 8b9f12a4e0b1..ec2f45926a24 100644
--- a/testing/web-platform/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_pre_wrapped-ref.html
+++ b/testing/web-platform/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/underline_object/underline_white-space_pre_wrapped-ref.html
@@ -17,7 +17,6 @@ body { margin:0 }
     right: 0;
     width: 50%;
     text-align: center;
-    overflow: hidden;
 }
 .cue > span {
     font-family: sans-serif;
@@ -27,4 +26,4 @@ body { margin:0 }
     white-space: pre
 }
 </style>
-<div class="video"><span class="cue"><span>This is a test subtitle that most likely 	will span over several rows since it's a pretty long cue with a lot of text.</span></span></div>
+<div class="video"><span class="cue"><span>This is a test subtitle that most <br>likely 	will span over several <br>rows since it's a pretty long cue <br>with a lot of text.</span></span></div>
diff --git a/testing/web-platform/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_pre_wrapped-ref.html b/testing/web-platform/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_pre_wrapped-ref.html
index 5f32a25d3fd7..aee2b7db423b 100644
--- a/testing/web-platform/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_pre_wrapped-ref.html
+++ b/testing/web-platform/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_pre_wrapped-ref.html
@@ -17,7 +17,6 @@ body { margin:0 }
     right: 0;
     width: 50%;
     text-align: center;
-    overflow: hidden;
 }
 .cue > span {
     font-family: sans-serif;
@@ -26,4 +25,4 @@ body { margin:0 }
     white-space: pre
 }
 </style>
-<div class="video"><span class="cue"><span>This is a test subtitle that most likely 	will span over several rows since it's a pretty long cue with a lot of text.</span></span></div>
+<div class="video"><span class="cue"><span>This is a test subtitle that most <br>likely 	will span over several <br>rows since it's a pretty long cue <br>with a lot of text.</span></span></div>
diff --git a/testing/web-platform/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre_wrapped-ref.html b/testing/web-platform/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre_wrapped-ref.html
index 394549b1d83b..6a7e65867cb0 100644
--- a/testing/web-platform/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre_wrapped-ref.html
+++ b/testing/web-platform/tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre_wrapped-ref.html
@@ -18,7 +18,6 @@ body { margin:0 }
     width: 40%;
     font-family: sans-serif;
     text-align: center;
-    overflow: hidden;
 }
 .cue > span {
     background: rgba(0,0,0,0.8);
@@ -26,4 +25,4 @@ body { margin:0 }
     white-space: pre
 }
 </style>
-<div class="video"><span class="cue"><span>A A  A   A	A		A		A	A   A  A A</span></span></div>
+<div class="video"><span class="cue"><span>A A  A   A	A	<br>	A		<br>A	A   A  A A</span></span></div>
diff --git a/testing/web-platform/tests/webxr/xrFrame_lifetime.https.html b/testing/web-platform/tests/webxr/xrFrame_lifetime.https.html
deleted file mode 100644
index 971a6d78a1e1..000000000000
--- a/testing/web-platform/tests/webxr/xrFrame_lifetime.https.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE html>
-<body>
-  <script src=/resources/testharness.js></script>
-  <script src=/resources/testharnessreport.js></script>
-  <script src="resources/webxr_util.js"></script>
-  <canvas></canvas>
-
-  <script>
-    let immersiveTestName = "XRFrame methods throw exceptions outside of the " +
-      "requestAnimationFrame callback for immersive sessions";
-    let nonImmersiveTestName = "XRFrame methods throw exceptions outside of the " +
-      "requestAnimationFrame callback for non-immersive sessions";
-
-    let fakeDeviceInitParams = { supportsImmersive:true };
-
-    let immersiveSessionOptions = { mode: 'immersive-vr' };
-    let nonImmersiveSessionOptions = { outputContext: getOutputContext() };
-
-    let testFunction = (testSession, testController, t) => new Promise((resolve) => {
-      let staleFrame = null;
-      let currentReferenceSpace = null;
-
-      function onFrame(time, xrFrame) {
-        t.step(() => {
-          assert_true(xrFrame instanceof XRFrame);
-        });
-
-        staleFrame = xrFrame;
-        step_timeout(afterFrame, 0);
-      }
-
-      function afterFrame() {
-        t.step(() => {
-          // Attempting to call a method on the frame outside the callback that
-          // originally provided it should cause it to throw an exception.
-          assert_throws('InvalidStateError', () => staleFrame.getViewerPose(currentReferenceSpace));
-        });
-
-        // Test does not complete until the this function has executed.
-        resolve();
-      }
-
-      testSession.requestReferenceSpace({ type: 'stationary', subtype: 'eye-level' }).then((referenceSpace) => {
-        currentReferenceSpace = referenceSpace;
-        testSession.requestAnimationFrame(onFrame);
-      });
-    });
-
-    xr_session_promise_test(immersiveTestName, testFunction,
-      fakeDeviceInitParams, immersiveSessionOptions);
-    xr_session_promise_test(nonImmersiveTestName, testFunction,
-      fakeDeviceInitParams, nonImmersiveSessionOptions);
-
-  </script>
-</body>
\ No newline at end of file