diff --git a/components/layout_2020/flow/mod.rs b/components/layout_2020/flow/mod.rs
index 0ff9da63274..e3a45b579b6 100644
--- a/components/layout_2020/flow/mod.rs
+++ b/components/layout_2020/flow/mod.rs
@@ -42,7 +42,8 @@ use crate::positioned::{AbsolutelyPositionedBox, PositioningContext, Positioning
 use crate::replaced::ReplacedContents;
 use crate::sizing::{self, ComputeInlineContentSizes, ContentSizes, InlineContentSizesResult};
 use crate::style_ext::{
-    Clamp, ComputedValuesExt, ContentBoxSizesAndPBMDeprecated, PaddingBorderMargin,
+    Clamp, ComputedValuesExt, ContentBoxSizesAndPBM, ContentBoxSizesAndPBMDeprecated,
+    PaddingBorderMargin,
 };
 use crate::{
     ConstraintSpace, ContainingBlock, ContainingBlockSize, IndefiniteContainingBlock,
@@ -715,8 +716,7 @@ impl BlockLevelBox {
                             layout_context,
                             positioning_context,
                             containing_block,
-                            base.base_fragment_info,
-                            &base.style,
+                            base,
                             contents,
                             sequential_layout_state,
                             collapsible_with_parent_start_margin,
@@ -785,13 +785,17 @@ fn layout_in_flow_non_replaced_block_level_same_formatting_context(
     layout_context: &LayoutContext,
     positioning_context: &mut PositioningContext,
     containing_block: &ContainingBlock,
-    mut base_fragment_info: BaseFragmentInfo,
-    style: &Arc<ComputedValues>,
+    base: &LayoutBoxBase,
     contents: &BlockContainer,
     mut sequential_layout_state: Option<&mut SequentialLayoutState>,
     collapsible_with_parent_start_margin: Option<CollapsibleWithParentStartMargin>,
 ) -> BoxFragment {
+    let style = &base.style;
     let containing_block_writing_mode = containing_block.style.writing_mode;
+    let get_inline_content_sizes = |constraint_space: &ConstraintSpace| {
+        base.inline_content_sizes(layout_context, constraint_space, contents)
+            .sizes
+    };
     let ContainingBlockPaddingAndBorder {
         containing_block: containing_block_for_children,
         pbm,
@@ -799,7 +803,12 @@ fn layout_in_flow_non_replaced_block_level_same_formatting_context(
         min_box_size,
         max_box_size,
         depends_on_block_constraints,
-    } = solve_containing_block_padding_and_border_for_in_flow_box(containing_block, style);
+        available_block_size,
+    } = solve_containing_block_padding_and_border_for_in_flow_box(
+        containing_block,
+        style,
+        get_inline_content_sizes,
+    );
     let ResolvedMargins {
         margin,
         effective_margin_inline_start,
@@ -933,10 +942,20 @@ fn layout_in_flow_non_replaced_block_level_same_formatting_context(
         content_block_size += collapsible_margins_in_children.end.solve();
     }
 
-    let block_size = box_size
+    let available_block_size = available_block_size.unwrap_or(content_block_size);
+    let block_content_sizes = LazyCell::new(|| content_block_size.into());
+    let preferred_block_size =
+        box_size
+            .block
+            .resolve(Size::FitContent, available_block_size, &block_content_sizes);
+    let min_block_size = min_box_size
         .block
-        .auto_is(|| content_block_size)
-        .clamp_between_extremums(min_box_size.block, max_box_size.block);
+        .resolve_non_initial(available_block_size, &block_content_sizes)
+        .unwrap_or_default();
+    let max_block_size = max_box_size
+        .block
+        .resolve_non_initial(available_block_size, &block_content_sizes);
+    let block_size = preferred_block_size.clamp_between_extremums(min_block_size, max_block_size);
 
     if let Some(ref mut sequential_layout_state) = sequential_layout_state {
         // Now that we're done laying out our children, we can restore the
@@ -978,6 +997,7 @@ fn layout_in_flow_non_replaced_block_level_same_formatting_context(
         },
     };
 
+    let mut base_fragment_info = base.base_fragment_info;
     if depends_on_block_constraints {
         base_fragment_info
             .flags
@@ -1022,6 +1042,10 @@ impl IndependentNonReplacedContents {
             );
         }
 
+        let get_inline_content_sizes = |constraint_space: &ConstraintSpace| {
+            base.inline_content_sizes(layout_context, constraint_space, self)
+                .sizes
+        };
         let ContainingBlockPaddingAndBorder {
             containing_block: containing_block_for_children,
             pbm,
@@ -1029,9 +1053,11 @@ impl IndependentNonReplacedContents {
             min_box_size,
             max_box_size,
             depends_on_block_constraints,
+            available_block_size,
         } = solve_containing_block_padding_and_border_for_in_flow_box(
             containing_block,
             &base.style,
+            get_inline_content_sizes,
         );
 
         let layout = self.layout(
@@ -1043,13 +1069,26 @@ impl IndependentNonReplacedContents {
 
         let (block_size, inline_size) = match layout.content_inline_size_for_table {
             Some(inline_size) => (layout.content_block_size, inline_size),
-            None => (
-                box_size
+            None => {
+                let available_block_size =
+                    available_block_size.unwrap_or(layout.content_block_size);
+                let block_content_sizes = LazyCell::new(|| layout.content_block_size.into());
+                let preferred_block_size = box_size.block.resolve(
+                    Size::FitContent,
+                    available_block_size,
+                    &block_content_sizes,
+                );
+                let min_block_size = min_box_size
                     .block
-                    .auto_is(|| layout.content_block_size)
-                    .clamp_between_extremums(min_box_size.block, max_box_size.block),
-                containing_block_for_children.size.inline,
-            ),
+                    .resolve_non_initial(available_block_size, &block_content_sizes)
+                    .unwrap_or_default();
+                let max_block_size = max_box_size
+                    .block
+                    .resolve_non_initial(available_block_size, &block_content_sizes);
+                let block_size =
+                    preferred_block_size.clamp_between_extremums(min_block_size, max_block_size);
+                (block_size, containing_block_for_children.size.inline)
+            },
         };
 
         let ResolvedMargins {
@@ -1488,10 +1527,11 @@ impl ReplacedContents {
 struct ContainingBlockPaddingAndBorder<'a> {
     containing_block: ContainingBlock<'a>,
     pbm: PaddingBorderMargin,
-    box_size: LogicalVec2<AuOrAuto>,
-    min_box_size: LogicalVec2<Au>,
-    max_box_size: LogicalVec2<Option<Au>>,
+    box_size: LogicalVec2<Size<Au>>,
+    min_box_size: LogicalVec2<Size<Au>>,
+    max_box_size: LogicalVec2<Size<Au>>,
     depends_on_block_constraints: bool,
+    available_block_size: Option<Au>,
 }
 
 struct ResolvedMargins {
@@ -1515,6 +1555,7 @@ struct ResolvedMargins {
 fn solve_containing_block_padding_and_border_for_in_flow_box<'a>(
     containing_block: &ContainingBlock<'_>,
     style: &'a Arc<ComputedValues>,
+    get_inline_content_sizes: impl FnOnce(&ConstraintSpace) -> ContentSizes,
 ) -> ContainingBlockPaddingAndBorder<'a> {
     if matches!(style.pseudo(), Some(PseudoElement::ServoAnonymousBox)) {
         // <https://drafts.csswg.org/css2/#anonymous-block-level>
@@ -1532,53 +1573,78 @@ fn solve_containing_block_padding_and_border_for_in_flow_box<'a>(
         return ContainingBlockPaddingAndBorder {
             containing_block: containing_block_for_children,
             pbm: PaddingBorderMargin::zero(),
-            box_size: LogicalVec2 {
-                inline: AuOrAuto::Auto,
-                block: AuOrAuto::Auto,
-            },
+            box_size: LogicalVec2::default(),
             min_box_size: LogicalVec2::default(),
             max_box_size: LogicalVec2::default(),
             depends_on_block_constraints: false,
+            // The available block size may actually be definite, but it should be irrelevant
+            // since the sizing properties are set to their initial value.
+            available_block_size: None,
         };
     }
 
-    let ContentBoxSizesAndPBMDeprecated {
+    let ContentBoxSizesAndPBM {
         content_box_size,
         content_min_box_size,
         content_max_box_size,
         pbm,
         depends_on_block_constraints,
-    } = style
-        .content_box_sizes_and_padding_border_margin(&containing_block.into())
-        .into();
-    let content_min_box_size = content_min_box_size.auto_is(Au::zero);
+    } = style.content_box_sizes_and_padding_border_margin(&containing_block.into());
 
-    // https://drafts.csswg.org/css2/#the-width-property
-    // https://drafts.csswg.org/css2/visudet.html#min-max-widths
-    let inline_size = content_box_size
-        .inline
-        .auto_is(|| {
-            let margin_inline_start = pbm.margin.inline_start.auto_is(Au::zero);
-            let margin_inline_end = pbm.margin.inline_end.auto_is(Au::zero);
-            containing_block.size.inline -
-                pbm.padding_border_sums.inline -
-                margin_inline_start -
-                margin_inline_end
-        })
-        .clamp_between_extremums(content_min_box_size.inline, content_max_box_size.inline);
+    let margin = pbm.margin.auto_is(Au::zero);
+    let pbm_sums = pbm.padding + pbm.border + margin;
+    let writing_mode = style.writing_mode;
+    let available_inline_size =
+        Au::zero().max(containing_block.size.inline - pbm_sums.inline_sum());
+    let available_block_size = containing_block
+        .size
+        .block
+        .non_auto()
+        .map(|block_size| Au::zero().max(block_size - pbm_sums.block_sum()));
 
     // https://drafts.csswg.org/css2/#the-height-property
     // https://drafts.csswg.org/css2/visudet.html#min-max-heights
-    let mut block_size = content_box_size.block;
-    if let AuOrAuto::LengthPercentage(ref mut block_size) = block_size {
-        *block_size = block_size
-            .clamp_between_extremums(content_min_box_size.block, content_max_box_size.block);
-    }
+    let preferred_block_size = content_box_size
+        .block
+        .maybe_resolve_extrinsic(available_block_size);
+    let min_block_size = content_min_box_size
+        .block
+        .maybe_resolve_extrinsic(available_block_size)
+        .unwrap_or_default();
+    let max_block_size = content_max_box_size
+        .block
+        .maybe_resolve_extrinsic(available_block_size);
+    let tentative_block_size =
+        SizeConstraint::new(preferred_block_size, min_block_size, max_block_size);
+
+    // https://drafts.csswg.org/css2/#the-width-property
+    // https://drafts.csswg.org/css2/visudet.html#min-max-widths
+    let inline_content_sizes = LazyCell::new(|| {
+        get_inline_content_sizes(&ConstraintSpace::new(
+            tentative_block_size,
+            writing_mode,
+            None, /* TODO: support preferred aspect ratios on non-replaced boxes */
+        ))
+    });
+    let preferred_inline_size = content_box_size.inline.resolve(
+        Size::Stretch,
+        available_inline_size,
+        &inline_content_sizes,
+    );
+    let min_inline_size = content_min_box_size
+        .inline
+        .resolve_non_initial(available_inline_size, &inline_content_sizes)
+        .unwrap_or_default();
+    let max_inline_size = content_max_box_size
+        .inline
+        .resolve_non_initial(available_inline_size, &inline_content_sizes);
+    let inline_size =
+        preferred_inline_size.clamp_between_extremums(min_inline_size, max_inline_size);
 
     let containing_block_for_children = ContainingBlock {
         size: ContainingBlockSize {
             inline: inline_size,
-            block: block_size,
+            block: tentative_block_size.to_auto_or(),
         },
         style,
     };
@@ -1598,6 +1664,7 @@ fn solve_containing_block_padding_and_border_for_in_flow_box<'a>(
         min_box_size: content_min_box_size,
         max_box_size: content_max_box_size,
         depends_on_block_constraints,
+        available_block_size,
     }
 }
 
diff --git a/tests/wpt/meta/css/css-backgrounds/background-gradient-interpolation-002.html.ini b/tests/wpt/meta/css/css-backgrounds/background-gradient-interpolation-002.html.ini
new file mode 100644
index 00000000000..5297c3c305c
--- /dev/null
+++ b/tests/wpt/meta/css/css-backgrounds/background-gradient-interpolation-002.html.ini
@@ -0,0 +1,2 @@
+[background-gradient-interpolation-002.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-cascade/layer-counter-style-override.html.ini b/tests/wpt/meta/css/css-cascade/layer-counter-style-override.html.ini
new file mode 100644
index 00000000000..5016c536d7d
--- /dev/null
+++ b/tests/wpt/meta/css/css-cascade/layer-counter-style-override.html.ini
@@ -0,0 +1,12 @@
+[layer-counter-style-override.html]
+  [@counter-style unlayered overrides layered]
+    expected: FAIL
+
+  [@counter-style override between layers]
+    expected: FAIL
+
+  [@counter-style override update with appended sheet 1]
+    expected: FAIL
+
+  [@counter-style override update with appended sheet 2]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-flexbox/flex-minimum-width-flex-items-014.html.ini b/tests/wpt/meta/css/css-flexbox/flex-minimum-width-flex-items-014.html.ini
deleted file mode 100644
index 27fef113c75..00000000000
--- a/tests/wpt/meta/css/css-flexbox/flex-minimum-width-flex-items-014.html.ini
+++ /dev/null
@@ -1,16 +0,0 @@
-[flex-minimum-width-flex-items-014.html]
-  [body > div 3]
-    expected: FAIL
-
-  [body > div 2]
-    expected: FAIL
-
-  [body > div 6]
-    expected: FAIL
-
-  [body > div 5]
-    expected: FAIL
-
-  [body > div 4]
-    expected: FAIL
-
diff --git a/tests/wpt/meta/css/css-flexbox/gap-016.html.ini b/tests/wpt/meta/css/css-flexbox/gap-016.html.ini
deleted file mode 100644
index d1071378ed9..00000000000
--- a/tests/wpt/meta/css/css-flexbox/gap-016.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[gap-016.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-flexbox/gap-019.html.ini b/tests/wpt/meta/css/css-flexbox/gap-019.html.ini
deleted file mode 100644
index b52b65966de..00000000000
--- a/tests/wpt/meta/css/css-flexbox/gap-019.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[gap-019.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-flexbox/gap-020.html.ini b/tests/wpt/meta/css/css-flexbox/gap-020.html.ini
deleted file mode 100644
index 6467c8613ed..00000000000
--- a/tests/wpt/meta/css/css-flexbox/gap-020.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[gap-020.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-flexbox/gap-021.html.ini b/tests/wpt/meta/css/css-flexbox/gap-021.html.ini
deleted file mode 100644
index f5cd3e963da..00000000000
--- a/tests/wpt/meta/css/css-flexbox/gap-021.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[gap-021.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-flexbox/intrinsic-size/col-wrap-004.html.ini b/tests/wpt/meta/css/css-flexbox/intrinsic-size/col-wrap-004.html.ini
deleted file mode 100644
index 0ccdd5159ed..00000000000
--- a/tests/wpt/meta/css/css-flexbox/intrinsic-size/col-wrap-004.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[col-wrap-004.html]
-  [body > div 1]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-flexbox/intrinsic-size/col-wrap-010.html.ini b/tests/wpt/meta/css/css-flexbox/intrinsic-size/col-wrap-010.html.ini
deleted file mode 100644
index e6fc6496735..00000000000
--- a/tests/wpt/meta/css/css-flexbox/intrinsic-size/col-wrap-010.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[col-wrap-010.html]
-  [body > div 1]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-flexbox/intrinsic-size/col-wrap-011.html.ini b/tests/wpt/meta/css/css-flexbox/intrinsic-size/col-wrap-011.html.ini
deleted file mode 100644
index d71d6086609..00000000000
--- a/tests/wpt/meta/css/css-flexbox/intrinsic-size/col-wrap-011.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[col-wrap-011.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-flexbox/intrinsic-size/col-wrap-012.html.ini b/tests/wpt/meta/css/css-flexbox/intrinsic-size/col-wrap-012.html.ini
deleted file mode 100644
index aa0fdd7388a..00000000000
--- a/tests/wpt/meta/css/css-flexbox/intrinsic-size/col-wrap-012.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[col-wrap-012.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-flexbox/intrinsic-size/col-wrap-015.html.ini b/tests/wpt/meta/css/css-flexbox/intrinsic-size/col-wrap-015.html.ini
deleted file mode 100644
index e067da9444c..00000000000
--- a/tests/wpt/meta/css/css-flexbox/intrinsic-size/col-wrap-015.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[col-wrap-015.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-flexbox/intrinsic-size/col-wrap-016.html.ini b/tests/wpt/meta/css/css-flexbox/intrinsic-size/col-wrap-016.html.ini
deleted file mode 100644
index a04a9c4a9fb..00000000000
--- a/tests/wpt/meta/css/css-flexbox/intrinsic-size/col-wrap-016.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[col-wrap-016.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-flexbox/intrinsic-size/col-wrap-017.html.ini b/tests/wpt/meta/css/css-flexbox/intrinsic-size/col-wrap-017.html.ini
deleted file mode 100644
index b123028ee5a..00000000000
--- a/tests/wpt/meta/css/css-flexbox/intrinsic-size/col-wrap-017.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[col-wrap-017.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-flexbox/intrinsic-size/row-006.html.ini b/tests/wpt/meta/css/css-flexbox/intrinsic-size/row-006.html.ini
deleted file mode 100644
index 551376c13b7..00000000000
--- a/tests/wpt/meta/css/css-flexbox/intrinsic-size/row-006.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[row-006.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-flexbox/intrinsic-size/row-007.html.ini b/tests/wpt/meta/css/css-flexbox/intrinsic-size/row-007.html.ini
deleted file mode 100644
index a406d5aec9a..00000000000
--- a/tests/wpt/meta/css/css-flexbox/intrinsic-size/row-007.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[row-007.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-flexbox/intrinsic-size/row-008.html.ini b/tests/wpt/meta/css/css-flexbox/intrinsic-size/row-008.html.ini
deleted file mode 100644
index d52317fd30a..00000000000
--- a/tests/wpt/meta/css/css-flexbox/intrinsic-size/row-008.html.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-[row-008.html]
-  [.min-width-flexbox 1]
-    expected: FAIL
-
-  [.min-width-flexbox 2]
-    expected: FAIL
-
-  [.min-width-flexbox 3]
-    expected: FAIL
-
-  [.min-width-flexbox 4]
-    expected: FAIL
-
-  [.min-width-flexbox 5]
-    expected: FAIL
-
-  [.min-width-flexbox 6]
-    expected: FAIL
-
-  [.min-width-flexbox 7]
-    expected: FAIL
-
-  [.min-width-flexbox 8]
-    expected: FAIL
-
-  [.min-width-flexbox 9]
-    expected: FAIL
-
-  [.min-width-flexbox 10]
-    expected: FAIL
-
-  [.min-width-flexbox 11]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-flexbox/table-as-flex-item-max-content.html.ini b/tests/wpt/meta/css/css-flexbox/table-as-flex-item-max-content.html.ini
deleted file mode 100644
index 0757e0f9b55..00000000000
--- a/tests/wpt/meta/css/css-flexbox/table-as-flex-item-max-content.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[table-as-flex-item-max-content.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-grid/abspos/empty-grid-001.html.ini b/tests/wpt/meta/css/css-grid/abspos/empty-grid-001.html.ini
index 5a3e5cc833c..db2bf031a31 100644
--- a/tests/wpt/meta/css/css-grid/abspos/empty-grid-001.html.ini
+++ b/tests/wpt/meta/css/css-grid/abspos/empty-grid-001.html.ini
@@ -1,27 +1,3 @@
 [empty-grid-001.html]
-  [.grid 1]
-    expected: FAIL
-
   [.grid 2]
     expected: FAIL
-
-  [.grid 3]
-    expected: FAIL
-
-  [.grid 4]
-    expected: FAIL
-
-  [.grid 5]
-    expected: FAIL
-
-  [.grid 6]
-    expected: FAIL
-
-  [.grid 7]
-    expected: FAIL
-
-  [.grid 8]
-    expected: FAIL
-
-  [.grid 9]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-grid/alignment/grid-align-justify-margin-border-padding.html.ini b/tests/wpt/meta/css/css-grid/alignment/grid-align-justify-margin-border-padding.html.ini
index 0b9abf1052e..1314f9be848 100644
--- a/tests/wpt/meta/css/css-grid/alignment/grid-align-justify-margin-border-padding.html.ini
+++ b/tests/wpt/meta/css/css-grid/alignment/grid-align-justify-margin-border-padding.html.ini
@@ -1,16 +1,4 @@
 [grid-align-justify-margin-border-padding.html]
-  [.grid 1]
-    expected: FAIL
-
-  [.grid 2]
-    expected: FAIL
-
-  [.grid 3]
-    expected: FAIL
-
-  [.grid 4]
-    expected: FAIL
-
   [.grid 5]
     expected: FAIL
 
@@ -20,9 +8,6 @@
   [.grid 7]
     expected: FAIL
 
-  [.grid 8]
-    expected: FAIL
-
   [.grid 9]
     expected: FAIL
 
diff --git a/tests/wpt/meta/css/css-grid/alignment/grid-align-justify-overflow.html.ini b/tests/wpt/meta/css/css-grid/alignment/grid-align-justify-overflow.html.ini
index 8b2d9a5b8f1..68452d1284b 100644
--- a/tests/wpt/meta/css/css-grid/alignment/grid-align-justify-overflow.html.ini
+++ b/tests/wpt/meta/css/css-grid/alignment/grid-align-justify-overflow.html.ini
@@ -1,22 +1,10 @@
 [grid-align-justify-overflow.html]
-  [.grid 1]
-    expected: FAIL
-
-  [.grid 2]
-    expected: FAIL
-
   [.grid 3]
     expected: FAIL
 
   [.grid 4]
     expected: FAIL
 
-  [.grid 5]
-    expected: FAIL
-
-  [.grid 6]
-    expected: FAIL
-
   [.grid 7]
     expected: FAIL
 
diff --git a/tests/wpt/meta/css/css-grid/alignment/grid-align-justify-stretch.html.ini b/tests/wpt/meta/css/css-grid/alignment/grid-align-justify-stretch.html.ini
index 04176dfc8a5..e816faefdc0 100644
--- a/tests/wpt/meta/css/css-grid/alignment/grid-align-justify-stretch.html.ini
+++ b/tests/wpt/meta/css/css-grid/alignment/grid-align-justify-stretch.html.ini
@@ -1,40 +1,7 @@
 [grid-align-justify-stretch.html]
-  [.grid 1]
-    expected: FAIL
-
-  [.grid 2]
-    expected: FAIL
-
-  [.grid 3]
-    expected: FAIL
-
-  [.grid 4]
-    expected: FAIL
-
-  [.grid 5]
-    expected: FAIL
-
-  [.grid 6]
-    expected: FAIL
-
-  [.grid 7]
-    expected: FAIL
-
-  [.grid 8]
-    expected: FAIL
-
-  [.grid 9]
-    expected: FAIL
-
-  [.grid 10]
-    expected: FAIL
-
   [.grid 11]
     expected: FAIL
 
-  [.grid 12]
-    expected: FAIL
-
   [.grid 13]
     expected: FAIL
 
diff --git a/tests/wpt/meta/css/css-grid/alignment/grid-align.html.ini b/tests/wpt/meta/css/css-grid/alignment/grid-align.html.ini
index 9fbbf317852..362cdf621ee 100644
--- a/tests/wpt/meta/css/css-grid/alignment/grid-align.html.ini
+++ b/tests/wpt/meta/css/css-grid/alignment/grid-align.html.ini
@@ -1,25 +1,16 @@
 [grid-align.html]
-  [.grid 1]
-    expected: FAIL
-
   [.grid 2]
     expected: FAIL
 
   [.grid 3]
     expected: FAIL
 
-  [.grid 4]
-    expected: FAIL
-
   [.grid 5]
     expected: FAIL
 
   [.grid 6]
     expected: FAIL
 
-  [.grid 7]
-    expected: FAIL
-
   [.grid 8]
     expected: FAIL
 
diff --git a/tests/wpt/meta/css/css-grid/alignment/grid-container-auto-margins-scrollbars-001.html.ini b/tests/wpt/meta/css/css-grid/alignment/grid-container-auto-margins-scrollbars-001.html.ini
deleted file mode 100644
index 2c93394b754..00000000000
--- a/tests/wpt/meta/css/css-grid/alignment/grid-container-auto-margins-scrollbars-001.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[grid-container-auto-margins-scrollbars-001.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-grid/alignment/grid-gutters-and-alignment.html.ini b/tests/wpt/meta/css/css-grid/alignment/grid-gutters-and-alignment.html.ini
index bf0ac9f1aa3..96c772addd3 100644
--- a/tests/wpt/meta/css/css-grid/alignment/grid-gutters-and-alignment.html.ini
+++ b/tests/wpt/meta/css/css-grid/alignment/grid-gutters-and-alignment.html.ini
@@ -32,9 +32,6 @@
   [.grid 15]
     expected: FAIL
 
-  [.grid 16]
-    expected: FAIL
-
   [.grid 17]
     expected: FAIL
 
diff --git a/tests/wpt/meta/css/css-grid/child-border-box-and-max-content-001.html.ini b/tests/wpt/meta/css/css-grid/child-border-box-and-max-content-001.html.ini
deleted file mode 100644
index e0f197868b8..00000000000
--- a/tests/wpt/meta/css/css-grid/child-border-box-and-max-content-001.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[child-border-box-and-max-content-001.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-grid/child-border-box-and-max-content-002.html.ini b/tests/wpt/meta/css/css-grid/child-border-box-and-max-content-002.html.ini
deleted file mode 100644
index 796f0aaa788..00000000000
--- a/tests/wpt/meta/css/css-grid/child-border-box-and-max-content-002.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[child-border-box-and-max-content-002.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-grid/grid-definition/grid-auto-repeat-max-size-001.tentative.html.ini b/tests/wpt/meta/css/css-grid/grid-definition/grid-auto-repeat-max-size-001.tentative.html.ini
index 459d4a82cb4..7e76576739f 100644
--- a/tests/wpt/meta/css/css-grid/grid-definition/grid-auto-repeat-max-size-001.tentative.html.ini
+++ b/tests/wpt/meta/css/css-grid/grid-definition/grid-auto-repeat-max-size-001.tentative.html.ini
@@ -1,28 +1,16 @@
 [grid-auto-repeat-max-size-001.tentative.html]
-  [.grid 10]
-    expected: FAIL
-
   [.grid 11]
     expected: FAIL
 
-  [.grid 13]
-    expected: FAIL
-
   [.grid 14]
     expected: FAIL
 
-  [.grid 15]
-    expected: FAIL
-
   [.grid 16: Percentage padding, min-content]
     expected: FAIL
 
   [.grid 17]
     expected: FAIL
 
-  [.grid 18]
-    expected: FAIL
-
   [.grid 19: Percentage padding, max-content]
     expected: FAIL
 
diff --git a/tests/wpt/meta/css/css-grid/grid-definition/grid-auto-repeat-max-size-002.html.ini b/tests/wpt/meta/css/css-grid/grid-definition/grid-auto-repeat-max-size-002.html.ini
new file mode 100644
index 00000000000..f9fea7ce07b
--- /dev/null
+++ b/tests/wpt/meta/css/css-grid/grid-definition/grid-auto-repeat-max-size-002.html.ini
@@ -0,0 +1,6 @@
+[grid-auto-repeat-max-size-002.html]
+  [.grid 3]
+    expected: FAIL
+
+  [.grid 4]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-grid/grid-items/grid-automatic-minimum-intrinsic-aspect-ratio-001.html.ini b/tests/wpt/meta/css/css-grid/grid-items/grid-automatic-minimum-intrinsic-aspect-ratio-001.html.ini
index ad4ec3c061b..37c44e215d5 100644
--- a/tests/wpt/meta/css/css-grid/grid-items/grid-automatic-minimum-intrinsic-aspect-ratio-001.html.ini
+++ b/tests/wpt/meta/css/css-grid/grid-items/grid-automatic-minimum-intrinsic-aspect-ratio-001.html.ini
@@ -1,16 +1,10 @@
 [grid-automatic-minimum-intrinsic-aspect-ratio-001.html]
-  [.container 1]
-    expected: FAIL
-
   [.container 2]
     expected: FAIL
 
   [.container 3]
     expected: FAIL
 
-  [.container 4]
-    expected: FAIL
-
   [.container 5]
     expected: FAIL
 
@@ -20,23 +14,8 @@
   [.container 7]
     expected: FAIL
 
-  [.container 8]
-    expected: FAIL
-
   [.container 9]
     expected: FAIL
 
-  [.container 10]
-    expected: FAIL
-
-  [.container 11]
-    expected: FAIL
-
-  [.container 12]
-    expected: FAIL
-
   [.container 13]
     expected: FAIL
-
-  [.container 14]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-grid/grid-model/compute-intrinsic-widths-scrollbar-001.html.ini b/tests/wpt/meta/css/css-grid/grid-model/compute-intrinsic-widths-scrollbar-001.html.ini
deleted file mode 100644
index 87eb0d44f90..00000000000
--- a/tests/wpt/meta/css/css-grid/grid-model/compute-intrinsic-widths-scrollbar-001.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[compute-intrinsic-widths-scrollbar-001.html]
-  [.grid 1]
-    expected: FAIL
-
-  [.grid 2]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-grid/grid-model/grid-container-margin-border-padding-scrollbar-001.html.ini b/tests/wpt/meta/css/css-grid/grid-model/grid-container-margin-border-padding-scrollbar-001.html.ini
deleted file mode 100644
index 7e1d0e0bfae..00000000000
--- a/tests/wpt/meta/css/css-grid/grid-model/grid-container-margin-border-padding-scrollbar-001.html.ini
+++ /dev/null
@@ -1,48 +0,0 @@
-[grid-container-margin-border-padding-scrollbar-001.html]
-  [.grid 1]
-    expected: FAIL
-
-  [.grid 2]
-    expected: FAIL
-
-  [.grid 3]
-    expected: FAIL
-
-  [.grid 4]
-    expected: FAIL
-
-  [.grid 5]
-    expected: FAIL
-
-  [.grid 6]
-    expected: FAIL
-
-  [.grid 7]
-    expected: FAIL
-
-  [.grid 8]
-    expected: FAIL
-
-  [.grid 9]
-    expected: FAIL
-
-  [.grid 10]
-    expected: FAIL
-
-  [.grid 11]
-    expected: FAIL
-
-  [.grid 12]
-    expected: FAIL
-
-  [.grid 13]
-    expected: FAIL
-
-  [.grid 14]
-    expected: FAIL
-
-  [.grid 15]
-    expected: FAIL
-
-  [.grid 16]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-grid/grid-model/grid-container-sizing-constraints-001.html.ini b/tests/wpt/meta/css/css-grid/grid-model/grid-container-sizing-constraints-001.html.ini
deleted file mode 100644
index bb16df50c51..00000000000
--- a/tests/wpt/meta/css/css-grid/grid-model/grid-container-sizing-constraints-001.html.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[grid-container-sizing-constraints-001.html]
-  [.grid 4]
-    expected: FAIL
-
-  [.grid 9]
-    expected: FAIL
-
-  [.grid 14]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-grid/grid-model/grid-floats-no-intrude-002.html.ini b/tests/wpt/meta/css/css-grid/grid-model/grid-floats-no-intrude-002.html.ini
deleted file mode 100644
index d5f69932c21..00000000000
--- a/tests/wpt/meta/css/css-grid/grid-model/grid-floats-no-intrude-002.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[grid-floats-no-intrude-002.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-grid/grid-model/grid-gutters-and-tracks-001.html.ini b/tests/wpt/meta/css/css-grid/grid-model/grid-gutters-and-tracks-001.html.ini
index 1b7a404a875..e2c0b2d0245 100644
--- a/tests/wpt/meta/css/css-grid/grid-model/grid-gutters-and-tracks-001.html.ini
+++ b/tests/wpt/meta/css/css-grid/grid-model/grid-gutters-and-tracks-001.html.ini
@@ -1,25 +1,10 @@
 [grid-gutters-and-tracks-001.html]
-  [.grid 1]
-    expected: FAIL
-
-  [.grid 3]
-    expected: FAIL
-
-  [.grid 4]
-    expected: FAIL
-
-  [.grid 5]
-    expected: FAIL
-
   [.grid 7]
     expected: FAIL
 
   [.grid 8]
     expected: FAIL
 
-  [.grid 9]
-    expected: FAIL
-
   [.grid 12]
     expected: FAIL
 
diff --git a/tests/wpt/meta/css/css-grid/grid-model/grid-gutters-as-percentage-001.html.ini b/tests/wpt/meta/css/css-grid/grid-model/grid-gutters-as-percentage-001.html.ini
index c711b679f01..8375a5d9912 100644
--- a/tests/wpt/meta/css/css-grid/grid-model/grid-gutters-as-percentage-001.html.ini
+++ b/tests/wpt/meta/css/css-grid/grid-model/grid-gutters-as-percentage-001.html.ini
@@ -2,18 +2,9 @@
   [.grid 1]
     expected: FAIL
 
-  [.grid 2]
-    expected: FAIL
-
   [.grid 3]
     expected: FAIL
 
-  [.grid 4]
-    expected: FAIL
-
-  [.grid 6]
-    expected: FAIL
-
   [.grid 9]
     expected: FAIL
 
diff --git a/tests/wpt/meta/css/css-grid/layout-algorithm/flex-and-intrinsic-sizes-001.html.ini b/tests/wpt/meta/css/css-grid/layout-algorithm/flex-and-intrinsic-sizes-001.html.ini
deleted file mode 100644
index 3abdb6bbe04..00000000000
--- a/tests/wpt/meta/css/css-grid/layout-algorithm/flex-and-intrinsic-sizes-001.html.ini
+++ /dev/null
@@ -1,15 +0,0 @@
-[flex-and-intrinsic-sizes-001.html]
-  [.grid 2]
-    expected: FAIL
-
-  [.grid 3]
-    expected: FAIL
-
-  [.grid 4]
-    expected: FAIL
-
-  [.grid 5]
-    expected: FAIL
-
-  [.grid 6]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-grid/layout-algorithm/grid-container-percentage-002.html.ini b/tests/wpt/meta/css/css-grid/layout-algorithm/grid-container-percentage-002.html.ini
index 9a95d64a792..de5762b8cb2 100644
--- a/tests/wpt/meta/css/css-grid/layout-algorithm/grid-container-percentage-002.html.ini
+++ b/tests/wpt/meta/css/css-grid/layout-algorithm/grid-container-percentage-002.html.ini
@@ -1,57 +1,9 @@
 [grid-container-percentage-002.html]
-  [.grid 1]
-    expected: FAIL
-
-  [.grid 4]
-    expected: FAIL
-
-  [.grid 5]
-    expected: FAIL
-
-  [.grid 6]
-    expected: FAIL
-
-  [.grid 7]
-    expected: FAIL
-
   [.grid 9]
     expected: FAIL
 
-  [.grid 10]
-    expected: FAIL
-
-  [.grid 11]
-    expected: FAIL
-
-  [.grid 12]
-    expected: FAIL
-
-  [.grid 13]
-    expected: FAIL
-
   [.grid 15]
     expected: FAIL
 
-  [.grid 16]
-    expected: FAIL
-
-  [.grid 17]
-    expected: FAIL
-
-  [.grid 18]
-    expected: FAIL
-
-  [.grid 19]
-    expected: FAIL
-
   [.grid 21]
     expected: FAIL
-
-  [.grid 22]
-    expected: FAIL
-
-  [.grid 23]
-    expected: FAIL
-
-  [.grid 24]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-grid/layout-algorithm/grid-item-margin-auto-columns-rows-001.html.ini b/tests/wpt/meta/css/css-grid/layout-algorithm/grid-item-margin-auto-columns-rows-001.html.ini
deleted file mode 100644
index c1da7487f09..00000000000
--- a/tests/wpt/meta/css/css-grid/layout-algorithm/grid-item-margin-auto-columns-rows-001.html.ini
+++ /dev/null
@@ -1,12 +0,0 @@
-[grid-item-margin-auto-columns-rows-001.html]
-  [.grid 1]
-    expected: FAIL
-
-  [.grid 2]
-    expected: FAIL
-
-  [.grid 3]
-    expected: FAIL
-
-  [.grid 4]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-grid/subgrid/dynamic-min-content-001.html.ini b/tests/wpt/meta/css/css-grid/subgrid/dynamic-min-content-001.html.ini
deleted file mode 100644
index dae9fbcca9e..00000000000
--- a/tests/wpt/meta/css/css-grid/subgrid/dynamic-min-content-001.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[dynamic-min-content-001.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-grid/subgrid/dynamic-min-content-002.html.ini b/tests/wpt/meta/css/css-grid/subgrid/dynamic-min-content-002.html.ini
deleted file mode 100644
index 8bf29439918..00000000000
--- a/tests/wpt/meta/css/css-grid/subgrid/dynamic-min-content-002.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[dynamic-min-content-002.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-grid/subgrid/dynamic-min-content-003.html.ini b/tests/wpt/meta/css/css-grid/subgrid/dynamic-min-content-003.html.ini
deleted file mode 100644
index bdf1d7b53d5..00000000000
--- a/tests/wpt/meta/css/css-grid/subgrid/dynamic-min-content-003.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[dynamic-min-content-003.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-grid/subgrid/standalone-axis-size-006.html.ini b/tests/wpt/meta/css/css-grid/subgrid/standalone-axis-size-006.html.ini
deleted file mode 100644
index 17642ff9d50..00000000000
--- a/tests/wpt/meta/css/css-grid/subgrid/standalone-axis-size-006.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[standalone-axis-size-006.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-logical/parsing/inline-size-computed.html.ini b/tests/wpt/meta/css/css-logical/parsing/inline-size-computed.html.ini
deleted file mode 100644
index 9ed035beba9..00000000000
--- a/tests/wpt/meta/css/css-logical/parsing/inline-size-computed.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[inline-size-computed.html]
-  [Property inline-size value 'min-content']
-    expected: FAIL
-
-  [Property inline-size value 'max-content']
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/animation/width-interpolation.html.ini b/tests/wpt/meta/css/css-sizing/animation/width-interpolation.html.ini
index f79e548f7f3..b6cbefa5118 100644
--- a/tests/wpt/meta/css/css-sizing/animation/width-interpolation.html.ini
+++ b/tests/wpt/meta/css/css-sizing/animation/width-interpolation.html.ini
@@ -514,3 +514,21 @@
 
   [Web Animations: property <width> from neutral to [min-content\] at (1.5) should be [min-content\]]
     expected: FAIL
+
+  [CSS Transitions with transition-behavior:allow-discrete: property <width> from [auto\] to [fit-content\] at (-0.3) should be [auto\]]
+    expected: FAIL
+
+  [CSS Transitions with transition-behavior:allow-discrete: property <width> from [auto\] to [fit-content\] at (0) should be [auto\]]
+    expected: FAIL
+
+  [CSS Transitions with transition-behavior:allow-discrete: property <width> from [auto\] to [fit-content\] at (0.3) should be [auto\]]
+    expected: FAIL
+
+  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <width> from [auto\] to [fit-content\] at (-0.3) should be [auto\]]
+    expected: FAIL
+
+  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <width> from [auto\] to [fit-content\] at (0) should be [auto\]]
+    expected: FAIL
+
+  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <width> from [auto\] to [fit-content\] at (0.3) should be [auto\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/aspect-ratio/block-aspect-ratio-056.html.ini b/tests/wpt/meta/css/css-sizing/aspect-ratio/block-aspect-ratio-056.html.ini
deleted file mode 100644
index 62995938b8b..00000000000
--- a/tests/wpt/meta/css/css-sizing/aspect-ratio/block-aspect-ratio-056.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[block-aspect-ratio-056.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/aspect-ratio/block-aspect-ratio-057.tentative.html.ini b/tests/wpt/meta/css/css-sizing/aspect-ratio/block-aspect-ratio-057.tentative.html.ini
deleted file mode 100644
index 86a6a3f8b68..00000000000
--- a/tests/wpt/meta/css/css-sizing/aspect-ratio/block-aspect-ratio-057.tentative.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[block-aspect-ratio-057.tentative.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/aspect-ratio/grid-aspect-ratio-027.html.ini b/tests/wpt/meta/css/css-sizing/aspect-ratio/grid-aspect-ratio-027.html.ini
deleted file mode 100644
index c3ebe96ea39..00000000000
--- a/tests/wpt/meta/css/css-sizing/aspect-ratio/grid-aspect-ratio-027.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[grid-aspect-ratio-027.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/aspect-ratio/intrinsic-size-007.html.ini b/tests/wpt/meta/css/css-sizing/aspect-ratio/intrinsic-size-007.html.ini
deleted file mode 100644
index 4105b5754f0..00000000000
--- a/tests/wpt/meta/css/css-sizing/aspect-ratio/intrinsic-size-007.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[intrinsic-size-007.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/aspect-ratio/intrinsic-size-020.html.ini b/tests/wpt/meta/css/css-sizing/aspect-ratio/intrinsic-size-020.html.ini
deleted file mode 100644
index cd504c9f35d..00000000000
--- a/tests/wpt/meta/css/css-sizing/aspect-ratio/intrinsic-size-020.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[intrinsic-size-020.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/aspect-ratio/intrinsic-size-021.html.ini b/tests/wpt/meta/css/css-sizing/aspect-ratio/intrinsic-size-021.html.ini
deleted file mode 100644
index 2a2c3167b35..00000000000
--- a/tests/wpt/meta/css/css-sizing/aspect-ratio/intrinsic-size-021.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[intrinsic-size-021.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/aspect-ratio/intrinsic-size-022.html.ini b/tests/wpt/meta/css/css-sizing/aspect-ratio/intrinsic-size-022.html.ini
deleted file mode 100644
index 4826395f732..00000000000
--- a/tests/wpt/meta/css/css-sizing/aspect-ratio/intrinsic-size-022.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[intrinsic-size-022.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/aspect-ratio/intrinsic-size-023.html.ini b/tests/wpt/meta/css/css-sizing/aspect-ratio/intrinsic-size-023.html.ini
deleted file mode 100644
index b8dadfb164e..00000000000
--- a/tests/wpt/meta/css/css-sizing/aspect-ratio/intrinsic-size-023.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[intrinsic-size-023.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/aspect-ratio/intrinsic-size-024.html.ini b/tests/wpt/meta/css/css-sizing/aspect-ratio/intrinsic-size-024.html.ini
deleted file mode 100644
index 7949d795118..00000000000
--- a/tests/wpt/meta/css/css-sizing/aspect-ratio/intrinsic-size-024.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[intrinsic-size-024.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/aspect-ratio/intrinsic-size-025.html.ini b/tests/wpt/meta/css/css-sizing/aspect-ratio/intrinsic-size-025.html.ini
deleted file mode 100644
index c5b1cd36da0..00000000000
--- a/tests/wpt/meta/css/css-sizing/aspect-ratio/intrinsic-size-025.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[intrinsic-size-025.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/block-size-with-min-or-max-content-1a.html.ini b/tests/wpt/meta/css/css-sizing/block-size-with-min-or-max-content-1a.html.ini
new file mode 100644
index 00000000000..be541dcf01f
--- /dev/null
+++ b/tests/wpt/meta/css/css-sizing/block-size-with-min-or-max-content-1a.html.ini
@@ -0,0 +1,2 @@
+[block-size-with-min-or-max-content-1a.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/block-size-with-min-or-max-content-2.html.ini b/tests/wpt/meta/css/css-sizing/block-size-with-min-or-max-content-2.html.ini
deleted file mode 100644
index 2cbaeed40c7..00000000000
--- a/tests/wpt/meta/css/css-sizing/block-size-with-min-or-max-content-2.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[block-size-with-min-or-max-content-2.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/block-size-with-min-or-max-content-3.html.ini b/tests/wpt/meta/css/css-sizing/block-size-with-min-or-max-content-3.html.ini
deleted file mode 100644
index 176b69004a4..00000000000
--- a/tests/wpt/meta/css/css-sizing/block-size-with-min-or-max-content-3.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[block-size-with-min-or-max-content-3.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/border-box-and-max-content-001.html.ini b/tests/wpt/meta/css/css-sizing/border-box-and-max-content-001.html.ini
deleted file mode 100644
index bb0724bae12..00000000000
--- a/tests/wpt/meta/css/css-sizing/border-box-and-max-content-001.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[border-box-and-max-content-001.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/border-box-and-max-content-003.html.ini b/tests/wpt/meta/css/css-sizing/border-box-and-max-content-003.html.ini
deleted file mode 100644
index 8a57788b2ca..00000000000
--- a/tests/wpt/meta/css/css-sizing/border-box-and-max-content-003.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[border-box-and-max-content-003.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/calc-margins-block.html.ini b/tests/wpt/meta/css/css-sizing/calc-margins-block.html.ini
deleted file mode 100644
index c9cc051028a..00000000000
--- a/tests/wpt/meta/css/css-sizing/calc-margins-block.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[calc-margins-block.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/calc-margins-fieldset-content.html.ini b/tests/wpt/meta/css/css-sizing/calc-margins-fieldset-content.html.ini
deleted file mode 100644
index 670c4ef2c15..00000000000
--- a/tests/wpt/meta/css/css-sizing/calc-margins-fieldset-content.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[calc-margins-fieldset-content.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/calc-margins-fieldset-legend.html.ini b/tests/wpt/meta/css/css-sizing/calc-margins-fieldset-legend.html.ini
deleted file mode 100644
index 2c60e6a4fdf..00000000000
--- a/tests/wpt/meta/css/css-sizing/calc-margins-fieldset-legend.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[calc-margins-fieldset-legend.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/calc-margins-flex.html.ini b/tests/wpt/meta/css/css-sizing/calc-margins-flex.html.ini
deleted file mode 100644
index db98077ac03..00000000000
--- a/tests/wpt/meta/css/css-sizing/calc-margins-flex.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[calc-margins-flex.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/fit-content-max-inline-size.tentative.html.ini b/tests/wpt/meta/css/css-sizing/fit-content-max-inline-size.tentative.html.ini
deleted file mode 100644
index 5dfa8f46575..00000000000
--- a/tests/wpt/meta/css/css-sizing/fit-content-max-inline-size.tentative.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[fit-content-max-inline-size.tentative.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/fit-content-percentage-padding.html.ini b/tests/wpt/meta/css/css-sizing/fit-content-percentage-padding.html.ini
deleted file mode 100644
index fd87d771d50..00000000000
--- a/tests/wpt/meta/css/css-sizing/fit-content-percentage-padding.html.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[fit-content-percentage-padding.html]
-  [Initial layout]
-    expected: FAIL
-
-  [Shrink width]
-    expected: FAIL
-
-  [Grow width]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/intrinsic-percent-replaced-012.html.ini b/tests/wpt/meta/css/css-sizing/intrinsic-percent-replaced-012.html.ini
deleted file mode 100644
index 8d93bdff368..00000000000
--- a/tests/wpt/meta/css/css-sizing/intrinsic-percent-replaced-012.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[intrinsic-percent-replaced-012.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/intrinsic-percent-replaced-013.html.ini b/tests/wpt/meta/css/css-sizing/intrinsic-percent-replaced-013.html.ini
deleted file mode 100644
index e2c5c1e692c..00000000000
--- a/tests/wpt/meta/css/css-sizing/intrinsic-percent-replaced-013.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[intrinsic-percent-replaced-013.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/intrinsic-percent-replaced-022.html.ini b/tests/wpt/meta/css/css-sizing/intrinsic-percent-replaced-022.html.ini
deleted file mode 100644
index 7b6ee53191e..00000000000
--- a/tests/wpt/meta/css/css-sizing/intrinsic-percent-replaced-022.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[intrinsic-percent-replaced-022.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/intrinsic-percent-replaced-023.html.ini b/tests/wpt/meta/css/css-sizing/intrinsic-percent-replaced-023.html.ini
deleted file mode 100644
index 873156dc23c..00000000000
--- a/tests/wpt/meta/css/css-sizing/intrinsic-percent-replaced-023.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[intrinsic-percent-replaced-023.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/min-content-min-width-000.html.ini b/tests/wpt/meta/css/css-sizing/min-content-min-width-000.html.ini
deleted file mode 100644
index 51377fa7512..00000000000
--- a/tests/wpt/meta/css/css-sizing/min-content-min-width-000.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[min-content-min-width-000.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/percentage-min-width.html.ini b/tests/wpt/meta/css/css-sizing/percentage-min-width.html.ini
deleted file mode 100644
index bea01196009..00000000000
--- a/tests/wpt/meta/css/css-sizing/percentage-min-width.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[percentage-min-width.html]
-  [#container 1]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/stretch/auto-margins-1.html.ini b/tests/wpt/meta/css/css-sizing/stretch/auto-margins-1.html.ini
deleted file mode 100644
index 5030c8126ba..00000000000
--- a/tests/wpt/meta/css/css-sizing/stretch/auto-margins-1.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[auto-margins-1.html]
-  [[data-expected-width\] 2]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/stretch/block-height-001.html.ini b/tests/wpt/meta/css/css-sizing/stretch/block-height-001.html.ini
deleted file mode 100644
index 6d625d3ca9a..00000000000
--- a/tests/wpt/meta/css/css-sizing/stretch/block-height-001.html.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-[block-height-001.html]
-  [[data-expected-height\] 1]
-    expected: FAIL
-
-  [[data-expected-height\] 2]
-    expected: FAIL
-
-  [[data-expected-height\] 3]
-    expected: FAIL
-
-  [[data-expected-height\] 7]
-    expected: FAIL
-
-  [[data-expected-height\] 8]
-    expected: FAIL
-
-  [[data-expected-height\] 9]
-    expected: FAIL
-
-  [[data-expected-height\] 13]
-    expected: FAIL
-
-  [[data-expected-height\] 14]
-    expected: FAIL
-
-  [[data-expected-height\] 15]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/stretch/block-height-002.tentative.html.ini b/tests/wpt/meta/css/css-sizing/stretch/block-height-002.tentative.html.ini
index d7815e5e305..c0879089636 100644
--- a/tests/wpt/meta/css/css-sizing/stretch/block-height-002.tentative.html.ini
+++ b/tests/wpt/meta/css/css-sizing/stretch/block-height-002.tentative.html.ini
@@ -1,6 +1,3 @@
 [block-height-002.tentative.html]
-  [main > div > div 1]
-    expected: FAIL
-
   [main > div > div 2]
     expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/stretch/block-height-004.tentative.html.ini b/tests/wpt/meta/css/css-sizing/stretch/block-height-004.tentative.html.ini
index 965f6004757..44669115538 100644
--- a/tests/wpt/meta/css/css-sizing/stretch/block-height-004.tentative.html.ini
+++ b/tests/wpt/meta/css/css-sizing/stretch/block-height-004.tentative.html.ini
@@ -2,17 +2,8 @@
   [.inner 1]
     expected: FAIL
 
-  [.inner 2]
-    expected: FAIL
-
-  [.inner 3]
-    expected: FAIL
-
   [.inner 4]
     expected: FAIL
 
   [.inner 5]
     expected: FAIL
-
-  [.inner 6]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/stretch/content-contribution-001.html.ini b/tests/wpt/meta/css/css-sizing/stretch/content-contribution-001.html.ini
index 31311943629..9bd8bcbbbb6 100644
--- a/tests/wpt/meta/css/css-sizing/stretch/content-contribution-001.html.ini
+++ b/tests/wpt/meta/css/css-sizing/stretch/content-contribution-001.html.ini
@@ -1,9 +1,3 @@
 [content-contribution-001.html]
-  [.test 1]
-    expected: FAIL
-
-  [.test 2]
-    expected: FAIL
-
   [.test 5]
     expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/stretch/indefinite-2.html.ini b/tests/wpt/meta/css/css-sizing/stretch/indefinite-2.html.ini
new file mode 100644
index 00000000000..05de804a562
--- /dev/null
+++ b/tests/wpt/meta/css/css-sizing/stretch/indefinite-2.html.ini
@@ -0,0 +1,3 @@
+[indefinite-2.html]
+  [[data-expected-client-height\] 1]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/stretch/indefinite-3.html.ini b/tests/wpt/meta/css/css-sizing/stretch/indefinite-3.html.ini
new file mode 100644
index 00000000000..0534dc7600c
--- /dev/null
+++ b/tests/wpt/meta/css/css-sizing/stretch/indefinite-3.html.ini
@@ -0,0 +1,3 @@
+[indefinite-3.html]
+  [[data-expected-client-height\] 1]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/stretch/min-width-1.html.ini b/tests/wpt/meta/css/css-sizing/stretch/min-width-1.html.ini
deleted file mode 100644
index e3446c9bc89..00000000000
--- a/tests/wpt/meta/css/css-sizing/stretch/min-width-1.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[min-width-1.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/stretch/stretch-block-size-001.html.ini b/tests/wpt/meta/css/css-sizing/stretch/stretch-block-size-001.html.ini
index 1be7e205d17..ce07e41efe1 100644
--- a/tests/wpt/meta/css/css-sizing/stretch/stretch-block-size-001.html.ini
+++ b/tests/wpt/meta/css/css-sizing/stretch/stretch-block-size-001.html.ini
@@ -1,7 +1,4 @@
 [stretch-block-size-001.html]
-  [[data-expected-height\] 1]
-    expected: FAIL
-
   [[data-expected-height\] 8]
     expected: FAIL
 
@@ -14,12 +11,6 @@
   [[data-expected-height\] 22]
     expected: FAIL
 
-  [[data-expected-height\] 23]
-    expected: FAIL
-
-  [[data-expected-height\] 24]
-    expected: FAIL
-
   [[data-expected-height\] 31]
     expected: FAIL
 
@@ -31,6 +22,3 @@
 
   [[data-expected-height\] 45]
     expected: FAIL
-
-  [[data-expected-height\] 46]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/stretch/stretch-max-block-size-001.html.ini b/tests/wpt/meta/css/css-sizing/stretch/stretch-max-block-size-001.html.ini
index dd44d3cf5dd..71b6ee86c40 100644
--- a/tests/wpt/meta/css/css-sizing/stretch/stretch-max-block-size-001.html.ini
+++ b/tests/wpt/meta/css/css-sizing/stretch/stretch-max-block-size-001.html.ini
@@ -1,7 +1,4 @@
 [stretch-max-block-size-001.html]
-  [[data-expected-height\] 1]
-    expected: FAIL
-
   [[data-expected-height\] 8]
     expected: FAIL
 
@@ -14,9 +11,6 @@
   [[data-expected-height\] 22]
     expected: FAIL
 
-  [[data-expected-height\]:not([skip-second-pass\]) 24]
-    expected: FAIL
-
   [[data-expected-height\]:not([skip-second-pass\]) 31]
     expected: FAIL
 
@@ -28,3 +22,6 @@
 
   [[data-expected-height\]:not([skip-second-pass\]) 45]
     expected: FAIL
+
+  [[data-expected-height\] 23]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/stretch/stretch-max-inline-size-001.html.ini b/tests/wpt/meta/css/css-sizing/stretch/stretch-max-inline-size-001.html.ini
index 6bb9ce12fe5..bc982d6c609 100644
--- a/tests/wpt/meta/css/css-sizing/stretch/stretch-max-inline-size-001.html.ini
+++ b/tests/wpt/meta/css/css-sizing/stretch/stretch-max-inline-size-001.html.ini
@@ -1,7 +1,4 @@
 [stretch-max-inline-size-001.html]
-  [[data-expected-width\] 1]
-    expected: FAIL
-
   [[data-expected-width\] 8]
     expected: FAIL
 
@@ -14,9 +11,6 @@
   [[data-expected-width\] 22]
     expected: FAIL
 
-  [[data-expected-width\]:not([skip-second-pass\]) 24]
-    expected: FAIL
-
   [[data-expected-width\]:not([skip-second-pass\]) 31]
     expected: FAIL
 
@@ -28,3 +22,6 @@
 
   [[data-expected-width\]:not([skip-second-pass\]) 45]
     expected: FAIL
+
+  [[data-expected-width\] 23]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/stretch/stretch-min-block-size-001.html.ini b/tests/wpt/meta/css/css-sizing/stretch/stretch-min-block-size-001.html.ini
index a5134722393..294a25e4bd6 100644
--- a/tests/wpt/meta/css/css-sizing/stretch/stretch-min-block-size-001.html.ini
+++ b/tests/wpt/meta/css/css-sizing/stretch/stretch-min-block-size-001.html.ini
@@ -1,7 +1,4 @@
 [stretch-min-block-size-001.html]
-  [[data-expected-height\] 1]
-    expected: FAIL
-
   [[data-expected-height\] 8]
     expected: FAIL
 
@@ -17,12 +14,6 @@
   [[data-expected-height\] 22]
     expected: FAIL
 
-  [[data-expected-height\] 23]
-    expected: FAIL
-
-  [[data-expected-height\] 24]
-    expected: FAIL
-
   [[data-expected-height\] 31]
     expected: FAIL
 
@@ -37,6 +28,3 @@
 
   [[data-expected-height\] 45]
     expected: FAIL
-
-  [[data-expected-height\] 46]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/stretch/stretch-min-inline-size-001.html.ini b/tests/wpt/meta/css/css-sizing/stretch/stretch-min-inline-size-001.html.ini
index f6dc6e9eaf1..bf576c14464 100644
--- a/tests/wpt/meta/css/css-sizing/stretch/stretch-min-inline-size-001.html.ini
+++ b/tests/wpt/meta/css/css-sizing/stretch/stretch-min-inline-size-001.html.ini
@@ -1,7 +1,4 @@
 [stretch-min-inline-size-001.html]
-  [[data-expected-width\] 1]
-    expected: FAIL
-
   [[data-expected-width\] 8]
     expected: FAIL
 
@@ -17,12 +14,6 @@
   [[data-expected-width\] 22]
     expected: FAIL
 
-  [[data-expected-width\] 23]
-    expected: FAIL
-
-  [[data-expected-width\] 24]
-    expected: FAIL
-
   [[data-expected-width\] 31]
     expected: FAIL
 
@@ -37,6 +28,3 @@
 
   [[data-expected-width\] 45]
     expected: FAIL
-
-  [[data-expected-width\] 46]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/whitespace-and-break.html.ini b/tests/wpt/meta/css/css-sizing/whitespace-and-break.html.ini
deleted file mode 100644
index b42e8490552..00000000000
--- a/tests/wpt/meta/css/css-sizing/whitespace-and-break.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[whitespace-and-break.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-tables/tentative/table-width-redistribution.html.ini b/tests/wpt/meta/css/css-tables/tentative/table-width-redistribution.html.ini
index 2f01750a41d..bd7e925f2f5 100644
--- a/tests/wpt/meta/css/css-tables/tentative/table-width-redistribution.html.ini
+++ b/tests/wpt/meta/css/css-tables/tentative/table-width-redistribution.html.ini
@@ -1,7 +1,4 @@
 [table-width-redistribution.html]
-  [table 3]
-    expected: FAIL
-
   [table 5]
     expected: FAIL
 
diff --git a/tests/wpt/meta/css/css-text/overflow-wrap/overflow-wrap-min-content-size-006.html.ini b/tests/wpt/meta/css/css-text/overflow-wrap/overflow-wrap-min-content-size-006.html.ini
deleted file mode 100644
index 0e1f7bd4623..00000000000
--- a/tests/wpt/meta/css/css-text/overflow-wrap/overflow-wrap-min-content-size-006.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[overflow-wrap-min-content-size-006.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/text-group-align/text-group-align-center-vlr.html.ini b/tests/wpt/meta/css/css-text/text-group-align/text-group-align-center-vlr.html.ini
new file mode 100644
index 00000000000..e745a34ece8
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/text-group-align/text-group-align-center-vlr.html.ini
@@ -0,0 +1,2 @@
+[text-group-align-center-vlr.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/text-group-align/text-group-align-center.html.ini b/tests/wpt/meta/css/css-text/text-group-align/text-group-align-center.html.ini
new file mode 100644
index 00000000000..cb703fd56d2
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/text-group-align/text-group-align-center.html.ini
@@ -0,0 +1,2 @@
+[text-group-align-center.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/text-group-align/text-group-align-end-vlr.html.ini b/tests/wpt/meta/css/css-text/text-group-align/text-group-align-end-vlr.html.ini
new file mode 100644
index 00000000000..9b7c668c224
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/text-group-align/text-group-align-end-vlr.html.ini
@@ -0,0 +1,2 @@
+[text-group-align-end-vlr.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/text-group-align/text-group-align-end.html.ini b/tests/wpt/meta/css/css-text/text-group-align/text-group-align-end.html.ini
new file mode 100644
index 00000000000..181d3b1f66c
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/text-group-align/text-group-align-end.html.ini
@@ -0,0 +1,2 @@
+[text-group-align-end.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/text-group-align/text-group-align-left-vlr.html.ini b/tests/wpt/meta/css/css-text/text-group-align/text-group-align-left-vlr.html.ini
new file mode 100644
index 00000000000..b25086d95a0
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/text-group-align/text-group-align-left-vlr.html.ini
@@ -0,0 +1,2 @@
+[text-group-align-left-vlr.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/text-group-align/text-group-align-left.html.ini b/tests/wpt/meta/css/css-text/text-group-align/text-group-align-left.html.ini
new file mode 100644
index 00000000000..91966281efd
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/text-group-align/text-group-align-left.html.ini
@@ -0,0 +1,2 @@
+[text-group-align-left.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/text-group-align/text-group-align-right-vlr.html.ini b/tests/wpt/meta/css/css-text/text-group-align/text-group-align-right-vlr.html.ini
new file mode 100644
index 00000000000..b4d729f337d
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/text-group-align/text-group-align-right-vlr.html.ini
@@ -0,0 +1,2 @@
+[text-group-align-right-vlr.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/text-group-align/text-group-align-right.html.ini b/tests/wpt/meta/css/css-text/text-group-align/text-group-align-right.html.ini
new file mode 100644
index 00000000000..fe721b69bbb
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/text-group-align/text-group-align-right.html.ini
@@ -0,0 +1,2 @@
+[text-group-align-right.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/text-group-align/text-group-align-start-vlr.html.ini b/tests/wpt/meta/css/css-text/text-group-align/text-group-align-start-vlr.html.ini
new file mode 100644
index 00000000000..a1ebbbf4ef3
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/text-group-align/text-group-align-start-vlr.html.ini
@@ -0,0 +1,2 @@
+[text-group-align-start-vlr.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/text-group-align/text-group-align-start.html.ini b/tests/wpt/meta/css/css-text/text-group-align/text-group-align-start.html.ini
new file mode 100644
index 00000000000..6de7b74d9b3
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/text-group-align/text-group-align-start.html.ini
@@ -0,0 +1,2 @@
+[text-group-align-start.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/white-space/pre-wrap-017.html.ini b/tests/wpt/meta/css/css-text/white-space/pre-wrap-017.html.ini
deleted file mode 100644
index 750e1959546..00000000000
--- a/tests/wpt/meta/css/css-text/white-space/pre-wrap-017.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[pre-wrap-017.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/white-space/white-space-intrinsic-size-005.html.ini b/tests/wpt/meta/css/css-text/white-space/white-space-intrinsic-size-005.html.ini
deleted file mode 100644
index 63bcfcb030f..00000000000
--- a/tests/wpt/meta/css/css-text/white-space/white-space-intrinsic-size-005.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[white-space-intrinsic-size-005.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/white-space/white-space-intrinsic-size-006.html.ini b/tests/wpt/meta/css/css-text/white-space/white-space-intrinsic-size-006.html.ini
deleted file mode 100644
index 5bf0e34ccb5..00000000000
--- a/tests/wpt/meta/css/css-text/white-space/white-space-intrinsic-size-006.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[white-space-intrinsic-size-006.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-003.html.ini b/tests/wpt/meta/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-003.html.ini
deleted file mode 100644
index 0630953f69a..00000000000
--- a/tests/wpt/meta/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-003.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[white-space-pre-wrap-trailing-spaces-003.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/word-break/auto-phrase/word-break-auto-phrase-001.html.ini b/tests/wpt/meta/css/css-text/word-break/auto-phrase/word-break-auto-phrase-001.html.ini
new file mode 100644
index 00000000000..d2d12e408c1
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/word-break/auto-phrase/word-break-auto-phrase-001.html.ini
@@ -0,0 +1,2 @@
+[word-break-auto-phrase-001.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/word-break/auto-phrase/word-break-auto-phrase-002.html.ini b/tests/wpt/meta/css/css-text/word-break/auto-phrase/word-break-auto-phrase-002.html.ini
new file mode 100644
index 00000000000..e5a337757ba
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/word-break/auto-phrase/word-break-auto-phrase-002.html.ini
@@ -0,0 +1,2 @@
+[word-break-auto-phrase-002.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/word-break/auto-phrase/word-break-auto-phrase-003.html.ini b/tests/wpt/meta/css/css-text/word-break/auto-phrase/word-break-auto-phrase-003.html.ini
new file mode 100644
index 00000000000..ebcf4159a52
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/word-break/auto-phrase/word-break-auto-phrase-003.html.ini
@@ -0,0 +1,2 @@
+[word-break-auto-phrase-003.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/word-break/auto-phrase/word-break-auto-phrase-004.html.ini b/tests/wpt/meta/css/css-text/word-break/auto-phrase/word-break-auto-phrase-004.html.ini
new file mode 100644
index 00000000000..6c8f68cacc3
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/word-break/auto-phrase/word-break-auto-phrase-004.html.ini
@@ -0,0 +1,2 @@
+[word-break-auto-phrase-004.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-text/word-break/auto-phrase/word-break-auto-phrase-005.html.ini b/tests/wpt/meta/css/css-text/word-break/auto-phrase/word-break-auto-phrase-005.html.ini
new file mode 100644
index 00000000000..50bd1d792a6
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/word-break/auto-phrase/word-break-auto-phrase-005.html.ini
@@ -0,0 +1,2 @@
+[word-break-auto-phrase-005.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-values/calc-size/animation/interpolate-size-height-interpolation.html.ini b/tests/wpt/meta/css/css-values/calc-size/animation/interpolate-size-height-interpolation.html.ini
index 67626444dc3..9eb86d75c9f 100644
--- a/tests/wpt/meta/css/css-values/calc-size/animation/interpolate-size-height-interpolation.html.ini
+++ b/tests/wpt/meta/css/css-values/calc-size/animation/interpolate-size-height-interpolation.html.ini
@@ -646,3 +646,21 @@
 
   [Web Animations: property <height> from neutral to [fit-content\] at (1.5) should be [0px\]]
     expected: FAIL
+
+  [CSS Transitions with transition-behavior:allow-discrete: property <height> from [max-content\] to [stretch\] at (-0.3) should be [max-content\]]
+    expected: FAIL
+
+  [CSS Transitions with transition-behavior:allow-discrete: property <height> from [max-content\] to [stretch\] at (0) should be [max-content\]]
+    expected: FAIL
+
+  [CSS Transitions with transition-behavior:allow-discrete: property <height> from [max-content\] to [stretch\] at (0.3) should be [max-content\]]
+    expected: FAIL
+
+  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <height> from [max-content\] to [stretch\] at (-0.3) should be [max-content\]]
+    expected: FAIL
+
+  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <height> from [max-content\] to [stretch\] at (0) should be [max-content\]]
+    expected: FAIL
+
+  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <height> from [max-content\] to [stretch\] at (0.3) should be [max-content\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-values/calc-size/animation/interpolate-size-which-value.html.ini b/tests/wpt/meta/css/css-values/calc-size/animation/interpolate-size-which-value.html.ini
index a2e6b16879a..9cf231eea51 100644
--- a/tests/wpt/meta/css/css-values/calc-size/animation/interpolate-size-which-value.html.ini
+++ b/tests/wpt/meta/css/css-values/calc-size/animation/interpolate-size-which-value.html.ini
@@ -1,13 +1,7 @@
 [interpolate-size-which-value.html]
-  [Use the after-change value of interpolate-size: numeric-only when starting CSS transition from 100px to min-content]
-    expected: FAIL
-
   [Use the non-animation value of interpolate-size: numeric-only when starting CSS animation from 100px to min-content]
     expected: FAIL
 
-  [Use the after-change value of interpolate-size: numeric-only when starting CSS transition from min-content to 100px]
-    expected: FAIL
-
   [Use the non-animation value of interpolate-size: numeric-only when starting CSS animation from min-content to 100px]
     expected: FAIL
 
diff --git a/tests/wpt/meta/css/css-values/calc-size/animation/interpolate-size-width-composition.html.ini b/tests/wpt/meta/css/css-values/calc-size/animation/interpolate-size-width-composition.html.ini
index 4c55fcb3f11..b7876de5f7a 100644
--- a/tests/wpt/meta/css/css-values/calc-size/animation/interpolate-size-width-composition.html.ini
+++ b/tests/wpt/meta/css/css-values/calc-size/animation/interpolate-size-width-composition.html.ini
@@ -46,3 +46,12 @@
 
   [Compositing: property <width> underlying [max-content\] from add [200px\] to add [auto\] at (0) should be [300px\]]
     expected: FAIL
+
+  [Compositing: property <width> underlying [max-content\] from add [200px\] to add [auto\] at (0.5) should be [200px\]]
+    expected: FAIL
+
+  [Compositing: property <width> underlying [max-content\] from add [200px\] to add [auto\] at (1) should be [200px\]]
+    expected: FAIL
+
+  [Compositing: property <width> underlying [max-content\] from add [200px\] to add [auto\] at (1.5) should be [200px\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-values/calc-size/animation/interpolate-size-width-interpolation.html.ini b/tests/wpt/meta/css/css-values/calc-size/animation/interpolate-size-width-interpolation.html.ini
index a89687989e8..90196de30a5 100644
--- a/tests/wpt/meta/css/css-values/calc-size/animation/interpolate-size-width-interpolation.html.ini
+++ b/tests/wpt/meta/css/css-values/calc-size/animation/interpolate-size-width-interpolation.html.ini
@@ -284,9 +284,6 @@
   [CSS Transitions: property <width> from [200px\] to [fit-content\] at (0.6) should be [140px\]]
     expected: FAIL
 
-  [CSS Transitions: property <width> from [200px\] to [fit-content\] at (1) should be [100px\]]
-    expected: FAIL
-
   [CSS Transitions: property <width> from [200px\] to [fit-content\] at (1.5) should be [50px\]]
     expected: FAIL
 
@@ -302,9 +299,6 @@
   [CSS Transitions with transition: all: property <width> from [200px\] to [fit-content\] at (0.6) should be [140px\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <width> from [200px\] to [fit-content\] at (1) should be [100px\]]
-    expected: FAIL
-
   [CSS Transitions with transition: all: property <width> from [200px\] to [fit-content\] at (1.5) should be [50px\]]
     expected: FAIL
 
@@ -458,9 +452,6 @@
   [CSS Transitions: property <width> from neutral to [min-content\] at (0.6) should be [80px\]]
     expected: FAIL
 
-  [CSS Transitions: property <width> from neutral to [min-content\] at (1) should be [100px\]]
-    expected: FAIL
-
   [CSS Transitions: property <width> from neutral to [min-content\] at (1.5) should be [125px\]]
     expected: FAIL
 
@@ -476,9 +467,6 @@
   [CSS Transitions with transition: all: property <width> from neutral to [min-content\] at (0.6) should be [80px\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <width> from neutral to [min-content\] at (1) should be [100px\]]
-    expected: FAIL
-
   [CSS Transitions with transition: all: property <width> from neutral to [min-content\] at (1.5) should be [125px\]]
     expected: FAIL
 
@@ -514,3 +502,21 @@
 
   [Web Animations: property <width> from neutral to [min-content\] at (1.5) should be [125px\]]
     expected: FAIL
+
+  [CSS Transitions with transition-behavior:allow-discrete: property <width> from [auto\] to [fit-content\] at (-0.3) should be [auto\]]
+    expected: FAIL
+
+  [CSS Transitions with transition-behavior:allow-discrete: property <width> from [auto\] to [fit-content\] at (0) should be [auto\]]
+    expected: FAIL
+
+  [CSS Transitions with transition-behavior:allow-discrete: property <width> from [auto\] to [fit-content\] at (0.3) should be [auto\]]
+    expected: FAIL
+
+  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <width> from [auto\] to [fit-content\] at (-0.3) should be [auto\]]
+    expected: FAIL
+
+  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <width> from [auto\] to [fit-content\] at (0) should be [auto\]]
+    expected: FAIL
+
+  [CSS Transitions with transition-property:all and transition-behavor:allow-discrete: property <width> from [auto\] to [fit-content\] at (0.3) should be [auto\]]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-values/calc-size/calc-size-min-max-sizes-003.html.ini b/tests/wpt/meta/css/css-values/calc-size/calc-size-min-max-sizes-003.html.ini
new file mode 100644
index 00000000000..d27ec80241b
--- /dev/null
+++ b/tests/wpt/meta/css/css-values/calc-size/calc-size-min-max-sizes-003.html.ini
@@ -0,0 +1,2 @@
+[calc-size-min-max-sizes-003.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-values/calc-size/calc-size-min-max-sizes-006.html.ini b/tests/wpt/meta/css/css-values/calc-size/calc-size-min-max-sizes-006.html.ini
new file mode 100644
index 00000000000..0abc9769bf2
--- /dev/null
+++ b/tests/wpt/meta/css/css-values/calc-size/calc-size-min-max-sizes-006.html.ini
@@ -0,0 +1,2 @@
+[calc-size-min-max-sizes-006.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/min-inline-size.html.ini b/tests/wpt/meta/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/min-inline-size.html.ini
index 2bc5c5396e4..5419eca7921 100644
--- a/tests/wpt/meta/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/min-inline-size.html.ini
+++ b/tests/wpt/meta/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/min-inline-size.html.ini
@@ -1,7 +1,4 @@
 [min-inline-size.html]
-  [horizontal-tb ]
-    expected: FAIL
-
   [vertical-lr ]
     expected: FAIL