diff --git a/components/layout_thread/lib.rs b/components/layout_thread/lib.rs
index 1d8c3d89a72..2973c4fd0c1 100644
--- a/components/layout_thread/lib.rs
+++ b/components/layout_thread/lib.rs
@@ -687,14 +687,12 @@ impl LayoutThread {
 
         let locked_script_channel = Mutex::new(self.script_chan.clone());
         let pipeline_id = self.id;
-        let web_font_finished_loading_callback = move |succeeded: bool| {
-            if succeeded {
-                let _ = locked_script_channel
-                    .lock()
-                    .unwrap()
-                    .send(ConstellationControlMsg::WebFontLoaded(pipeline_id));
-            }
-        };
+        let web_font_finished_loading_callback =
+            move |succeeded: bool| {
+                let _ = locked_script_channel.lock().unwrap().send(
+                    ConstellationControlMsg::WebFontLoaded(pipeline_id, succeeded),
+                );
+            };
 
         // Find all font-face rules and notify the FontContext of them.
         // GWTODO: Need to handle unloading web fonts.
@@ -707,9 +705,10 @@ impl LayoutThread {
         );
 
         if self.debug.load_webfonts_synchronously && newly_loading_font_count > 0 {
+            // TODO: Handle failure in web font loading
             let _ = self
                 .script_chan
-                .send(ConstellationControlMsg::WebFontLoaded(self.id));
+                .send(ConstellationControlMsg::WebFontLoaded(self.id, true));
         }
     }
 
diff --git a/components/layout_thread_2020/lib.rs b/components/layout_thread_2020/lib.rs
index 32b3ea89e77..41a15df6cc7 100644
--- a/components/layout_thread_2020/lib.rs
+++ b/components/layout_thread_2020/lib.rs
@@ -602,11 +602,12 @@ impl LayoutThread {
         let locked_script_channel = Mutex::new(self.script_chan.clone());
         let pipeline_id = self.id;
         let web_font_finished_loading_callback = move |succeeded: bool| {
-            if succeeded {
-                let _ = locked_script_channel
-                    .lock()
-                    .send(ConstellationControlMsg::WebFontLoaded(pipeline_id));
-            }
+            let _ = locked_script_channel
+                .lock()
+                .send(ConstellationControlMsg::WebFontLoaded(
+                    pipeline_id,
+                    succeeded,
+                ));
         };
 
         // Find all font-face rules and notify the font cache of them.
@@ -620,9 +621,10 @@ impl LayoutThread {
         );
 
         if self.debug.load_webfonts_synchronously && newly_loading_font_count > 0 {
+            // TODO: Handle failure in web font loading
             let _ = self
                 .script_chan
-                .send(ConstellationControlMsg::WebFontLoaded(self.id));
+                .send(ConstellationControlMsg::WebFontLoaded(self.id, true));
         }
     }
 
diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs
index 5cfa099932f..2b38b3f164c 100644
--- a/components/script/dom/document.rs
+++ b/components/script/dom/document.rs
@@ -121,6 +121,7 @@ use crate::dom::element::{
 use crate::dom::event::{Event, EventBubbles, EventCancelable, EventDefault, EventStatus};
 use crate::dom::eventtarget::EventTarget;
 use crate::dom::focusevent::FocusEvent;
+use crate::dom::fontfaceset::FontFaceSet;
 use crate::dom::globalscope::GlobalScope;
 use crate::dom::gpucanvascontext::{GPUCanvasContext, WebGPUContextId};
 use crate::dom::hashchangeevent::HashChangeEvent;
@@ -466,6 +467,9 @@ pub struct Document {
     /// - <https://bugzilla.mozilla.org/show_bug.cgi?id=1596992>
     /// - <https://github.com/w3c/csswg-drafts/issues/4518>
     resize_observers: DomRefCell<Vec<Dom<ResizeObserver>>>,
+    /// The set of all fonts loaded by this document.
+    /// <https://drafts.csswg.org/css-font-loading/#font-face-source>
+    fonts: MutNullableDom<FontFaceSet>,
 }
 
 #[derive(JSTraceable, MallocSizeOf)]
@@ -3291,6 +3295,7 @@ impl Document {
             pending_compositor_events: Default::default(),
             mouse_move_event_index: Default::default(),
             resize_observers: Default::default(),
+            fonts: Default::default(),
         }
     }
 
@@ -5364,6 +5369,12 @@ impl DocumentMethods for Document {
             None
         }
     }
