diff --git a/components/layout_2020/display_list/stacking_context.rs b/components/layout_2020/display_list/stacking_context.rs
index 371b20e25ac..8dfda0fe65f 100644
--- a/components/layout_2020/display_list/stacking_context.rs
+++ b/components/layout_2020/display_list/stacking_context.rs
@@ -916,7 +916,7 @@ impl AbsoluteOrFixedPositionedFragment {
         stacking_context: &mut StackingContext,
     ) {
         let hoisted_fragment = self.hoisted_fragment.borrow();
-        let fragment_ref = match hoisted_fragment.as_ref() {
+        let fragment_ref = match hoisted_fragment.fragment.as_ref() {
             Some(fragment_ref) => fragment_ref,
             None => unreachable!("Found hoisted box with missing fragment."),
         };
diff --git a/components/layout_2020/flow/mod.rs b/components/layout_2020/flow/mod.rs
index b5898fc6146..1813e58daad 100644
--- a/components/layout_2020/flow/mod.rs
+++ b/components/layout_2020/flow/mod.rs
@@ -201,7 +201,18 @@ fn layout_block_level_children(
                     placement_state.current_margin.solve() + fragment_block_size;
                 placement_state.current_margin = fragment_block_margins.end;
             },
-            Fragment::Anonymous(_) | Fragment::AbsoluteOrFixedPositioned(_) => {},
+            Fragment::AbsoluteOrFixedPositioned(fragment) => {
+                let offset = Vec2 {
+                    block: placement_state.current_margin.solve() +
+                        placement_state.current_block_direction_position,
+                    inline: Length::new(0.),
+                };
+                fragment
+                    .hoisted_fragment
+                    .borrow_mut()
+                    .adjust_offsets(offset);
+            },
+            Fragment::Anonymous(_) => {},
             _ => unreachable!(),
         }
     }