+
+    // https://drafts.csswg.org/css-font-loading/#font-face-source
+    fn Fonts(&self) -> DomRoot<FontFaceSet> {
+        self.fonts
+            .or_init(|| FontFaceSet::new(&*self.global(), None))
+    }
 }
 
 fn update_with_current_time_ms(marker: &Cell<u64>) {
diff --git a/components/script/dom/fontfaceset.rs b/components/script/dom/fontfaceset.rs
new file mode 100644
index 00000000000..74df3caf061
--- /dev/null
+++ b/components/script/dom/fontfaceset.rs
@@ -0,0 +1,50 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+use std::rc::Rc;
+
+use dom_struct::dom_struct;
+use js::rust::HandleObject;
+
+use crate::dom::bindings::codegen::Bindings::FontFaceSetBinding::FontFaceSetMethods;
+use crate::dom::bindings::reflector::reflect_dom_object_with_proto;
+use crate::dom::bindings::root::DomRoot;
+use crate::dom::eventtarget::EventTarget;
+use crate::dom::globalscope::GlobalScope;
+use crate::dom::promise::Promise;
+use crate::realms::enter_realm;
+
+#[dom_struct]
+pub struct FontFaceSet {
+    target: EventTarget,
+    #[ignore_malloc_size_of = "Rc"]
+    promise: Rc<Promise>,
+}
+
+impl FontFaceSet {
+    pub fn new_inherited(global: &GlobalScope) -> Self {
+        FontFaceSet {
+            target: EventTarget::new_inherited(),
+            promise: Promise::new(global),
+        }
+    }
+
+    pub fn new(global: &GlobalScope, proto: Option<HandleObject>) -> DomRoot<Self> {
+        reflect_dom_object_with_proto(Box::new(FontFaceSet::new_inherited(global)), global, proto)
+    }
+
+    pub fn fulfill_ready_promise_if_needed(&self) {
+        if !self.promise.is_fulfilled() {
+            let _ac = enter_realm(&*self.promise);
+            self.promise.resolve_native(self);
+        }
+    }
+}
+
+impl FontFaceSetMethods for FontFaceSet {
+    /// https://drafts.csswg.org/css-font-loading/#dom-fontfaceset-ready
+    fn Ready(&self) -> Rc<Promise> {
+        self.promise.clone()
+    }
+}
diff --git a/components/script/dom/mod.rs b/components/script/dom/mod.rs
index 34655e4c477..a4c4f2f3230 100644
--- a/components/script/dom/mod.rs
+++ b/components/script/dom/mod.rs
@@ -313,6 +313,7 @@ pub mod filelist;
 pub mod filereader;
 pub mod filereadersync;
 pub mod focusevent;
+pub mod fontfaceset;
 pub mod formdata;
 pub mod formdataevent;
 pub mod gainnode;
diff --git a/components/script/dom/webidls/FontFaceSet.webidl b/components/script/dom/webidls/FontFaceSet.webidl
new file mode 100644
index 00000000000..f114b2ac9b4
--- /dev/null
+++ b/components/script/dom/webidls/FontFaceSet.webidl
@@ -0,0 +1,49 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+/*
+dictionary FontFaceSetLoadEventInit : EventInit {
+  sequence<FontFace> fontfaces = [];
+};
+
+[Exposed=(Window,Worker)]
+interface FontFaceSetLoadEvent : Event {
+  constructor(DOMString type, optional FontFaceSetLoadEventInit eventInitDict = {});
+  // WebIDL needs to support FrozenArray & SameObject
+  // [SameObject] readonly attribute FrozenArray<FontFace> fontfaces;
+  readonly attribute any fontfaces;
+};
+
+enum FontFaceSetLoadStatus { "loading" , "loaded" };
+*/
+
+// https://drafts.csswg.org/css-font-loading/#FontFaceSet-interface
+[Exposed=(Window,Worker)]
+interface FontFaceSet : EventTarget {
+  // constructor(sequence<FontFace> initialFaces);
+
+  // setlike<FontFace>;
+  // FontFaceSet add(FontFace font);
+  // boolean delete(FontFace font);
+  // undefined clear();
+
+  // events for when loading state changes
+  // attribute EventHandler onloading;
+  // attribute EventHandler onloadingdone;
+  // attribute EventHandler onloadingerror;
+
+  // check and start loads if appropriate
+  // and fulfill promise when all loads complete
+  // Promise<sequence<FontFace>> load(DOMString font, optional DOMString text = " ");
+
+  // return whether all fonts in the fontlist are loaded
+  // (does not initiate load if not available)
+  // boolean check(DOMString font, optional DOMString text = " ");
+
+  // async notification that font loading and layout operations are done
+  readonly attribute Promise<FontFaceSet> ready;
+
+  // loading state, "loading" while one or more fonts loading, "loaded" otherwise
+  // readonly attribute FontFaceSetLoadStatus status;
+};
diff --git a/components/script/dom/webidls/FontFaceSource.webidl b/components/script/dom/webidls/FontFaceSource.webidl
new file mode 100644
index 00000000000..bdc286d9af7
--- /dev/null
+++ b/components/script/dom/webidls/FontFaceSource.webidl
@@ -0,0 +1,11 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+// https://drafts.csswg.org/css-font-loading/#font-face-source
+interface mixin FontFaceSource {
+  readonly attribute FontFaceSet fonts;
+};
+
+Document includes FontFaceSource;
+// WorkerGlobalScope includes FontFaceSource;
diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs
index a86dcfc4ed8..fbc526775b5 100644
--- a/components/script/dom/window.rs
+++ b/components/script/dom/window.rs
@@ -1952,6 +1952,10 @@ impl Window {
     /// may happen in the only case a query reflow may bail out, that is, if the
     /// viewport size is not present). See #11223 for an example of that.
     pub fn reflow(&self, reflow_goal: ReflowGoal, reason: ReflowReason) -> bool {
+        // Fetch the pending web fonts before layout, in case a font loads during
+        // the layout.
+        let pending_web_fonts = self.layout.borrow().waiting_for_web_fonts_to_load();
+
         self.Document().ensure_safe_to_run_script_or_layout();
         let for_display = reflow_goal == ReflowGoal::Full;
 
@@ -1980,6 +1984,24 @@ impl Window {
             );
         }
 
+        let document = self.Document();
+        let font_face_set = document.Fonts();
+        let is_ready_state_complete = document.ReadyState() == DocumentReadyState::Complete;
+
+        // From https://drafts.csswg.org/css-font-loading/#font-face-set-ready:
+        // > A FontFaceSet is pending on the environment if any of the following are true:
+        // >  - the document is still loading
+        // >  - the document has pending stylesheet requests
+        // >  - the document has pending layout operations which might cause the user agent to request
+        // >    a font, or which depend on recently-loaded fonts
+        //
+        // Thus, we are queueing promise resolution here. This reflow should have been triggered by
+        // a "rendering opportunity" in `ScriptThread::handle_web_font_loaded, which should also
+        // make sure a microtask checkpoint happens, triggering the promise callback.
+        if !pending_web_fonts && is_ready_state_complete {
+            font_face_set.fulfill_ready_promise_if_needed();
+        }
+
         // If writing a screenshot, check if the script has reached a state
         // where it's safe to write the image. This means that:
         // 1) The reflow is for display (otherwise it could be a query)
@@ -1989,8 +2011,6 @@ impl Window {
         // that this pipeline is ready to write the image (from the script thread
         // perspective at least).
         if self.prepare_for_screenshot && for_display {
-            let document = self.Document();
-
             // Checks if the html element has reftest-wait attribute present.
             // See http://testthewebforward.org/docs/reftests.html
             let html_element = document.GetDocumentElement();
@@ -1998,9 +2018,7 @@ impl Window {
                 elem.has_class(&atom!("reftest-wait"), CaseSensitivity::CaseSensitive)
             });
 
-            let pending_web_fonts = self.layout.borrow().waiting_for_web_fonts_to_load();
             let has_sent_idle_message = self.has_sent_idle_message.get();
-            let is_ready_state_complete = document.ReadyState() == DocumentReadyState::Complete;
             let pending_images = !self.pending_layout_images.borrow().is_empty();
 
             if !has_sent_idle_message &&
diff --git a/components/script/script_thread.rs b/components/script/script_thread.rs
index 6fe8f8f4ead..f57451195cd 100644
--- a/components/script/script_thread.rs
+++ b/components/script/script_thread.rs
@@ -2125,7 +2125,7 @@ impl ScriptThread {
                 FocusIFrame(id, ..) => Some(id),
                 WebDriverScriptCommand(id, ..) => Some(id),
                 TickAllAnimations(id, ..) => Some(id),
-                WebFontLoaded(id) => Some(id),
+                WebFontLoaded(id, ..) => Some(id),
                 DispatchIFrameLoadEvent {
                     target: _,
                     parent: id,
@@ -2325,8 +2325,8 @@ impl ScriptThread {
             ConstellationControlMsg::WebDriverScriptCommand(pipeline_id, msg) => {
                 self.handle_webdriver_msg(pipeline_id, msg)
             },
-            ConstellationControlMsg::WebFontLoaded(pipeline_id) => {
-                self.handle_web_font_loaded(pipeline_id)
+            ConstellationControlMsg::WebFontLoaded(pipeline_id, success) => {
+                self.handle_web_font_loaded(pipeline_id, success)
             },
             ConstellationControlMsg::DispatchIFrameLoadEvent {
                 target: browsing_context_id,
@@ -3301,7 +3301,7 @@ impl ScriptThread {
     }
 
     /// Handles a Web font being loaded. Does nothing if the page no longer exists.
-    fn handle_web_font_loaded(&self, pipeline_id: PipelineId) {
+    fn handle_web_font_loaded(&self, pipeline_id: PipelineId, _success: bool) {
         let Some(document) = self.documents.borrow().find_document(pipeline_id) else {
             warn!("Web font loaded in closed pipeline {}.", pipeline_id);
             return;
@@ -3310,6 +3310,12 @@ impl ScriptThread {
         // TODO: This should only dirty nodes that are waiting for a web font to finish loading!
         document.dirty_all_nodes();
         document.window().add_pending_reflow();
+
+        // This is required because the handlers added to the promise exposed at
+        // `document.fonts.ready` are run by the event loop only when it performs a microtask
+        // checkpoint. Without the call below, this never happens and the promise is 'stuck' waiting
+        // to be resolved until another event forces a microtask checkpoint.
+        self.rendering_opportunity(pipeline_id);
     }
 
     /// Handles a worklet being loaded. Does nothing if the page no longer exists.
diff --git a/components/shared/script/lib.rs b/components/shared/script/lib.rs
index 2a1947f58a7..90e12a22663 100644
--- a/components/shared/script/lib.rs
+++ b/components/shared/script/lib.rs
@@ -347,7 +347,7 @@ pub enum ConstellationControlMsg {
     TickAllAnimations(PipelineId, AnimationTickType),
     /// Notifies the script thread that a new Web font has been loaded, and thus the page should be
     /// reflowed.
-    WebFontLoaded(PipelineId),
+    WebFontLoaded(PipelineId, bool /* success */),
     /// Cause a `load` event to be dispatched at the appropriate iframe element.
     DispatchIFrameLoadEvent {
         /// The frame that has been marked as loaded.
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/linebox/vertical-align-top-bottom-001.html.ini b/tests/wpt/meta-legacy-layout/css/CSS2/linebox/vertical-align-top-bottom-001.html.ini
index 3fa51ffd74e..ac77b8d0241 100644
--- a/tests/wpt/meta-legacy-layout/css/CSS2/linebox/vertical-align-top-bottom-001.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/CSS2/linebox/vertical-align-top-bottom-001.html.ini
@@ -1,5 +1,39 @@
 [vertical-align-top-bottom-001.html]
-  expected: ERROR
   [vertical-align-top-bottom-001]
     expected: FAIL
 
+  [text-top+bottom]
+    expected: FAIL
+
+  [text-bottom+bottom]
+    expected: FAIL
+
+  [text-top+]
+    expected: FAIL
+
+  [text-top+top]
+    expected: FAIL
+
+  [text-top+text-top]
+    expected: FAIL
+
+  [text-top+text-bottom]
+    expected: FAIL
+
+  [text-bottom+]
+    expected: FAIL
+
+  [text-bottom+top]
+    expected: FAIL
+
+  [text-bottom+text-top]
+    expected: FAIL
+
+  [bottom+]
+    expected: FAIL
+
+  [bottom+text-top]
+    expected: FAIL
+
+  [bottom+text-bottom]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/CSS2/positioning/inline-static-position-001.html.ini b/tests/wpt/meta-legacy-layout/css/CSS2/positioning/inline-static-position-001.html.ini
index f02507f83b3..60459564561 100644
--- a/tests/wpt/meta-legacy-layout/css/CSS2/positioning/inline-static-position-001.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/CSS2/positioning/inline-static-position-001.html.ini
@@ -1,5 +1,15 @@
 [inline-static-position-001.html]
-  expected: ERROR
-  [CSS Test: Static positions and line wrapping]
+  [.tests .abs 1]
     expected: FAIL
 
+  [.tests .abs 2]
+    expected: FAIL
+
+  [.tests .abs 4]
+    expected: FAIL
+
+  [.tests .abs 5]
+    expected: FAIL
+
+  [.tests .abs 6]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-flexbox/flex-one-sets-flex-basis-to-zero-px.html.ini b/tests/wpt/meta-legacy-layout/css/css-flexbox/flex-one-sets-flex-basis-to-zero-px.html.ini
index 28a24ecf62c..523d5da3d96 100644
--- a/tests/wpt/meta-legacy-layout/css/css-flexbox/flex-one-sets-flex-basis-to-zero-px.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-flexbox/flex-one-sets-flex-basis-to-zero-px.html.ini
@@ -1,2 +1,12 @@
 [flex-one-sets-flex-basis-to-zero-px.html]
-  expected: ERROR
+  [.flexbox 3]
+    expected: FAIL
+
+  [.flexbox 4]
+    expected: FAIL
+
+  [.flexbox 5]
+    expected: FAIL
+
+  [.flexbox 6]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-fonts/generic-family-keywords-001.html.ini b/tests/wpt/meta-legacy-layout/css/css-fonts/generic-family-keywords-001.html.ini
index 77d5720a911..a4ff0f8504c 100644
--- a/tests/wpt/meta-legacy-layout/css/css-fonts/generic-family-keywords-001.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-fonts/generic-family-keywords-001.html.ini
@@ -1,2 +1,27 @@
 [generic-family-keywords-001.html]
-  expected: ERROR
+  [@font-face matching for quoted and unquoted serif]
+    expected: FAIL
+
+  [@font-face matching for quoted and unquoted sans-serif]
+    expected: FAIL
+
+  [@font-face matching for quoted and unquoted cursive]
+    expected: FAIL
+
+  [@font-face matching for quoted and unquoted fantasy]
+    expected: FAIL
+
+  [@font-face matching for quoted and unquoted monospace]
+    expected: FAIL
+
+  [@font-face matching for quoted and unquoted system-ui]
+    expected: FAIL
+
+  [@font-face matching for quoted and unquoted emoji]
+    expected: FAIL
+
+  [@font-face matching for quoted and unquoted math]
+    expected: FAIL
+
+  [@font-face matching for quoted and unquoted ui-rounded]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-fonts/generic-family-keywords-002.html.ini b/tests/wpt/meta-legacy-layout/css/css-fonts/generic-family-keywords-002.html.ini
deleted file mode 100644
index 74f8887074c..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-fonts/generic-family-keywords-002.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[generic-family-keywords-002.html]
-  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/css/css-fonts/generic-family-keywords-003.html.ini b/tests/wpt/meta-legacy-layout/css/css-fonts/generic-family-keywords-003.html.ini
deleted file mode 100644
index db0e6e5a7e9..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-fonts/generic-family-keywords-003.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[generic-family-keywords-003.html]
-  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/css/css-fonts/matching/fixed-stretch-style-over-weight.html.ini b/tests/wpt/meta-legacy-layout/css/css-fonts/matching/fixed-stretch-style-over-weight.html.ini
index e312e61375b..39234785383 100644
--- a/tests/wpt/meta-legacy-layout/css/css-fonts/matching/fixed-stretch-style-over-weight.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-fonts/matching/fixed-stretch-style-over-weight.html.ini
@@ -1,3 +1,3 @@
 [fixed-stretch-style-over-weight.html]
   bug: https://github.com/servo/servo/issues/21565
-  expected: TIMEOUT
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-fonts/matching/range-descriptor-reversed.html.ini b/tests/wpt/meta-legacy-layout/css/css-fonts/matching/range-descriptor-reversed.html.ini
index a341dd66fb4..a2d0a59d473 100644
--- a/tests/wpt/meta-legacy-layout/css/css-fonts/matching/range-descriptor-reversed.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-fonts/matching/range-descriptor-reversed.html.ini
@@ -1,2 +1,2 @@
 [range-descriptor-reversed.html]
-  expected: TIMEOUT
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-fonts/matching/stretch-distance-over-weight-distance.html.ini b/tests/wpt/meta-legacy-layout/css/css-fonts/matching/stretch-distance-over-weight-distance.html.ini
index a294317d66c..8711142fc29 100644
--- a/tests/wpt/meta-legacy-layout/css/css-fonts/matching/stretch-distance-over-weight-distance.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-fonts/matching/stretch-distance-over-weight-distance.html.ini
@@ -1,3 +1,3 @@
 [stretch-distance-over-weight-distance.html]
   bug: https://github.com/servo/servo/issues/21565
-  expected: TIMEOUT
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-fonts/matching/style-ranges-over-weight-direction.html.ini b/tests/wpt/meta-legacy-layout/css/css-fonts/matching/style-ranges-over-weight-direction.html.ini
index 86fe3cb5e66..f4f56870eb3 100644
--- a/tests/wpt/meta-legacy-layout/css/css-fonts/matching/style-ranges-over-weight-direction.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-fonts/matching/style-ranges-over-weight-direction.html.ini
@@ -1,3 +1,3 @@
 [style-ranges-over-weight-direction.html]
   bug: https://github.com/servo/servo/issues/21565
-  expected: TIMEOUT
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-fonts/math-script-level-and-math-style/math-script-level-002.tentative.html.ini b/tests/wpt/meta-legacy-layout/css/css-fonts/math-script-level-and-math-style/math-script-level-002.tentative.html.ini
index f84e4ebffe0..2ca8c2d0026 100644
--- a/tests/wpt/meta-legacy-layout/css/css-fonts/math-script-level-and-math-style/math-script-level-002.tentative.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-fonts/math-script-level-and-math-style/math-script-level-002.tentative.html.ini
@@ -1,5 +1,4 @@
 [math-script-level-002.tentative.html]
-  expected: ERROR
   [<integer> ; starting from level 50]
     expected: FAIL
 
@@ -17,7 +16,3 @@
 
   [add(<integer>)]
     expected: FAIL
-
-  [math-script-level]
-    expected: FAIL
-
diff --git a/tests/wpt/meta-legacy-layout/css/css-fonts/math-script-level-and-math-style/math-script-level-004.tentative.html.ini b/tests/wpt/meta-legacy-layout/css/css-fonts/math-script-level-and-math-style/math-script-level-004.tentative.html.ini
index e75b5bc760f..ab0644910cd 100644
--- a/tests/wpt/meta-legacy-layout/css/css-fonts/math-script-level-and-math-style/math-script-level-004.tentative.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-fonts/math-script-level-and-math-style/math-script-level-004.tentative.html.ini
@@ -1,5 +1,12 @@
 [math-script-level-004.tentative.html]
-  expected: ERROR
-  [math-script-level]
+  [scriptPercentScaleDown=80, scriptScriptPercentScaleDown=40]
     expected: FAIL
 
+  [scriptPercentScaleDown=0, scriptScriptPercentScaleDown=40]
+    expected: FAIL
+
+  [scriptPercentScaleDown=80, scriptScriptPercentScaleDown=0]
+    expected: FAIL
+
+  [No MATH table]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-fonts/test_datafont_same_origin.html.ini b/tests/wpt/meta-legacy-layout/css/css-fonts/test_datafont_same_origin.html.ini
index 42e56d21a8a..cfb372332cb 100644
--- a/tests/wpt/meta-legacy-layout/css/css-fonts/test_datafont_same_origin.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-fonts/test_datafont_same_origin.html.ini
@@ -1,4 +1,4 @@
 [test_datafont_same_origin.html]
+  expected: TIMEOUT
   [Test if data:font would be treated same origin.]
-    expected: FAIL
-
+    expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/css/css-fonts/variations/font-descriptor-range-reversed.html.ini b/tests/wpt/meta-legacy-layout/css/css-fonts/variations/font-descriptor-range-reversed.html.ini
deleted file mode 100644
index e2dc2575bc6..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-fonts/variations/font-descriptor-range-reversed.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[font-descriptor-range-reversed.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/css/css-fonts/variations/variable-box-font.html.ini b/tests/wpt/meta-legacy-layout/css/css-fonts/variations/variable-box-font.html.ini
index ca0288ff93a..014b3456ee2 100644
--- a/tests/wpt/meta-legacy-layout/css/css-fonts/variations/variable-box-font.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-fonts/variations/variable-box-font.html.ini
@@ -1,3 +1,3 @@
 [variable-box-font.html]
   bug: https://github.com/servo/servo/issues/21565
-  expected: TIMEOUT
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-fonts/variations/variable-gpos-m2b.html.ini b/tests/wpt/meta-legacy-layout/css/css-fonts/variations/variable-gpos-m2b.html.ini
index 1724e7d70a7..f73ed76a3b9 100644
--- a/tests/wpt/meta-legacy-layout/css/css-fonts/variations/variable-gpos-m2b.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-fonts/variations/variable-gpos-m2b.html.ini
@@ -1,3 +1,3 @@
 [variable-gpos-m2b.html]
   bug: https://github.com/servo/servo/issues/21565
-  expected: TIMEOUT
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-fonts/variations/variable-gsub.html.ini b/tests/wpt/meta-legacy-layout/css/css-fonts/variations/variable-gsub.html.ini
index 981f720e07f..a370d41b797 100644
--- a/tests/wpt/meta-legacy-layout/css/css-fonts/variations/variable-gsub.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-fonts/variations/variable-gsub.html.ini
@@ -1,3 +1,3 @@
 [variable-gsub.html]
   bug: https://github.com/servo/servo/issues/21565
-  expected: TIMEOUT
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-fonts/variations/variable-opsz-size-adjust.html.ini b/tests/wpt/meta-legacy-layout/css/css-fonts/variations/variable-opsz-size-adjust.html.ini
index 19bd2d0fa91..57ec76c27c2 100644
--- a/tests/wpt/meta-legacy-layout/css/css-fonts/variations/variable-opsz-size-adjust.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-fonts/variations/variable-opsz-size-adjust.html.ini
@@ -1,2 +1,2 @@
 [variable-opsz-size-adjust.html]
-  expected: TIMEOUT
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-fonts/variations/variable-opsz.html.ini b/tests/wpt/meta-legacy-layout/css/css-fonts/variations/variable-opsz.html.ini
deleted file mode 100644
index aa9674b79da..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-fonts/variations/variable-opsz.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[variable-opsz.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/css/css-position/sticky/position-sticky-change-top.html.ini b/tests/wpt/meta-legacy-layout/css/css-position/sticky/position-sticky-change-top.html.ini
index 5ec84cec5f9..27054021148 100644
--- a/tests/wpt/meta-legacy-layout/css/css-position/sticky/position-sticky-change-top.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-position/sticky/position-sticky-change-top.html.ini
@@ -1,2 +1,2 @@
 [position-sticky-change-top.html]
-  expected: TIMEOUT
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-position/sticky/position-sticky-fixed-ancestor.html.ini b/tests/wpt/meta-legacy-layout/css/css-position/sticky/position-sticky-fixed-ancestor.html.ini
index ebcdd601ea3..16053bee380 100644
--- a/tests/wpt/meta-legacy-layout/css/css-position/sticky/position-sticky-fixed-ancestor.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-position/sticky/position-sticky-fixed-ancestor.html.ini
@@ -1,2 +1,2 @@
 [position-sticky-fixed-ancestor.html]
-  expected: TIMEOUT
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-position/sticky/position-sticky-flexbox.html.ini b/tests/wpt/meta-legacy-layout/css/css-position/sticky/position-sticky-flexbox.html.ini
new file mode 100644
index 00000000000..888c40c46df
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-position/sticky/position-sticky-flexbox.html.ini
@@ -0,0 +1,2 @@
+[position-sticky-flexbox.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-position/sticky/position-sticky-rendering.html.ini b/tests/wpt/meta-legacy-layout/css/css-position/sticky/position-sticky-rendering.html.ini
new file mode 100644
index 00000000000..2831b2eabe7
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-position/sticky/position-sticky-rendering.html.ini
@@ -0,0 +1,2 @@
+[position-sticky-rendering.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-position/sticky/position-sticky-stacking-context.html.ini b/tests/wpt/meta-legacy-layout/css/css-position/sticky/position-sticky-stacking-context.html.ini
new file mode 100644
index 00000000000..d714d2658ac
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-position/sticky/position-sticky-stacking-context.html.ini
@@ -0,0 +1,2 @@
+[position-sticky-stacking-context.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-pseudo/marker-intrinsic-contribution-001.html.ini b/tests/wpt/meta-legacy-layout/css/css-pseudo/marker-intrinsic-contribution-001.html.ini
index 95bc4541e96..244e68804e9 100644
--- a/tests/wpt/meta-legacy-layout/css/css-pseudo/marker-intrinsic-contribution-001.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-pseudo/marker-intrinsic-contribution-001.html.ini
@@ -1,2 +1,21 @@
 [marker-intrinsic-contribution-001.html]
-  expected: ERROR
+  [Intrinsic contribution of inside decimal marker]
+    expected: FAIL
+
+  [Intrinsic contribution of outside string marker]
+    expected: FAIL
+
+  [Intrinsic contribution of outside symbol marker]
+    expected: FAIL
+
+  [Intrinsic contribution of inside content marker]
+    expected: FAIL
+
+  [Intrinsic contribution of outside content marker]
+    expected: FAIL
+
+  [Intrinsic contribution of outside decimal marker]
+    expected: FAIL
+
+  [Intrinsic contribution of inside string marker]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/hyphens/hyphens-character.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/hyphens/hyphens-character.html.ini
index 7190d51ced5..adc0b8ad131 100644
--- a/tests/wpt/meta-legacy-layout/css/css-text/hyphens/hyphens-character.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-text/hyphens/hyphens-character.html.ini
@@ -1,2 +1,2 @@
 [hyphens-character.html]
-  expected: TIMEOUT
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/text-autospace/text-autospace-ligature-001.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/text-autospace/text-autospace-ligature-001.html.ini
index 67c2adbfe7e..a7599e67a63 100644
--- a/tests/wpt/meta-legacy-layout/css/css-text/text-autospace/text-autospace-ligature-001.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-text/text-autospace/text-autospace-ligature-001.html.ini
@@ -1,2 +1,3 @@
 [text-autospace-ligature-001.html]
-  expected: ERROR
+  [text-autospace not implemented]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-values/calc-size/calc-size-width.tentative.html.ini b/tests/wpt/meta-legacy-layout/css/css-values/calc-size/calc-size-width.tentative.html.ini
index 6564bc8fa9d..5bc29b8c0e7 100644
--- a/tests/wpt/meta-legacy-layout/css/css-values/calc-size/calc-size-width.tentative.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-values/calc-size/calc-size-width.tentative.html.ini
@@ -1,2 +1,57 @@
 [calc-size-width.tentative.html]
-  expected: ERROR
+  [resolved width for width: calc-size(any, 357px)]
+    expected: FAIL
+
+  [resolved width for width: calc-size(any, 31%)]
+    expected: FAIL
+
+  [resolved width for width: calc-size(max-content, 31%)]
+    expected: FAIL
+
+  [resolved width for width: calc-size(fit-content, 72px)]
+    expected: FAIL
+
+  [resolved width for width: calc-size(37px, 93px)]
+    expected: FAIL
+
+  [resolved width for width: calc-size(83px, size * 3)]
+    expected: FAIL
+
+  [resolved width for width: calc-size(min-content, size / 2)]
+    expected: FAIL
+
+  [resolved width for width: calc-size(max-content, size * 1.2)]
+    expected: FAIL
+
+  [resolved width for width: calc-size(fit-content, size / 4 + 30px)]
+    expected: FAIL
+
+  [resolved width for width: calc-size(stretch, size / 2 - 10%)]
+    expected: FAIL
+
+  [resolved width for width: calc-size(30px, 15em)]
+    expected: FAIL
+
+  [resolved width for width: calc-size(calc-size(any, 30px), 15em)]
+    expected: FAIL
+
+  [resolved width for width: calc-size(calc-size(2in, 30px), 15em)]
+    expected: FAIL
+
+  [resolved width for width: calc-size(calc-size(min-content, 30px), 15em)]
+    expected: FAIL
+
+  [resolved width for width: calc-size(calc-size(min-content, size), size)]
+    expected: FAIL
+
+  [resolved width for width: calc-size(auto, size * 0.6 + 23px)]
+    expected: FAIL
+
+  [resolved width for width:  with container width 300px]
+    expected: FAIL
+
+  [resolved width for width:  with container width 500px]
+    expected: FAIL
+
+  [resolved width for width:  with container width 700px]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/cssom-view/getBoundingClientRect-empty-inline.html.ini b/tests/wpt/meta-legacy-layout/css/cssom-view/getBoundingClientRect-empty-inline.html.ini
index 41496263048..11edea8a362 100644
--- a/tests/wpt/meta-legacy-layout/css/cssom-view/getBoundingClientRect-empty-inline.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/cssom-view/getBoundingClientRect-empty-inline.html.ini
@@ -1,5 +1,3 @@
 [getBoundingClientRect-empty-inline.html]
-  expected: ERROR
   [getBoundingClientRect-empty-inline]
     expected: FAIL
-
diff --git a/tests/wpt/meta-legacy-layout/fetch/metadata/generated/css-font-face.sub.tentative.html.ini b/tests/wpt/meta-legacy-layout/fetch/metadata/generated/css-font-face.sub.tentative.html.ini
index b856b4c90f3..795f2544cb6 100644
--- a/tests/wpt/meta-legacy-layout/fetch/metadata/generated/css-font-face.sub.tentative.html.ini
+++ b/tests/wpt/meta-legacy-layout/fetch/metadata/generated/css-font-face.sub.tentative.html.ini
@@ -1,40 +1,22 @@
 [css-font-face.sub.tentative.html]
-  [sec-fetch-site - Not sent to non-trustworthy same-origin destination]
-    expected: FAIL
-
   [sec-fetch-site - Not sent to non-trustworthy same-site destination]
     expected: FAIL
 
   [sec-fetch-site - Not sent to non-trustworthy cross-site destination]
     expected: FAIL
 
-  [sec-fetch-mode - Not sent to non-trustworthy same-origin destination]
-    expected: FAIL
-
   [sec-fetch-mode - Not sent to non-trustworthy same-site destination]
     expected: FAIL
 
   [sec-fetch-mode - Not sent to non-trustworthy cross-site destination]
     expected: FAIL
 
-  [sec-fetch-dest - Not sent to non-trustworthy same-origin destination]
-    expected: FAIL
-
-  [sec-fetch-dest - Not sent to non-trustworthy same-site destination]
-    expected: FAIL
-
   [sec-fetch-dest - Not sent to non-trustworthy cross-site destination]
     expected: FAIL
 
-  [sec-fetch-user - Not sent to non-trustworthy same-origin destination]
-    expected: FAIL
-
   [sec-fetch-user - Not sent to non-trustworthy same-site destination]
     expected: FAIL
 
-  [sec-fetch-user - Not sent to non-trustworthy cross-site destination]
-    expected: FAIL
-
   [sec-fetch-site - HTTPS downgrade (header not sent)]
     expected: FAIL
 
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/text/2d.text.draw.fill.maxWidth.fontface.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/text/2d.text.draw.fill.maxWidth.fontface.html.ini
deleted file mode 100644
index df06827dabe..00000000000
--- a/tests/wpt/meta-legacy-layout/html/canvas/element/text/2d.text.draw.fill.maxWidth.fontface.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[2d.text.draw.fill.maxWidth.fontface.html]
-  [fillText works on @font-face fonts]
-    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/text/2d.text.measure.width.empty.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/text/2d.text.measure.width.empty.html.ini
deleted file mode 100644
index ccc33dcec72..00000000000
--- a/tests/wpt/meta-legacy-layout/html/canvas/element/text/2d.text.measure.width.empty.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[2d.text.measure.width.empty.html]
-  [The empty string has zero width]
-    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/resource-timing/TAO-match.html.ini b/tests/wpt/meta-legacy-layout/resource-timing/TAO-match.html.ini
index f1278ebeb02..1e94685254b 100644
--- a/tests/wpt/meta-legacy-layout/resource-timing/TAO-match.html.ini
+++ b/tests/wpt/meta-legacy-layout/resource-timing/TAO-match.html.ini
@@ -13,37 +13,37 @@
     expected: FAIL
 
   [The timing allow check algorithm will pass when the Timing-Allow-Origin header value list contains a wildcard. (font)]
-    expected: FAIL
+    expected: TIMEOUT
 
   [The timing allow check algorithm will fail when the Timing-Allow-Origin header value list contains a null origin. (font)]
-    expected: FAIL
+    expected: NOTRUN
 
   [The timing allow check algorithm will pass when the Timing-Allow-Origin header value list contains multiple wildcards. (font)]
-    expected: FAIL
+    expected: NOTRUN
 
   [The timing allow check algorithm will fail when the Timing-Allow-Origin header value contains only the uppercased origin. (font)]
-    expected: FAIL
+    expected: NOTRUN
 
   [The timing allow check algorithm will fail when the Timing-Allow-Origin header value contains the origin, a space, then a wildcard. (font)]
-    expected: FAIL
+    expected: NOTRUN
 
   [The timing allow check algorithm will fail when the Timing-Allow-Origin header is not present. (font)]
-    expected: FAIL
+    expected: NOTRUN
 
   [The timing allow check algorithm will pass when the Timing-Allow-Origin header value contains only the origin. (iframe)]
-    expected: FAIL
+    expected: NOTRUN
 
   [The timing allow check algorithm will pass when the Timing-Allow-Origin header value contains only a wildcard. (iframe)]
-    expected: FAIL
+    expected: NOTRUN
 
   [The timing allow check algorithm will pass when the Timing-Allow-Origin header value list contains a case-sensitive match. (iframe)]
-    expected: FAIL
+    expected: NOTRUN
 
   [The timing allow check algorithm will pass when the Timing-Allow-Origin header value list contains the origin and a wildcard. (iframe)]
-    expected: FAIL
+    expected: NOTRUN
 
   [The timing allow check algorithm will pass when the Timing-Allow-Origin header value list contains a wildcard. (iframe)]
-    expected: TIMEOUT
+    expected: NOTRUN
 
   [The timing allow check algorithm will fail when the Timing-Allow-Origin header value list contains a null origin. (iframe)]
     expected: NOTRUN
diff --git a/tests/wpt/meta-legacy-layout/resource-timing/content-type.html.ini b/tests/wpt/meta-legacy-layout/resource-timing/content-type.html.ini
index ec8afaefc79..f2fa92e947c 100644
--- a/tests/wpt/meta-legacy-layout/resource-timing/content-type.html.ini
+++ b/tests/wpt/meta-legacy-layout/resource-timing/content-type.html.ini
@@ -46,37 +46,37 @@
     expected: FAIL
 
   [This test validates the content-type of resources. 15]
-    expected: FAIL
+    expected: TIMEOUT
 
   [This test validates the content-type of resources. 16]
-    expected: FAIL
+    expected: NOTRUN
 
   [This test validates the content-type of resources. 17]
-    expected: FAIL
+    expected: NOTRUN
 
   [This test validates the content-type of resources. 18]
-    expected: FAIL
+    expected: NOTRUN
 
   [This test validates the content-type of resources. 19]
-    expected: FAIL
+    expected: NOTRUN
 
   [This test validates the content-type of resources. 20]
-    expected: FAIL
+    expected: NOTRUN
 
   [This test validates the content-type of resources. 21]
-    expected: FAIL
+    expected: NOTRUN
 
   [This test validates the content-type of resources. 22]
-    expected: FAIL
+    expected: NOTRUN
 
   [This test validates the content-type of resources. 23]
-    expected: FAIL
+    expected: NOTRUN
 
   [This test validates the content-type of resources. 24]
-    expected: FAIL
+    expected: NOTRUN
 
   [This test validates the content-type of resources. 25]
-    expected: TIMEOUT
+    expected: NOTRUN
 
   [This test validates the content-type of resources. 26]
     expected: NOTRUN
diff --git a/tests/wpt/meta-legacy-layout/resource-timing/nextHopProtocol-is-tao-protected.https.html.ini b/tests/wpt/meta-legacy-layout/resource-timing/nextHopProtocol-is-tao-protected.https.html.ini
index 55121e9289c..6cb46ed13d8 100644
--- a/tests/wpt/meta-legacy-layout/resource-timing/nextHopProtocol-is-tao-protected.https.html.ini
+++ b/tests/wpt/meta-legacy-layout/resource-timing/nextHopProtocol-is-tao-protected.https.html.ini
@@ -1,4 +1,5 @@
 [nextHopProtocol-is-tao-protected.https.html]
+  expected: TIMEOUT
   [Add TAO-less iframe from remote origin. Make sure nextHopProtocol is the empty string]
     expected: TIMEOUT
 
@@ -21,19 +22,31 @@
     expected: FAIL
 
   [Fetch TAO-less object from remote origin. Make sure nextHopProtocol is the empty string.]
-    expected: FAIL
+    expected: TIMEOUT
 
   [Fetch TAO'd object from remote origin. Make sure nextHopProtocol is not the empty string.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Fetch TAO'd script from remote origin. Make sure nextHopProtocol is not the empty string.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Fetch TAO'd stylesheet from remote origin. Make sure nextHopProtocol is not the empty string.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Fetch TAO'd synchronous xhr from remote origin. Make sure nextHopProtocol is not the empty string.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Fetch TAO'd asynchronous xhr from remote origin. Make sure nextHopProtocol is not the empty string.]
-    expected: FAIL
+    expected: NOTRUN
+
+  [Fetch TAO-less script from remote origin. Make sure nextHopProtocol is the empty string.]
+    expected: NOTRUN
+
+  [Fetch TAO-less stylesheet from remote origin. Make sure nextHopProtocol is the empty string.]
+    expected: NOTRUN
+
+  [Fetch TAO-less synchronous xhr from remote origin. Make sure nextHopProtocol is the empty string.]
+    expected: NOTRUN
+
+  [Fetch TAO-less asynchronous xhr from remote origin. Make sure nextHopProtocol is the empty string.]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/css/CSS2/linebox/vertical-align-top-bottom-001.html.ini b/tests/wpt/meta/css/CSS2/linebox/vertical-align-top-bottom-001.html.ini
index ad08e344bf4..9b384589b0b 100644
--- a/tests/wpt/meta/css/CSS2/linebox/vertical-align-top-bottom-001.html.ini
+++ b/tests/wpt/meta/css/CSS2/linebox/vertical-align-top-bottom-001.html.ini
@@ -1,2 +1,6 @@
 [vertical-align-top-bottom-001.html]
-  expected: ERROR
+  [text-top+bottom]
+    expected: FAIL
+
+  [text-bottom+bottom]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/CSS2/positioning/inline-static-position-001.html.ini b/tests/wpt/meta/css/CSS2/positioning/inline-static-position-001.html.ini
deleted file mode 100644
index 1e94cec851b..00000000000
--- a/tests/wpt/meta/css/CSS2/positioning/inline-static-position-001.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[inline-static-position-001.html]
-  expected: ERROR
diff --git a/tests/wpt/meta/css/css-flexbox/flex-one-sets-flex-basis-to-zero-px.html.ini b/tests/wpt/meta/css/css-flexbox/flex-one-sets-flex-basis-to-zero-px.html.ini
index 28a24ecf62c..523d5da3d96 100644
--- a/tests/wpt/meta/css/css-flexbox/flex-one-sets-flex-basis-to-zero-px.html.ini
+++ b/tests/wpt/meta/css/css-flexbox/flex-one-sets-flex-basis-to-zero-px.html.ini
@@ -1,2 +1,12 @@
 [flex-one-sets-flex-basis-to-zero-px.html]
-  expected: ERROR
+  [.flexbox 3]
+    expected: FAIL
+
+  [.flexbox 4]
+    expected: FAIL
+
+  [.flexbox 5]
+    expected: FAIL
+
+  [.flexbox 6]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-fonts/generic-family-keywords-001.html.ini b/tests/wpt/meta/css/css-fonts/generic-family-keywords-001.html.ini
index 77d5720a911..7267f59c275 100644
--- a/tests/wpt/meta/css/css-fonts/generic-family-keywords-001.html.ini
+++ b/tests/wpt/meta/css/css-fonts/generic-family-keywords-001.html.ini
@@ -1,2 +1,39 @@
 [generic-family-keywords-001.html]
-  expected: ERROR
+  [@font-face matching for quoted and unquoted serif]
+    expected: [FAIL, PASS]
+
+  [@font-face matching for quoted and unquoted sans-serif]
+    expected: [FAIL, PASS]
+
+  [@font-face matching for quoted and unquoted cursive]
+    expected: [FAIL, PASS]
+
+  [@font-face matching for quoted and unquoted emoji]
+    expected: [FAIL, PASS]
+
+  [@font-face matching for quoted and unquoted fantasy]
+    expected: [FAIL, PASS]
+
+  [@font-face matching for quoted and unquoted monospace]
+    expected: [FAIL, PASS]
+
+  [@font-face matching for quoted and unquoted fangsong]
+    expected: [FAIL, PASS]
+
+  [@font-face matching for quoted and unquoted ui-serif]
+    expected: [FAIL, PASS]
+
+  [@font-face matching for quoted and unquoted ui-sans-serif]
+    expected: [FAIL, PASS]
+
+  [@font-face matching for quoted and unquoted ui-monospace]
+    expected: [FAIL, PASS]
+
+  [@font-face matching for quoted and unquoted ui-rounded]
+    expected: [FAIL, PASS]
+
+  [@font-face matching for quoted and unquoted system-ui]
+    expected: [FAIL, PASS]
+
+  [@font-face matching for quoted and unquoted math]
+    expected: [FAIL, PASS]
diff --git a/tests/wpt/meta/css/css-fonts/generic-family-keywords-002.html.ini b/tests/wpt/meta/css/css-fonts/generic-family-keywords-002.html.ini
deleted file mode 100644
index 74f8887074c..00000000000
--- a/tests/wpt/meta/css/css-fonts/generic-family-keywords-002.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[generic-family-keywords-002.html]
-  expected: ERROR
diff --git a/tests/wpt/meta/css/css-fonts/generic-family-keywords-003.html.ini b/tests/wpt/meta/css/css-fonts/generic-family-keywords-003.html.ini
deleted file mode 100644
index db0e6e5a7e9..00000000000
--- a/tests/wpt/meta/css/css-fonts/generic-family-keywords-003.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[generic-family-keywords-003.html]
-  expected: ERROR
diff --git a/tests/wpt/meta/css/css-fonts/matching/fixed-stretch-style-over-weight.html.ini b/tests/wpt/meta/css/css-fonts/matching/fixed-stretch-style-over-weight.html.ini
index f250fcdd5c5..6bd423672fd 100644
--- a/tests/wpt/meta/css/css-fonts/matching/fixed-stretch-style-over-weight.html.ini
+++ b/tests/wpt/meta/css/css-fonts/matching/fixed-stretch-style-over-weight.html.ini
@@ -1,2 +1,2 @@
 [fixed-stretch-style-over-weight.html]
-  expected: TIMEOUT
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-fonts/matching/range-descriptor-reversed.html.ini b/tests/wpt/meta/css/css-fonts/matching/range-descriptor-reversed.html.ini
index a341dd66fb4..a2d0a59d473 100644
--- a/tests/wpt/meta/css/css-fonts/matching/range-descriptor-reversed.html.ini
+++ b/tests/wpt/meta/css/css-fonts/matching/range-descriptor-reversed.html.ini
@@ -1,2 +1,2 @@
 [range-descriptor-reversed.html]
-  expected: TIMEOUT
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-fonts/matching/stretch-distance-over-weight-distance.html.ini b/tests/wpt/meta/css/css-fonts/matching/stretch-distance-over-weight-distance.html.ini
index ebffcd24301..2c9a19f5e93 100644
--- a/tests/wpt/meta/css/css-fonts/matching/stretch-distance-over-weight-distance.html.ini
+++ b/tests/wpt/meta/css/css-fonts/matching/stretch-distance-over-weight-distance.html.ini
@@ -1,2 +1,2 @@
 [stretch-distance-over-weight-distance.html]
-  expected: TIMEOUT
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-fonts/matching/style-ranges-over-weight-direction.html.ini b/tests/wpt/meta/css/css-fonts/matching/style-ranges-over-weight-direction.html.ini
index 0c0bc477b0b..8ffce29949f 100644
--- a/tests/wpt/meta/css/css-fonts/matching/style-ranges-over-weight-direction.html.ini
+++ b/tests/wpt/meta/css/css-fonts/matching/style-ranges-over-weight-direction.html.ini
@@ -1,2 +1,2 @@
 [style-ranges-over-weight-direction.html]
-  expected: TIMEOUT
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-fonts/math-script-level-and-math-style/math-script-level-002.tentative.html.ini b/tests/wpt/meta/css/css-fonts/math-script-level-and-math-style/math-script-level-002.tentative.html.ini
index d6a8b118138..a1d56c12cf8 100644
--- a/tests/wpt/meta/css/css-fonts/math-script-level-and-math-style/math-script-level-002.tentative.html.ini
+++ b/tests/wpt/meta/css/css-fonts/math-script-level-and-math-style/math-script-level-002.tentative.html.ini
@@ -1,2 +1,18 @@
 [math-script-level-002.tentative.html]
-  expected: ERROR
+  [auto]
+    expected: FAIL
+
+  [auto ; starting from level 7]
+    expected: FAIL
+
+  [add(<integer>)]
+    expected: FAIL
+
+  [add(<integer>) ; starting from level 3]
+    expected: FAIL
+
+  [<integer>]
+    expected: FAIL
+
+  [<integer> ; starting from level 50]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-fonts/math-script-level-and-math-style/math-script-level-004.tentative.html.ini b/tests/wpt/meta/css/css-fonts/math-script-level-and-math-style/math-script-level-004.tentative.html.ini
index fbe829bf226..ab0644910cd 100644
--- a/tests/wpt/meta/css/css-fonts/math-script-level-and-math-style/math-script-level-004.tentative.html.ini
+++ b/tests/wpt/meta/css/css-fonts/math-script-level-and-math-style/math-script-level-004.tentative.html.ini
@@ -1,2 +1,12 @@
 [math-script-level-004.tentative.html]
-  expected: ERROR
+  [scriptPercentScaleDown=80, scriptScriptPercentScaleDown=40]
+    expected: FAIL
+
+  [scriptPercentScaleDown=0, scriptScriptPercentScaleDown=40]
+    expected: FAIL
+
+  [scriptPercentScaleDown=80, scriptScriptPercentScaleDown=0]
+    expected: FAIL
+
+  [No MATH table]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-fonts/test_datafont_same_origin.html.ini b/tests/wpt/meta/css/css-fonts/test_datafont_same_origin.html.ini
index 664d30a9b73..cfb372332cb 100644
--- a/tests/wpt/meta/css/css-fonts/test_datafont_same_origin.html.ini
+++ b/tests/wpt/meta/css/css-fonts/test_datafont_same_origin.html.ini
@@ -1,3 +1,4 @@
 [test_datafont_same_origin.html]
+  expected: TIMEOUT
   [Test if data:font would be treated same origin.]
-    expected: FAIL
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/css/css-fonts/variations/font-descriptor-range-reversed.html.ini b/tests/wpt/meta/css/css-fonts/variations/font-descriptor-range-reversed.html.ini
deleted file mode 100644
index e2dc2575bc6..00000000000
--- a/tests/wpt/meta/css/css-fonts/variations/font-descriptor-range-reversed.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[font-descriptor-range-reversed.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/meta/css/css-fonts/variations/variable-box-font.html.ini b/tests/wpt/meta/css/css-fonts/variations/variable-box-font.html.ini
index 0752f997a84..868335157cc 100644
--- a/tests/wpt/meta/css/css-fonts/variations/variable-box-font.html.ini
+++ b/tests/wpt/meta/css/css-fonts/variations/variable-box-font.html.ini
@@ -1,2 +1,2 @@
 [variable-box-font.html]
-  expected: TIMEOUT
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-fonts/variations/variable-gpos-m2b.html.ini b/tests/wpt/meta/css/css-fonts/variations/variable-gpos-m2b.html.ini
index 25b5f4f981c..554987c2994 100644
--- a/tests/wpt/meta/css/css-fonts/variations/variable-gpos-m2b.html.ini
+++ b/tests/wpt/meta/css/css-fonts/variations/variable-gpos-m2b.html.ini
@@ -1,2 +1,2 @@
 [variable-gpos-m2b.html]
-  expected: TIMEOUT
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-fonts/variations/variable-gsub.html.ini b/tests/wpt/meta/css/css-fonts/variations/variable-gsub.html.ini
index fb47910bae1..0c6b385e8e1 100644
--- a/tests/wpt/meta/css/css-fonts/variations/variable-gsub.html.ini
+++ b/tests/wpt/meta/css/css-fonts/variations/variable-gsub.html.ini
@@ -1,2 +1,2 @@
 [variable-gsub.html]
-  expected: TIMEOUT
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-fonts/variations/variable-opsz-size-adjust.html.ini b/tests/wpt/meta/css/css-fonts/variations/variable-opsz-size-adjust.html.ini
index 19bd2d0fa91..57ec76c27c2 100644
--- a/tests/wpt/meta/css/css-fonts/variations/variable-opsz-size-adjust.html.ini
+++ b/tests/wpt/meta/css/css-fonts/variations/variable-opsz-size-adjust.html.ini
@@ -1,2 +1,2 @@
 [variable-opsz-size-adjust.html]
-  expected: TIMEOUT
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-fonts/variations/variable-opsz.html.ini b/tests/wpt/meta/css/css-fonts/variations/variable-opsz.html.ini
deleted file mode 100644
index aa9674b79da..00000000000
--- a/tests/wpt/meta/css/css-fonts/variations/variable-opsz.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[variable-opsz.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/meta/css/css-position/sticky/position-sticky-change-top.html.ini b/tests/wpt/meta/css/css-position/sticky/position-sticky-change-top.html.ini
index 5ec84cec5f9..27054021148 100644
--- a/tests/wpt/meta/css/css-position/sticky/position-sticky-change-top.html.ini
+++ b/tests/wpt/meta/css/css-position/sticky/position-sticky-change-top.html.ini
@@ -1,2 +1,2 @@
 [position-sticky-change-top.html]
-  expected: TIMEOUT
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-position/sticky/position-sticky-fixed-ancestor.html.ini b/tests/wpt/meta/css/css-position/sticky/position-sticky-fixed-ancestor.html.ini
index ebcdd601ea3..16053bee380 100644
--- a/tests/wpt/meta/css/css-position/sticky/position-sticky-fixed-ancestor.html.ini
+++ b/tests/wpt/meta/css/css-position/sticky/position-sticky-fixed-ancestor.html.ini
@@ -1,2 +1,2 @@
 [position-sticky-fixed-ancestor.html]
-  expected: TIMEOUT
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-position/sticky/position-sticky-flexbox.html.ini b/tests/wpt/meta/css/css-position/sticky/position-sticky-flexbox.html.ini
index fb7a67b7bd3..888c40c46df 100644
--- a/tests/wpt/meta/css/css-position/sticky/position-sticky-flexbox.html.ini
+++ b/tests/wpt/meta/css/css-position/sticky/position-sticky-flexbox.html.ini
@@ -1,2 +1,2 @@
 [position-sticky-flexbox.html]
-  expected: TIMEOUT
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-position/sticky/position-sticky-grid.html.ini b/tests/wpt/meta/css/css-position/sticky/position-sticky-grid.html.ini
index c71dbd20156..9a86e2d8c1f 100644
--- a/tests/wpt/meta/css/css-position/sticky/position-sticky-grid.html.ini
+++ b/tests/wpt/meta/css/css-position/sticky/position-sticky-grid.html.ini
@@ -1,2 +1,2 @@
 [position-sticky-grid.html]
-  expected: TIMEOUT
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-position/sticky/position-sticky-inline.html.ini b/tests/wpt/meta/css/css-position/sticky/position-sticky-inline.html.ini
index 95a16f94beb..675e85540aa 100644
--- a/tests/wpt/meta/css/css-position/sticky/position-sticky-inline.html.ini
+++ b/tests/wpt/meta/css/css-position/sticky/position-sticky-inline.html.ini
@@ -1,2 +1,2 @@
 [position-sticky-inline.html]
-  expected: TIMEOUT
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-position/sticky/position-sticky-rendering.html.ini b/tests/wpt/meta/css/css-position/sticky/position-sticky-rendering.html.ini
index 786d1d5f0b4..2831b2eabe7 100644
--- a/tests/wpt/meta/css/css-position/sticky/position-sticky-rendering.html.ini
+++ b/tests/wpt/meta/css/css-position/sticky/position-sticky-rendering.html.ini
@@ -1,2 +1,2 @@
 [position-sticky-rendering.html]
-  expected: TIMEOUT
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-position/sticky/position-sticky-stacking-context.html.ini b/tests/wpt/meta/css/css-position/sticky/position-sticky-stacking-context.html.ini
index a9ba3c2eb87..d714d2658ac 100644
--- a/tests/wpt/meta/css/css-position/sticky/position-sticky-stacking-context.html.ini
+++ b/tests/wpt/meta/css/css-position/sticky/position-sticky-stacking-context.html.ini
@@ -1,2 +1,2 @@
 [position-sticky-stacking-context.html]
-  expected: TIMEOUT
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-position/sticky/position-sticky-table-td-left.html.ini b/tests/wpt/meta/css/css-position/sticky/position-sticky-table-td-left.html.ini
index 755b7b05727..926183eac0c 100644
--- a/tests/wpt/meta/css/css-position/sticky/position-sticky-table-td-left.html.ini
+++ b/tests/wpt/meta/css/css-position/sticky/position-sticky-table-td-left.html.ini
@@ -1,2 +1,2 @@
 [position-sticky-table-td-left.html]
-  expected: TIMEOUT
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-position/sticky/position-sticky-table-td-right.html.ini b/tests/wpt/meta/css/css-position/sticky/position-sticky-table-td-right.html.ini
index d6b185dc49f..ac68c6f6a63 100644
--- a/tests/wpt/meta/css/css-position/sticky/position-sticky-table-td-right.html.ini
+++ b/tests/wpt/meta/css/css-position/sticky/position-sticky-table-td-right.html.ini
@@ -1,2 +1,2 @@
 [position-sticky-table-td-right.html]
-  expected: TIMEOUT
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-position/sticky/position-sticky-table-tfoot-bottom.html.ini b/tests/wpt/meta/css/css-position/sticky/position-sticky-table-tfoot-bottom.html.ini
index 73d9cd2a394..b7f42945145 100644
--- a/tests/wpt/meta/css/css-position/sticky/position-sticky-table-tfoot-bottom.html.ini
+++ b/tests/wpt/meta/css/css-position/sticky/position-sticky-table-tfoot-bottom.html.ini
@@ -1,2 +1,2 @@
 [position-sticky-table-tfoot-bottom.html]
-  expected: TIMEOUT
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-position/sticky/position-sticky-table-th-left.html.ini b/tests/wpt/meta/css/css-position/sticky/position-sticky-table-th-left.html.ini
deleted file mode 100644
index 481ab1ae55c..00000000000
--- a/tests/wpt/meta/css/css-position/sticky/position-sticky-table-th-left.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[position-sticky-table-th-left.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/meta/css/css-position/sticky/position-sticky-table-th-right.html.ini b/tests/wpt/meta/css/css-position/sticky/position-sticky-table-th-right.html.ini
index 503c80dcbb8..6d90c77e4a2 100644
--- a/tests/wpt/meta/css/css-position/sticky/position-sticky-table-th-right.html.ini
+++ b/tests/wpt/meta/css/css-position/sticky/position-sticky-table-th-right.html.ini
@@ -1,2 +1,2 @@
 [position-sticky-table-th-right.html]
-  expected: TIMEOUT
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-position/sticky/position-sticky-table-thead-top.html.ini b/tests/wpt/meta/css/css-position/sticky/position-sticky-table-thead-top.html.ini
index 8fd85259115..0c80cd986e9 100644
--- a/tests/wpt/meta/css/css-position/sticky/position-sticky-table-thead-top.html.ini
+++ b/tests/wpt/meta/css/css-position/sticky/position-sticky-table-thead-top.html.ini
@@ -1,2 +1,2 @@
 [position-sticky-table-thead-top.html]
-  expected: TIMEOUT
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-position/sticky/position-sticky-table-tr-bottom.html.ini b/tests/wpt/meta/css/css-position/sticky/position-sticky-table-tr-bottom.html.ini
index 4282a438df2..2b7fe555dee 100644
--- a/tests/wpt/meta/css/css-position/sticky/position-sticky-table-tr-bottom.html.ini
+++ b/tests/wpt/meta/css/css-position/sticky/position-sticky-table-tr-bottom.html.ini
@@ -1,2 +1,2 @@
 [position-sticky-table-tr-bottom.html]
-  expected: TIMEOUT
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-position/sticky/position-sticky-table-tr-top.html.ini b/tests/wpt/meta/css/css-position/sticky/position-sticky-table-tr-top.html.ini
index 9034935e01d..74952619651 100644
--- a/tests/wpt/meta/css/css-position/sticky/position-sticky-table-tr-top.html.ini
+++ b/tests/wpt/meta/css/css-position/sticky/position-sticky-table-tr-top.html.ini
@@ -1,2 +1,2 @@
 [position-sticky-table-tr-top.html]
-  expected: TIMEOUT
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-position/sticky/position-sticky-writing-modes.html.ini b/tests/wpt/meta/css/css-position/sticky/position-sticky-writing-modes.html.ini
index 47742c621cf..e49ba16e303 100644
--- a/tests/wpt/meta/css/css-position/sticky/position-sticky-writing-modes.html.ini
+++ b/tests/wpt/meta/css/css-position/sticky/position-sticky-writing-modes.html.ini
@@ -1,2 +1,2 @@
 [position-sticky-writing-modes.html]
-  expected: TIMEOUT
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-pseudo/marker-intrinsic-contribution-001.html.ini b/tests/wpt/meta/css/css-pseudo/marker-intrinsic-contribution-001.html.ini
index 95bc4541e96..55bdc4fd20f 100644
--- a/tests/wpt/meta/css/css-pseudo/marker-intrinsic-contribution-001.html.ini
+++ b/tests/wpt/meta/css/css-pseudo/marker-intrinsic-contribution-001.html.ini
@@ -1,2 +1,12 @@
 [marker-intrinsic-contribution-001.html]
-  expected: ERROR
+  [Intrinsic contribution of inside symbol marker]
+    expected: FAIL
+
+  [Intrinsic contribution of inside decimal marker]
+    expected: FAIL
+
+  [Intrinsic contribution of inside string marker]
+    expected: FAIL
+
+  [Intrinsic contribution of inside content marker]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/hyphens/hyphens-character.html.ini b/tests/wpt/meta/css/css-text/hyphens/hyphens-character.html.ini
index 7190d51ced5..adc0b8ad131 100644
--- a/tests/wpt/meta/css/css-text/hyphens/hyphens-character.html.ini
+++ b/tests/wpt/meta/css/css-text/hyphens/hyphens-character.html.ini
@@ -1,2 +1,2 @@
 [hyphens-character.html]
-  expected: TIMEOUT
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/text-autospace/text-autospace-ligature-001.html.ini b/tests/wpt/meta/css/css-text/text-autospace/text-autospace-ligature-001.html.ini
index 67c2adbfe7e..a7599e67a63 100644
--- a/tests/wpt/meta/css/css-text/text-autospace/text-autospace-ligature-001.html.ini
+++ b/tests/wpt/meta/css/css-text/text-autospace/text-autospace-ligature-001.html.ini
@@ -1,2 +1,3 @@
 [text-autospace-ligature-001.html]
-  expected: ERROR
+  [text-autospace not implemented]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-values/calc-size/calc-size-width.tentative.html.ini b/tests/wpt/meta/css/css-values/calc-size/calc-size-width.tentative.html.ini
index 6564bc8fa9d..5bc29b8c0e7 100644
--- a/tests/wpt/meta/css/css-values/calc-size/calc-size-width.tentative.html.ini
+++ b/tests/wpt/meta/css/css-values/calc-size/calc-size-width.tentative.html.ini
@@ -1,2 +1,57 @@
 [calc-size-width.tentative.html]
-  expected: ERROR
+  [resolved width for width: calc-size(any, 357px)]
+    expected: FAIL
+
+  [resolved width for width: calc-size(any, 31%)]
+    expected: FAIL
+
+  [resolved width for width: calc-size(max-content, 31%)]
+    expected: FAIL
+
+  [resolved width for width: calc-size(fit-content, 72px)]
+    expected: FAIL
+
+  [resolved width for width: calc-size(37px, 93px)]
+    expected: FAIL
+
+  [resolved width for width: calc-size(83px, size * 3)]
+    expected: FAIL
+
+  [resolved width for width: calc-size(min-content, size / 2)]
+    expected: FAIL
+
+  [resolved width for width: calc-size(max-content, size * 1.2)]
+    expected: FAIL
+
+  [resolved width for width: calc-size(fit-content, size / 4 + 30px)]
+    expected: FAIL
+
+  [resolved width for width: calc-size(stretch, size / 2 - 10%)]
+    expected: FAIL
+
+  [resolved width for width: calc-size(30px, 15em)]
+    expected: FAIL
+
+  [resolved width for width: calc-size(calc-size(any, 30px), 15em)]
+    expected: FAIL
+
+  [resolved width for width: calc-size(calc-size(2in, 30px), 15em)]
+    expected: FAIL
+
+  [resolved width for width: calc-size(calc-size(min-content, 30px), 15em)]
+    expected: FAIL
+
+  [resolved width for width: calc-size(calc-size(min-content, size), size)]
+    expected: FAIL
+
+  [resolved width for width: calc-size(auto, size * 0.6 + 23px)]
+    expected: FAIL
+
+  [resolved width for width:  with container width 300px]
+    expected: FAIL
+
+  [resolved width for width:  with container width 500px]
+    expected: FAIL
+
+  [resolved width for width:  with container width 700px]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/cssom-view/getBoundingClientRect-empty-inline.html.ini b/tests/wpt/meta/css/cssom-view/getBoundingClientRect-empty-inline.html.ini
deleted file mode 100644
index 780dc427ac7..00000000000
--- a/tests/wpt/meta/css/cssom-view/getBoundingClientRect-empty-inline.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[getBoundingClientRect-empty-inline.html]
-  expected: ERROR
diff --git a/tests/wpt/meta/fetch/metadata/generated/css-font-face.sub.tentative.html.ini b/tests/wpt/meta/fetch/metadata/generated/css-font-face.sub.tentative.html.ini
index b856b4c90f3..d557a3a8ee6 100644
--- a/tests/wpt/meta/fetch/metadata/generated/css-font-face.sub.tentative.html.ini
+++ b/tests/wpt/meta/fetch/metadata/generated/css-font-face.sub.tentative.html.ini
@@ -1,45 +1,45 @@
 [css-font-face.sub.tentative.html]
   [sec-fetch-site - Not sent to non-trustworthy same-origin destination]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [sec-fetch-site - Not sent to non-trustworthy same-site destination]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [sec-fetch-site - Not sent to non-trustworthy cross-site destination]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [sec-fetch-mode - Not sent to non-trustworthy same-origin destination]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [sec-fetch-mode - Not sent to non-trustworthy same-site destination]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [sec-fetch-mode - Not sent to non-trustworthy cross-site destination]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [sec-fetch-dest - Not sent to non-trustworthy same-origin destination]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [sec-fetch-dest - Not sent to non-trustworthy same-site destination]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [sec-fetch-dest - Not sent to non-trustworthy cross-site destination]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [sec-fetch-user - Not sent to non-trustworthy same-origin destination]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [sec-fetch-user - Not sent to non-trustworthy same-site destination]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [sec-fetch-user - Not sent to non-trustworthy cross-site destination]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [sec-fetch-site - HTTPS downgrade (header not sent)]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [sec-fetch-site - HTTPS upgrade]
-    expected: FAIL
+    expected: [FAIL, PASS]
 
   [sec-fetch-site - HTTPS downgrade-upgrade]
-    expected: FAIL
+    expected: [FAIL, PASS]
diff --git a/tests/wpt/meta/html/canvas/element/text/2d.text.draw.fill.maxWidth.fontface.html.ini b/tests/wpt/meta/html/canvas/element/text/2d.text.draw.fill.maxWidth.fontface.html.ini
deleted file mode 100644
index df06827dabe..00000000000
--- a/tests/wpt/meta/html/canvas/element/text/2d.text.draw.fill.maxWidth.fontface.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[2d.text.draw.fill.maxWidth.fontface.html]
-  [fillText works on @font-face fonts]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/text/2d.text.measure.width.empty.html.ini b/tests/wpt/meta/html/canvas/element/text/2d.text.measure.width.empty.html.ini
deleted file mode 100644
index ccc33dcec72..00000000000
--- a/tests/wpt/meta/html/canvas/element/text/2d.text.measure.width.empty.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[2d.text.measure.width.empty.html]
-  [The empty string has zero width]
-    expected: FAIL
diff --git a/tests/wpt/meta/resize-observer/change-layout-in-error.html.ini b/tests/wpt/meta/resize-observer/change-layout-in-error.html.ini
new file mode 100644
index 00000000000..5d07f60e0b6
--- /dev/null
+++ b/tests/wpt/meta/resize-observer/change-layout-in-error.html.ini
@@ -0,0 +1,3 @@
+[change-layout-in-error.html]
+  [Changing layout in window error handler should not result in lifecyle loop when resize observer loop limit is reached.]
+    expected: FAIL
diff --git a/tests/wpt/meta/resource-timing/TAO-match.html.ini b/tests/wpt/meta/resource-timing/TAO-match.html.ini
index f1278ebeb02..1e94685254b 100644
--- a/tests/wpt/meta/resource-timing/TAO-match.html.ini
+++ b/tests/wpt/meta/resource-timing/TAO-match.html.ini
@@ -13,37 +13,37 @@
     expected: FAIL
 
   [The timing allow check algorithm will pass when the Timing-Allow-Origin header value list contains a wildcard. (font)]
-    expected: FAIL
+    expected: TIMEOUT
 
   [The timing allow check algorithm will fail when the Timing-Allow-Origin header value list contains a null origin. (font)]
-    expected: FAIL
+    expected: NOTRUN
 
   [The timing allow check algorithm will pass when the Timing-Allow-Origin header value list contains multiple wildcards. (font)]
-    expected: FAIL
+    expected: NOTRUN
 
   [The timing allow check algorithm will fail when the Timing-Allow-Origin header value contains only the uppercased origin. (font)]
-    expected: FAIL
+    expected: NOTRUN
 
   [The timing allow check algorithm will fail when the Timing-Allow-Origin header value contains the origin, a space, then a wildcard. (font)]
-    expected: FAIL
+    expected: NOTRUN
 
   [The timing allow check algorithm will fail when the Timing-Allow-Origin header is not present. (font)]
-    expected: FAIL
+    expected: NOTRUN
 
   [The timing allow check algorithm will pass when the Timing-Allow-Origin header value contains only the origin. (iframe)]
-    expected: FAIL
+    expected: NOTRUN
 
   [The timing allow check algorithm will pass when the Timing-Allow-Origin header value contains only a wildcard. (iframe)]
-    expected: FAIL
+    expected: NOTRUN
 
   [The timing allow check algorithm will pass when the Timing-Allow-Origin header value list contains a case-sensitive match. (iframe)]
-    expected: FAIL
+    expected: NOTRUN
 
   [The timing allow check algorithm will pass when the Timing-Allow-Origin header value list contains the origin and a wildcard. (iframe)]
-    expected: FAIL
+    expected: NOTRUN
 
   [The timing allow check algorithm will pass when the Timing-Allow-Origin header value list contains a wildcard. (iframe)]
-    expected: TIMEOUT
+    expected: NOTRUN
 
   [The timing allow check algorithm will fail when the Timing-Allow-Origin header value list contains a null origin. (iframe)]
     expected: NOTRUN
diff --git a/tests/wpt/meta/resource-timing/content-type.html.ini b/tests/wpt/meta/resource-timing/content-type.html.ini
index ec8afaefc79..f2fa92e947c 100644
--- a/tests/wpt/meta/resource-timing/content-type.html.ini
+++ b/tests/wpt/meta/resource-timing/content-type.html.ini
@@ -46,37 +46,37 @@
     expected: FAIL
 
   [This test validates the content-type of resources. 15]
-    expected: FAIL
+    expected: TIMEOUT
 
   [This test validates the content-type of resources. 16]
-    expected: FAIL
+    expected: NOTRUN
 
   [This test validates the content-type of resources. 17]
-    expected: FAIL
+    expected: NOTRUN
 
   [This test validates the content-type of resources. 18]
-    expected: FAIL
+    expected: NOTRUN
 
   [This test validates the content-type of resources. 19]
-    expected: FAIL
+    expected: NOTRUN
 
   [This test validates the content-type of resources. 20]
-    expected: FAIL
+    expected: NOTRUN
 
   [This test validates the content-type of resources. 21]
-    expected: FAIL
+    expected: NOTRUN
 
   [This test validates the content-type of resources. 22]
-    expected: FAIL
+    expected: NOTRUN
 
   [This test validates the content-type of resources. 23]
-    expected: FAIL
+    expected: NOTRUN
 
   [This test validates the content-type of resources. 24]
-    expected: FAIL
+    expected: NOTRUN
 
   [This test validates the content-type of resources. 25]
-    expected: TIMEOUT
+    expected: NOTRUN
 
   [This test validates the content-type of resources. 26]
     expected: NOTRUN
diff --git a/tests/wpt/meta/resource-timing/nextHopProtocol-is-tao-protected.https.html.ini b/tests/wpt/meta/resource-timing/nextHopProtocol-is-tao-protected.https.html.ini
index 55121e9289c..6cb46ed13d8 100644
--- a/tests/wpt/meta/resource-timing/nextHopProtocol-is-tao-protected.https.html.ini
+++ b/tests/wpt/meta/resource-timing/nextHopProtocol-is-tao-protected.https.html.ini
@@ -1,4 +1,5 @@
 [nextHopProtocol-is-tao-protected.https.html]
+  expected: TIMEOUT
   [Add TAO-less iframe from remote origin. Make sure nextHopProtocol is the empty string]
     expected: TIMEOUT
 
@@ -21,19 +22,31 @@
     expected: FAIL
 
   [Fetch TAO-less object from remote origin. Make sure nextHopProtocol is the empty string.]
-    expected: FAIL
+    expected: TIMEOUT
 
   [Fetch TAO'd object from remote origin. Make sure nextHopProtocol is not the empty string.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Fetch TAO'd script from remote origin. Make sure nextHopProtocol is not the empty string.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Fetch TAO'd stylesheet from remote origin. Make sure nextHopProtocol is not the empty string.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Fetch TAO'd synchronous xhr from remote origin. Make sure nextHopProtocol is not the empty string.]
-    expected: FAIL
+    expected: NOTRUN
 
   [Fetch TAO'd asynchronous xhr from remote origin. Make sure nextHopProtocol is not the empty string.]
-    expected: FAIL
+    expected: NOTRUN
+
+  [Fetch TAO-less script from remote origin. Make sure nextHopProtocol is the empty string.]
+    expected: NOTRUN
+
+  [Fetch TAO-less stylesheet from remote origin. Make sure nextHopProtocol is the empty string.]
+    expected: NOTRUN
+
+  [Fetch TAO-less synchronous xhr from remote origin. Make sure nextHopProtocol is the empty string.]
+    expected: NOTRUN
+
+  [Fetch TAO-less asynchronous xhr from remote origin. Make sure nextHopProtocol is the empty string.]
+    expected: NOTRUN
diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json
index 0a021a53dda..eb6c9ab1d96 100644
--- a/tests/wpt/mozilla/meta/MANIFEST.json
+++ b/tests/wpt/mozilla/meta/MANIFEST.json
@@ -13417,14 +13417,14 @@
      ]
     ],
     "interfaces.html": [
-     "063495d90f464f161c52a8d099a298e914b9b082",
+     "6f8b7beaa36046d8ade72a13aee82edd4fabe314",
      [
       null,
       {}
      ]
     ],
     "interfaces.worker.js": [
-     "59d4aa1855fbf281736b28581fbc519a847c8a0d",
+     "2f048af52b8f807c24cf2b9f6d68e42f1eab2abd",
      [
       "mozilla/interfaces.worker.html",
       {}
diff --git a/tests/wpt/mozilla/tests/mozilla/interfaces.html b/tests/wpt/mozilla/tests/mozilla/interfaces.html
index 063495d90f4..6f8b7beaa36 100644
--- a/tests/wpt/mozilla/tests/mozilla/interfaces.html
+++ b/tests/wpt/mozilla/tests/mozilla/interfaces.html
@@ -86,6 +86,7 @@ test_interfaces([
   "FileList",
   "FileReader",
   "FocusEvent",
+  "FontFaceSet",
   "FormData",
   "FormDataEvent",
   "GainNode",
diff --git a/tests/wpt/mozilla/tests/mozilla/interfaces.worker.js b/tests/wpt/mozilla/tests/mozilla/interfaces.worker.js
index 59d4aa1855f..2f048af52b8 100644
--- a/tests/wpt/mozilla/tests/mozilla/interfaces.worker.js
+++ b/tests/wpt/mozilla/tests/mozilla/interfaces.worker.js
@@ -33,6 +33,7 @@ test_interfaces([
   "FileList",
   "FileReader",
   "FileReaderSync",
+  "FontFaceSet",
   "FormData",
   "Headers",
   "History",