@@ -352,6 +363,9 @@ impl BlockLevelBox {
             BlockLevelBox::OutOfFlowAbsolutelyPositionedBox(box_) => {
                 let hoisted_box = AbsolutelyPositionedBox::to_hoisted(
                     box_.clone(),
+                    // This is incorrect, however we do not know the
+                    // correct positioning until later, in place_block_level_fragment,
+                    // and this value will be adjusted there
                     Vec2::zero(),
                     tree_rank,
                     containing_block,
diff --git a/components/layout_2020/fragments.rs b/components/layout_2020/fragments.rs
index b0111f517bb..f780ff50d58 100644
--- a/components/layout_2020/fragments.rs
+++ b/components/layout_2020/fragments.rs
@@ -8,6 +8,7 @@ use crate::geom::flow_relative::{Rect, Sides};
 use crate::geom::{PhysicalPoint, PhysicalRect};
 #[cfg(debug_assertions)]
 use crate::layout_debug;
+use crate::positioned::HoistedSharedFragment;
 use gfx::font::FontMetrics as GfxFontMetrics;
 use gfx::text::glyph::GlyphStore;
 use gfx_traits::print_tree::PrintTree;
@@ -74,7 +75,7 @@ pub(crate) enum Fragment {
 #[derive(Serialize)]
 pub(crate) struct AbsoluteOrFixedPositionedFragment {
     pub position: ComputedPosition,
-    pub hoisted_fragment: ArcRefCell<Option<ArcRefCell<Fragment>>>,
+    pub hoisted_fragment: ArcRefCell<HoistedSharedFragment>,
 }
 
 #[derive(Serialize)]
diff --git a/components/layout_2020/positioned.rs b/components/layout_2020/positioned.rs
index 853b22347e9..ee4a9a6a4e7 100644
--- a/components/layout_2020/positioned.rs
+++ b/components/layout_2020/positioned.rs
@@ -41,15 +41,41 @@ pub(crate) struct HoistedAbsolutelyPositionedBox {
     /// static positions when going up the tree.
     pub(crate) tree_rank: usize,
 
-    box_offsets: Vec2<AbsoluteBoxOffsets>,
-
     /// A reference to a Fragment which is shared between this `HoistedAbsolutelyPositionedBox`
     /// and its placeholder `AbsoluteOrFixedPositionedFragment` in the original tree position.
     /// This will be used later in order to paint this hoisted box in tree order.
-    pub fragment: ArcRefCell<Option<ArcRefCell<Fragment>>>,
+    pub fragment: ArcRefCell<HoistedSharedFragment>,
 }
 
-#[derive(Clone, Debug)]
+/// A reference to a Fragment which is shared between `HoistedAbsolutelyPositionedBox`
+/// and its placeholder `AbsoluteOrFixedPositionedFragment` in the original tree position.
+/// This will be used later in order to paint this hoisted box in tree order.
+#[derive(Serialize)]
+pub(crate) struct HoistedSharedFragment {
+    pub(crate) fragment: Option<ArcRefCell<Fragment>>,
+    pub(crate) box_offsets: Vec2<AbsoluteBoxOffsets>,
+}
+
+impl HoistedSharedFragment {
+    pub(crate) fn new(box_offsets: Vec2<AbsoluteBoxOffsets>) -> Self {
+        HoistedSharedFragment {
+            fragment: None,
+            box_offsets,
+        }
+    }
+}
+
+impl HoistedSharedFragment {
+    /// In some cases `inset: auto`-positioned elements do not know their precise
+    /// position until after they're hoisted. This lets us adjust auto values
+    /// after the fact.
+    pub(crate) fn adjust_offsets(&mut self, offsets: Vec2<Length>) {
+        self.box_offsets.inline.adjust_offset(offsets.inline);
+        self.box_offsets.block.adjust_offset(offsets.block);
+    }
+}
+
+#[derive(Clone, Debug, Serialize)]
 pub(crate) enum AbsoluteBoxOffsets {
     StaticStart {
         start: Length,
@@ -66,6 +92,15 @@ pub(crate) enum AbsoluteBoxOffsets {
     },
 }
 
+impl AbsoluteBoxOffsets {
+    fn adjust_offset(&mut self, new_offset: Length) {
+        match *self {
+            AbsoluteBoxOffsets::StaticStart { ref mut start } => *start = new_offset,
+            _ => (),
+        }
+    }
+}
+
 impl AbsolutelyPositionedBox {
     pub fn construct<'dom>(
         context: &LayoutContext,
@@ -129,8 +164,7 @@ impl AbsolutelyPositionedBox {
         };
         HoistedAbsolutelyPositionedBox {
             tree_rank,
-            box_offsets,
-            fragment: ArcRefCell::new(None),
+            fragment: ArcRefCell::new(HoistedSharedFragment::new(box_offsets)),
             absolutely_positioned_box: self_,
         }
     }
@@ -357,7 +391,7 @@ impl HoistedAbsolutelyPositionedBox {
                         containing_block,
                     )));
 
-                    *box_.fragment.borrow_mut() = Some(new_fragment.clone());
+                    box_.fragment.borrow_mut().fragment = Some(new_fragment.clone());
                     new_fragment
                 },
                 Vec::new,
@@ -370,7 +404,7 @@ impl HoistedAbsolutelyPositionedBox {
                     for_nearest_containing_block_for_all_descendants,
                     containing_block,
                 )));
-                *box_.fragment.borrow_mut() = Some(new_fragment.clone());
+                box_.fragment.borrow_mut().fragment = Some(new_fragment.clone());
                 new_fragment
             }))
         }
@@ -409,13 +443,15 @@ impl HoistedAbsolutelyPositionedBox {
                 .content_box_size(&containing_block.into(), &pbm),
         };
 
+        let shared_fragment = self.fragment.borrow();
+
         let inline_axis = solve_axis(
             cbis,
             pbm.padding_border_sums.inline,
             pbm.margin.inline_start,
             pbm.margin.inline_end,
             /* avoid_negative_margin_start */ true,
-            &self.box_offsets.inline,
+            &shared_fragment.box_offsets.inline,
             size.inline,
         );
 
@@ -425,7 +461,7 @@ impl HoistedAbsolutelyPositionedBox {
             pbm.margin.block_start,
             pbm.margin.block_end,
             /* avoid_negative_margin_start */ false,
-            &self.box_offsets.block,
+            &shared_fragment.box_offsets.block,
             size.block,
         );
 
@@ -655,11 +691,13 @@ fn adjust_static_positions(
             _ => unreachable!(),
         };
 
-        if let AbsoluteBoxOffsets::StaticStart { start } = &mut abspos_fragment.box_offsets.inline {
+        let mut shared_fragment = abspos_fragment.fragment.borrow_mut();
+
+        if let AbsoluteBoxOffsets::StaticStart { start } = &mut shared_fragment.box_offsets.inline {
             *start += child_fragment_rect.start_corner.inline;
         }
 
-        if let AbsoluteBoxOffsets::StaticStart { start } = &mut abspos_fragment.box_offsets.block {
+        if let AbsoluteBoxOffsets::StaticStart { start } = &mut shared_fragment.box_offsets.block {
             *start += child_fragment_rect.start_corner.block;
         }
     }
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/linebox/inline-negative-margin-001.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/linebox/inline-negative-margin-001.html.ini
index c53734dcdd7..5643f1a8367 100644
--- a/tests/wpt/metadata-layout-2020/css/CSS2/linebox/inline-negative-margin-001.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/linebox/inline-negative-margin-001.html.ini
@@ -14,3 +14,33 @@
   [[data-expected-height\] 4]
     expected: FAIL
 
+  [[data-expected-height\] 1]
+    expected: FAIL
+
+  [[data-expected-height\] 10]
+    expected: FAIL
+
+  [[data-expected-height\] 2]
+    expected: FAIL
+
+  [[data-expected-height\] 5]
+    expected: FAIL
+
+  [[data-expected-height\] 6]
+    expected: FAIL
+
+  [[data-expected-height\] 9]
+    expected: FAIL
+
+  [[data-expected-height\] 8]
+    expected: FAIL
+
+  [[data-expected-height\] 13]
+    expected: FAIL
+
+  [[data-expected-height\] 12]
+    expected: FAIL
+
+  [[data-expected-height\] 11]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/margin-padding-clear/margin-collapse-038.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/margin-padding-clear/margin-collapse-038.xht.ini
deleted file mode 100644
index 4add9bf88f0..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/margin-padding-clear/margin-collapse-038.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[margin-collapse-038.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/margin-padding-clear/margin-collapse-102.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/margin-padding-clear/margin-collapse-102.xht.ini
deleted file mode 100644
index 77e842bd910..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/margin-padding-clear/margin-collapse-102.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[margin-collapse-102.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/block-formatting-context-height-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/block-formatting-context-height-001.xht.ini
deleted file mode 100644
index 6efb0c8c2c6..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/block-formatting-context-height-001.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[block-formatting-context-height-001.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/block-formatting-context-height-002.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/block-formatting-context-height-002.xht.ini
deleted file mode 100644
index 78396ee399c..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/block-formatting-context-height-002.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[block-formatting-context-height-002.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/block-formatting-context-height-003.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/block-formatting-context-height-003.xht.ini
deleted file mode 100644
index 4114b94bb61..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/block-formatting-context-height-003.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[block-formatting-context-height-003.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/block-formatting-contexts-009.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/block-formatting-contexts-009.xht.ini
deleted file mode 100644
index 38562a1602c..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/block-formatting-contexts-009.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[block-formatting-contexts-009.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/block-non-replaced-width-004.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/block-non-replaced-width-004.xht.ini
deleted file mode 100644
index 218aa82f73e..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/block-non-replaced-width-004.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[block-non-replaced-width-004.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/blocks-021.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/blocks-021.xht.ini
deleted file mode 100644
index 8df6897991e..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/blocks-021.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[blocks-021.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/max-width-106.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/max-width-106.xht.ini
deleted file mode 100644
index bb0bd22b304..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/max-width-106.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[max-width-106.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/positioning/abspos-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/positioning/abspos-028.xht.ini
similarity index 50%
rename from tests/wpt/metadata-layout-2020/css/CSS2/positioning/abspos-001.xht.ini
rename to tests/wpt/metadata-layout-2020/css/CSS2/positioning/abspos-028.xht.ini
index 121fd5f30db..904d7e5379c 100644
--- a/tests/wpt/metadata-layout-2020/css/CSS2/positioning/abspos-001.xht.ini
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/positioning/abspos-028.xht.ini
@@ -1,2 +1,2 @@
-[abspos-001.xht]
+[abspos-028.xht]
   expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/positioning/left-applies-to-013.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/positioning/left-applies-to-013.xht.ini
deleted file mode 100644
index 9260c672582..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/positioning/left-applies-to-013.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[left-applies-to-013.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/positioning/left-applies-to-014.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/positioning/left-applies-to-014.xht.ini
deleted file mode 100644
index 43978527a38..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/positioning/left-applies-to-014.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[left-applies-to-014.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/positioning/position-relative-004.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/positioning/position-relative-004.xht.ini
deleted file mode 100644
index 36eb296aa67..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/positioning/position-relative-004.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[position-relative-004.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/positioning/position-relative-005.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/positioning/position-relative-005.xht.ini
deleted file mode 100644
index a90f8db30d9..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/positioning/position-relative-005.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[position-relative-005.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/positioning/position-relative-014.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/positioning/position-relative-014.xht.ini
deleted file mode 100644
index cfb0c9b7531..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/positioning/position-relative-014.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[position-relative-014.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/positioning/position-relative-016.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/positioning/position-relative-016.xht.ini
deleted file mode 100644
index 4b17f872f40..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/positioning/position-relative-016.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[position-relative-016.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/positioning/position-relative-019.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/positioning/position-relative-019.xht.ini
deleted file mode 100644
index ae8d3911782..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/positioning/position-relative-019.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[position-relative-019.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/positioning/right-applies-to-013.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/positioning/right-applies-to-013.xht.ini
deleted file mode 100644
index 058b117bf99..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/positioning/right-applies-to-013.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[right-applies-to-013.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/positioning/right-applies-to-014.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/positioning/right-applies-to-014.xht.ini
deleted file mode 100644
index f2aa33a8499..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/positioning/right-applies-to-014.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[right-applies-to-014.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/tables/height-width-inline-table-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/tables/height-width-inline-table-001.xht.ini
deleted file mode 100644
index 571ef76379b..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/tables/height-width-inline-table-001.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[height-width-inline-table-001.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/tables/height-width-inline-table-001a.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/tables/height-width-inline-table-001a.xht.ini
deleted file mode 100644
index 9f3b1bde264..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/tables/height-width-inline-table-001a.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[height-width-inline-table-001a.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/tables/height-width-inline-table-001b.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/tables/height-width-inline-table-001b.xht.ini
deleted file mode 100644
index 7a2de295034..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/tables/height-width-inline-table-001b.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[height-width-inline-table-001b.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/tables/height-width-inline-table-001c.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/tables/height-width-inline-table-001c.xht.ini
deleted file mode 100644
index 2be1f26fd63..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/tables/height-width-inline-table-001c.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[height-width-inline-table-001c.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/tables/height-width-inline-table-001d.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/tables/height-width-inline-table-001d.xht.ini
deleted file mode 100644
index 2dab81e6017..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/tables/height-width-inline-table-001d.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[height-width-inline-table-001d.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/tables/height-width-inline-table-001e.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/tables/height-width-inline-table-001e.xht.ini
deleted file mode 100644
index 7bf7416a30e..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/tables/height-width-inline-table-001e.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[height-width-inline-table-001e.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/tables/height-width-table-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/tables/height-width-table-001.xht.ini
deleted file mode 100644
index b8444d7a4ab..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/tables/height-width-table-001.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[height-width-table-001.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/tables/height-width-table-001a.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/tables/height-width-table-001a.xht.ini
deleted file mode 100644
index c63f911ca04..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/tables/height-width-table-001a.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[height-width-table-001a.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/tables/height-width-table-001b.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/tables/height-width-table-001b.xht.ini
deleted file mode 100644
index 2ea213a18bf..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/tables/height-width-table-001b.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[height-width-table-001b.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/tables/height-width-table-001c.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/tables/height-width-table-001c.xht.ini
deleted file mode 100644
index c4df897dc76..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/tables/height-width-table-001c.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[height-width-table-001c.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/tables/height-width-table-001d.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/tables/height-width-table-001d.xht.ini
deleted file mode 100644
index 2634e6b790e..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/tables/height-width-table-001d.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[height-width-table-001d.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/tables/height-width-table-001e.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/tables/height-width-table-001e.xht.ini
deleted file mode 100644
index f9847e3a50b..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/tables/height-width-table-001e.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[height-width-table-001e.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/visudet/line-height-202.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/visudet/line-height-202.html.ini
deleted file mode 100644
index ce6dbefadaf..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/visudet/line-height-202.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[line-height-202.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/visudet/line-height-203.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/visudet/line-height-203.html.ini
new file mode 100644
index 00000000000..38d8fc86982
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/visudet/line-height-203.html.ini
@@ -0,0 +1,2 @@
+[line-height-203.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/visudet/line-height-204.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/visudet/line-height-204.html.ini
deleted file mode 100644
index 3d28990c283..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/visudet/line-height-204.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[line-height-204.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/visufx/clip-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/visufx/clip-001.xht.ini
deleted file mode 100644
index a1935bd7061..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/visufx/clip-001.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[clip-001.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/visuren/left-offset-position-fixed-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/visuren/left-offset-position-fixed-001.xht.ini
deleted file mode 100644
index e677cc5d42e..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/visuren/left-offset-position-fixed-001.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[left-offset-position-fixed-001.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-015.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-015.xht.ini
deleted file mode 100644
index 526b65fe1f6..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-015.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[z-index-015.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-016.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-016.xht.ini
deleted file mode 100644
index f0711265db9..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-016.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[z-index-016.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-017.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-017.xht.ini
deleted file mode 100644
index c95651a4c30..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-017.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[z-index-017.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-018.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-018.xht.ini
deleted file mode 100644
index 96ee3b9a4bc..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-018.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[z-index-018.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-019.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-019.xht.ini
deleted file mode 100644
index 74c4c6da678..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-019.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[z-index-019.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-abspos-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-abspos-001.xht.ini
deleted file mode 100644
index b04bdf766b2..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-abspos-001.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[z-index-abspos-001.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-abspos-002.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-abspos-002.xht.ini
deleted file mode 100644
index bb6273f48e0..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-abspos-002.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[z-index-abspos-002.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-abspos-003.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-abspos-003.xht.ini
deleted file mode 100644
index 815ea4bba35..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-abspos-003.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[z-index-abspos-003.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-abspos-004.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-abspos-004.xht.ini
deleted file mode 100644
index d5769066030..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-abspos-004.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[z-index-abspos-004.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-abspos-005.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-abspos-005.xht.ini
deleted file mode 100644
index 7c066ff8ff6..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-abspos-005.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[z-index-abspos-005.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-abspos-007.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-abspos-007.xht.ini
deleted file mode 100644
index 855e9980a3d..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/zindex/z-index-abspos-007.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[z-index-abspos-007.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-backgrounds/background-origin-002.html.ini b/tests/wpt/metadata-layout-2020/css/css-backgrounds/background-origin-002.html.ini
deleted file mode 100644
index 13f8ed2158c..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-backgrounds/background-origin-002.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-origin-002.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-backgrounds/background-origin-003.html.ini b/tests/wpt/metadata-layout-2020/css/css-backgrounds/background-origin-003.html.ini
deleted file mode 100644
index 13fe1d299fa..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-backgrounds/background-origin-003.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-origin-003.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-backgrounds/background-origin-004.html.ini b/tests/wpt/metadata-layout-2020/css/css-backgrounds/background-origin-004.html.ini
deleted file mode 100644
index 301455811fe..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-backgrounds/background-origin-004.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-origin-004.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-backgrounds/background-origin-005.html.ini b/tests/wpt/metadata-layout-2020/css/css-backgrounds/background-origin-005.html.ini
deleted file mode 100644
index 7b74057ed97..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-backgrounds/background-origin-005.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-origin-005.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-backgrounds/background-origin-007.html.ini b/tests/wpt/metadata-layout-2020/css/css-backgrounds/background-origin-007.html.ini
deleted file mode 100644
index a88cbc1be0f..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-backgrounds/background-origin-007.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-origin-007.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-backgrounds/background-origin-008.html.ini b/tests/wpt/metadata-layout-2020/css/css-backgrounds/background-origin-008.html.ini
deleted file mode 100644
index d06a2618efa..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-backgrounds/background-origin-008.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-origin-008.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/align-items-006.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/align-items-006.html.ini
deleted file mode 100644
index a0d9066d4ae..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/align-items-006.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[align-items-006.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/align-items-007.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/align-items-007.html.ini
deleted file mode 100644
index a388ddefc5e..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/align-items-007.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[align-items-007.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/auto-margins-002.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/auto-margins-002.html.ini
deleted file mode 100644
index a4ec3062b8d..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/auto-margins-002.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[auto-margins-002.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-aspect-ratio-img-column-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-aspect-ratio-img-column-001.html.ini
deleted file mode 100644
index 9a99c2d9f53..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-aspect-ratio-img-column-001.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flex-aspect-ratio-img-column-001.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-aspect-ratio-img-column-002.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-aspect-ratio-img-column-002.html.ini
deleted file mode 100644
index 05c4e939a7e..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-aspect-ratio-img-column-002.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flex-aspect-ratio-img-column-002.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-aspect-ratio-img-column-003.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-aspect-ratio-img-column-003.html.ini
deleted file mode 100644
index 80178352808..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-aspect-ratio-img-column-003.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flex-aspect-ratio-img-column-003.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-aspect-ratio-img-row-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-aspect-ratio-img-row-001.html.ini
deleted file mode 100644
index 7f333e7a815..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-aspect-ratio-img-row-001.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flex-aspect-ratio-img-row-001.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-aspect-ratio-img-row-002.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-aspect-ratio-img-row-002.html.ini
deleted file mode 100644
index 7921013f970..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-aspect-ratio-img-row-002.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flex-aspect-ratio-img-row-002.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-aspect-ratio-img-row-003.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-aspect-ratio-img-row-003.html.ini
deleted file mode 100644
index a332d9850a1..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-aspect-ratio-img-row-003.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flex-aspect-ratio-img-row-003.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-height-flex-items-002.xht.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-height-flex-items-002.xht.ini
deleted file mode 100644
index ce42094fb6e..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-height-flex-items-002.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flex-minimum-height-flex-items-002.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-height-flex-items-004.xht.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-height-flex-items-004.xht.ini
deleted file mode 100644
index ac4180f61a7..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-height-flex-items-004.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flex-minimum-height-flex-items-004.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-height-flex-items-005.xht.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-height-flex-items-005.xht.ini
deleted file mode 100644
index 52f582f657f..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-height-flex-items-005.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flex-minimum-height-flex-items-005.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-height-flex-items-006.xht.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-height-flex-items-006.xht.ini
deleted file mode 100644
index c177bfb4870..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-height-flex-items-006.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flex-minimum-height-flex-items-006.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-height-flex-items-007.xht.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-height-flex-items-007.xht.ini
deleted file mode 100644
index ca977d8203d..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-height-flex-items-007.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flex-minimum-height-flex-items-007.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-height-flex-items-008.xht.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-height-flex-items-008.xht.ini
deleted file mode 100644
index 06b866be1a0..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-height-flex-items-008.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flex-minimum-height-flex-items-008.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-height-flex-items-019.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-height-flex-items-019.html.ini
deleted file mode 100644
index 959661fa8c0..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-height-flex-items-019.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flex-minimum-height-flex-items-019.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-width-flex-items-004.xht.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-width-flex-items-004.xht.ini
deleted file mode 100644
index b10e3a296f7..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-width-flex-items-004.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flex-minimum-width-flex-items-004.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-width-flex-items-005.xht.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-width-flex-items-005.xht.ini
deleted file mode 100644
index bc50397b145..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-width-flex-items-005.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flex-minimum-width-flex-items-005.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-width-flex-items-006.xht.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-width-flex-items-006.xht.ini
deleted file mode 100644
index 263a73fd429..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-width-flex-items-006.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flex-minimum-width-flex-items-006.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-width-flex-items-007.xht.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-width-flex-items-007.xht.ini
deleted file mode 100644
index 2c1490e4703..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-width-flex-items-007.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flex-minimum-width-flex-items-007.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-width-flex-items-008.xht.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-width-flex-items-008.xht.ini
deleted file mode 100644
index 7bee9e4181d..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-width-flex-items-008.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flex-minimum-width-flex-items-008.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-width-flex-items-009.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-width-flex-items-009.html.ini
deleted file mode 100644
index 85788b17c68..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-width-flex-items-009.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flex-minimum-width-flex-items-009.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-width-flex-items-010.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-width-flex-items-010.html.ini
deleted file mode 100644
index f00699c82c1..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-width-flex-items-010.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flex-minimum-width-flex-items-010.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-width-flex-items-013.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-width-flex-items-013.html.ini
deleted file mode 100644
index d28e9d2c2ed..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-width-flex-items-013.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flex-minimum-width-flex-items-013.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-wrap-003.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-wrap-003.html.ini
deleted file mode 100644
index 0a8dc305bc3..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-wrap-003.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flex-wrap-003.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-wrap-004.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-wrap-004.html.ini
deleted file mode 100644
index d8f5dd6ee01..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-wrap-004.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flex-wrap-004.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-wrap-005.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-wrap-005.html.ini
deleted file mode 100644
index 4461341331c..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-wrap-005.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flex-wrap-005.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/gap-012.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/gap-012.html.ini
deleted file mode 100644
index 9f3e416efc5..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/gap-012.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[gap-012.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/image-items-flake-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/image-items-flake-001.html.ini
deleted file mode 100644
index d39a1e859e4..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/image-items-flake-001.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[image-items-flake-001.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/stretch-obeys-min-max-002.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/stretch-obeys-min-max-002.html.ini
deleted file mode 100644
index c0d3037ab0e..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/stretch-obeys-min-max-002.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[stretch-obeys-min-max-002.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-transforms/perspective-origin-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-transforms/perspective-origin-001.html.ini
deleted file mode 100644
index faaf4a3e532..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-transforms/perspective-origin-001.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[perspective-origin-001.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-transforms/perspective-origin-002.html.ini b/tests/wpt/metadata-layout-2020/css/css-transforms/perspective-origin-002.html.ini
deleted file mode 100644
index bac531e16a2..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-transforms/perspective-origin-002.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[perspective-origin-002.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-transforms/perspective-origin-003.html.ini b/tests/wpt/metadata-layout-2020/css/css-transforms/perspective-origin-003.html.ini
deleted file mode 100644
index 004414289f0..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-transforms/perspective-origin-003.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[perspective-origin-003.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-transforms/perspective-origin-004.html.ini b/tests/wpt/metadata-layout-2020/css/css-transforms/perspective-origin-004.html.ini
deleted file mode 100644
index 194a4c976e9..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-transforms/perspective-origin-004.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[perspective-origin-004.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-transforms/perspective-origin-005.html.ini b/tests/wpt/metadata-layout-2020/css/css-transforms/perspective-origin-005.html.ini
deleted file mode 100644
index 5e3b99244cf..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-transforms/perspective-origin-005.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[perspective-origin-005.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-transforms/perspective-origin-006.html.ini b/tests/wpt/metadata-layout-2020/css/css-transforms/perspective-origin-006.html.ini
deleted file mode 100644
index e91238a54db..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-transforms/perspective-origin-006.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[perspective-origin-006.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-transforms/scalex.html.ini b/tests/wpt/metadata-layout-2020/css/css-transforms/scalex.html.ini
deleted file mode 100644
index 231f8811cc1..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-transforms/scalex.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[scalex.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-ui/box-sizing-026.html.ini b/tests/wpt/metadata-layout-2020/css/css-ui/box-sizing-026.html.ini
deleted file mode 100644
index 6fee176772e..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-ui/box-sizing-026.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[box-sizing-026.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/MediaQueryList-addListener-handleEvent.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/MediaQueryList-addListener-handleEvent.html.ini
index a6c39d50087..b2f3f00d5b4 100644
--- a/tests/wpt/metadata-layout-2020/css/cssom-view/MediaQueryList-addListener-handleEvent.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/cssom-view/MediaQueryList-addListener-handleEvent.html.ini
@@ -8,3 +8,12 @@
   [throws if handleEvent is thruthy and not callable]
     expected: FAIL
 
+  [looks up handleEvent method on every event dispatch]
+    expected: FAIL
+
+  [calls handleEvent method of event listener]
+    expected: FAIL
+
+  [doesn't look up handleEvent method on callable event listeners]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/MediaQueryList-addListener-removeListener.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/MediaQueryList-addListener-removeListener.html.ini
index 628b1fab770..e481f8ab1e7 100644
--- a/tests/wpt/metadata-layout-2020/css/cssom-view/MediaQueryList-addListener-removeListener.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/cssom-view/MediaQueryList-addListener-removeListener.html.ini
@@ -2,3 +2,18 @@
   [listeners are called when <iframe> is resized]
     expected: FAIL
 
+  [removing listener from one MQL doesn't remove it from all MQLs]
+    expected: FAIL
+
+  [listeners are called in order they were added]
+    expected: FAIL
+
+  [listeners are called in order their MQLs were created]
+    expected: FAIL
+
+  [listener that was added twice is called only once]
+    expected: FAIL
+
+  [listeners are called correct number of times]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/MediaQueryList-extends-EventTarget.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/MediaQueryList-extends-EventTarget.html.ini
index 39832bea64f..4454ae02378 100644
--- a/tests/wpt/metadata-layout-2020/css/cssom-view/MediaQueryList-extends-EventTarget.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/cssom-view/MediaQueryList-extends-EventTarget.html.ini
@@ -1,8 +1,13 @@
 [MediaQueryList-extends-EventTarget.html]
-  expected: TIMEOUT
   [addEventListener "once" option is respected]
-    expected: TIMEOUT
+    expected: FAIL
 
-  [removeEventListener removes listener]
-    expected: NOTRUN
+  [onchange removes listener]
+    expected: FAIL
+
+  [onchange adds listener]
+    expected: FAIL
+
+  [listeners for "change" type are called]
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPosition.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPosition.html.ini
index c131078eace..a19f427ef6e 100644
--- a/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPosition.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPosition.html.ini
@@ -14,6 +14,6 @@
   [test some point of the element: bottom right corner]
     expected: FAIL
 
-  [test the top of layer]
+  [test some point of the element: top left corner]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/negativeMargins.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/negativeMargins.html.ini
index 37835a4fced..1e422c4a06b 100644
--- a/tests/wpt/metadata-layout-2020/css/cssom-view/negativeMargins.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/cssom-view/negativeMargins.html.ini
@@ -2,3 +2,6 @@
   [cssom-view - elementFromPoint and elementsFromPoint dealing with negative margins 1]
     expected: FAIL
 
+  [cssom-view - elementFromPoint and elementsFromPoint dealing with negative margins]
+    expected: FAIL
+
diff --git a/tests/wpt/mozilla/meta-layout-2020/css/position_abs_cb_with_non_cb_kid_a.html.ini b/tests/wpt/mozilla/meta-layout-2020/css/position_abs_cb_with_non_cb_kid_a.html.ini
deleted file mode 100644
index 12beca30dc5..00000000000
--- a/tests/wpt/mozilla/meta-layout-2020/css/position_abs_cb_with_non_cb_kid_a.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[position_abs_cb_with_non_cb_kid_a.html]
-  expected: FAIL
diff --git a/tests/wpt/mozilla/meta-layout-2020/css/position_abs_static_y_a.html.ini b/tests/wpt/mozilla/meta-layout-2020/css/position_abs_static_y_a.html.ini
deleted file mode 100644
index 0f2f448aee7..00000000000
--- a/tests/wpt/mozilla/meta-layout-2020/css/position_abs_static_y_a.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[position_abs_static_y_a.html]
-  expected: FAIL
diff --git a/tests/wpt/mozilla/meta-layout-2020/css/position_fixed_static_y_a.html.ini b/tests/wpt/mozilla/meta-layout-2020/css/position_fixed_static_y_a.html.ini
deleted file mode 100644
index 94b0245c106..00000000000
--- a/tests/wpt/mozilla/meta-layout-2020/css/position_fixed_static_y_a.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[position_fixed_static_y_a.html]
-  expected: FAIL
diff --git a/tests/wpt/mozilla/meta-layout-2020/mozilla/fetch_cannot_overwhelm_system.window.js.ini b/tests/wpt/mozilla/meta-layout-2020/mozilla/fetch_cannot_overwhelm_system.window.js.ini
deleted file mode 100644
index 8a90539b5cf..00000000000
--- a/tests/wpt/mozilla/meta-layout-2020/mozilla/fetch_cannot_overwhelm_system.window.js.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[fetch_cannot_overwhelm_system.window.html]
-  expected: CRASH