diff --git a/components/layout_2020/flexbox/geom.rs b/components/layout_2020/flexbox/geom.rs
new file mode 100644
index 00000000000..2e68508d71b
--- /dev/null
+++ b/components/layout_2020/flexbox/geom.rs
@@ -0,0 +1,270 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+//! https://drafts.csswg.org/css-flexbox/#box-model
+
+use crate::geom::flow_relative::{Rect, Sides, Vec2};
+use style::properties::longhands::flex_direction::computed_value::T as FlexDirection;
+
+#[derive(Clone, Copy)]
+pub(super) struct FlexRelativeVec2<T> {
+    pub main: T,
+    pub cross: T,
+}
+
+#[derive(Clone, Copy)]
+pub(super) struct FlexRelativeSides<T> {
+    pub cross_start: T,
+    pub main_start: T,
+    pub cross_end: T,
+    pub main_end: T,
+}
+
+pub(super) struct FlexRelativeRect<T> {
+    pub start_corner: FlexRelativeVec2<T>,
+    pub size: FlexRelativeVec2<T>,
+}
+
+impl<T> std::ops::Add for FlexRelativeVec2<T>
+where
+    T: std::ops::Add,
+{
+    type Output = FlexRelativeVec2<T::Output>;
+    fn add(self, rhs: Self) -> Self::Output {
+        FlexRelativeVec2 {
+            main: self.main + rhs.main,
+            cross: self.cross + rhs.cross,
+        }
+    }
+}
+
+impl<T> std::ops::Sub for FlexRelativeVec2<T>
+where
+    T: std::ops::Sub,
+{
+    type Output = FlexRelativeVec2<T::Output>;
+    fn sub(self, rhs: Self) -> Self::Output {
+        FlexRelativeVec2 {
+            main: self.main - rhs.main,
+            cross: self.cross - rhs.cross,
+        }
+    }
+}
+
+impl<T> FlexRelativeSides<T> {
+    pub fn sum_by_axis(self) -> FlexRelativeVec2<T::Output>
+    where
+        T: std::ops::Add,
+    {
+        FlexRelativeVec2 {
+            main: self.main_start + self.main_end,
+            cross: self.cross_start + self.cross_end,
+        }
+    }
+}
+
+/// One of the two bits set by the `flex-direction` property
+/// (The other is "forward" v.s. reverse.)
+#[derive(Clone, Copy, PartialEq)]
+pub(super) enum FlexAxis {
+    /// The main axis is the inline axis of the container (not necessarily of flex items!),
+    /// cross is block.
+    Row,
+    /// The main axis is the block axis, cross is inline.
+    Column,
+}
+
+/// Which flow-relative sides map to the main-start and cross-start sides, respectively.
+/// See https://drafts.csswg.org/css-flexbox/#box-model
+#[derive(Clone, Copy)]
+pub(super) enum MainStartCrossStart {
+    InlineStartBlockStart,
+    InlineStartBlockEnd,
+    BlockStartInlineStart,
+    BlockStartInlineEnd,
+    InlineEndBlockStart,
+    InlineEndBlockEnd,
+    BlockEndInlineStart,
+    BlockEndInlineEnd,
+}
+
+impl FlexAxis {
+    pub fn from(flex_direction: FlexDirection) -> Self {
+        match flex_direction {
+            FlexDirection::Row | FlexDirection::RowReverse => FlexAxis::Row,
+            FlexDirection::Column | FlexDirection::ColumnReverse => FlexAxis::Column,
+        }
+    }
+
+    pub fn vec2_to_flex_relative<T>(self, flow_relative: Vec2<T>) -> FlexRelativeVec2<T> {
+        let Vec2 { inline, block } = flow_relative;
+        match self {
+            FlexAxis::Row => FlexRelativeVec2 {
+                main: inline,
+                cross: block,
+            },
+            FlexAxis::Column => FlexRelativeVec2 {
+                main: block,
+                cross: inline,
+            },
+        }
+    }
+
+    pub fn vec2_to_flow_relative<T>(self, flex_relative: FlexRelativeVec2<T>) -> Vec2<T> {
+        let FlexRelativeVec2 { main, cross } = flex_relative;
+        match self {
+            FlexAxis::Row => Vec2 {
+                inline: main,
+                block: cross,
+            },
+            FlexAxis::Column => Vec2 {
+                block: main,
+                inline: cross,
+            },
+        }
+    }
+}
+
+macro_rules! sides_mapping_methods {
+    (
+        $(
+            $variant: path => {
+                $( $flex_relative_side: ident <=> $flow_relative_side: ident, )+
+            },
+        )+
+    ) => {
+        pub fn sides_to_flex_relative<T>(self, flow_relative: Sides<T>) -> FlexRelativeSides<T> {
+            match self {
+                $(
+                    $variant => FlexRelativeSides {
+                        $( $flex_relative_side: flow_relative.$flow_relative_side, )+
+                    },
+                )+
+            }
+        }
+
+        pub fn sides_to_flow_relative<T>(self, flex_relative: FlexRelativeSides<T>) -> Sides<T> {
+            match self {
+                $(
+                    $variant => Sides {
+                        $( $flow_relative_side: flex_relative.$flex_relative_side, )+
+                    },
+                )+
+            }
+        }
+    }
+}
+
+impl MainStartCrossStart {
+    pub fn from(flex_direction: FlexDirection, flex_wrap_reverse: bool) -> Self {
+        match (flex_direction, flex_wrap_reverse) {
+            // See definition of each keyword in
+            // https://drafts.csswg.org/css-flexbox/#flex-direction-property and
+            // https://drafts.csswg.org/css-flexbox/#flex-wrap-property,
+            // or the tables (though they map to physical rather than flow-relative) at
+            // https://drafts.csswg.org/css-flexbox/#axis-mapping
+            (FlexDirection::Row, true) => MainStartCrossStart::InlineStartBlockEnd,
+            (FlexDirection::Row, false) => MainStartCrossStart::InlineStartBlockStart,
+            (FlexDirection::Column, true) => MainStartCrossStart::BlockStartInlineEnd,
+            (FlexDirection::Column, false) => MainStartCrossStart::BlockStartInlineStart,
+            (FlexDirection::RowReverse, true) => MainStartCrossStart::InlineEndBlockEnd,
+            (FlexDirection::RowReverse, false) => MainStartCrossStart::InlineEndBlockStart,
+            (FlexDirection::ColumnReverse, true) => MainStartCrossStart::BlockEndInlineEnd,
+            (FlexDirection::ColumnReverse, false) => MainStartCrossStart::BlockEndInlineStart,
+        }
+    }
+
+    sides_mapping_methods! {
+        MainStartCrossStart::InlineStartBlockStart => {
+            main_start <=> inline_start,
+            cross_start <=> block_start,
+            main_end <=> inline_end,
+            cross_end <=> block_end,
+        },
+        MainStartCrossStart::InlineStartBlockEnd => {
+            main_start <=> inline_start,
+            cross_start <=> block_end,
+            main_end <=> inline_end,
+            cross_end <=> block_start,
+        },
+        MainStartCrossStart::BlockStartInlineStart => {
+            main_start <=> block_start,
+            cross_start <=> inline_start,
+            main_end <=> block_end,
+            cross_end <=> inline_end,
+        },
+        MainStartCrossStart::BlockStartInlineEnd => {
+            main_start <=> block_start,
+            cross_start <=> inline_end,
+            main_end <=> block_end,
+            cross_end <=> inline_start,
+        },
+        MainStartCrossStart::InlineEndBlockStart => {
+            main_start <=> inline_end,
+            cross_start <=> block_start,
+            main_end <=> inline_start,
+            cross_end <=> block_end,
+        },
+        MainStartCrossStart::InlineEndBlockEnd => {
+            main_start <=> inline_end,
+            cross_start <=> block_end,
+            main_end <=> inline_start,
+            cross_end <=> block_start,
+        },
+        MainStartCrossStart::BlockEndInlineStart => {
+            main_start <=> block_end,
+            cross_start <=> inline_start,
+            main_end <=> block_start,
+            cross_end <=> inline_end,
+        },
+        MainStartCrossStart::BlockEndInlineEnd => {
+            main_start <=> block_end,
+            cross_start <=> inline_end,
+            main_end <=> block_start,
+            cross_end <=> inline_start,
+        },
+    }
+}
+
+/// The start corner coordinates in both the input rectangle and output rectangle
+/// are relative to some “base rectangle” whose size is passed here.
+pub(super) fn rect_to_flow_relative<T>(
+    flex_axis: FlexAxis,
+    main_start_cross_start_sides_are: MainStartCrossStart,
+    base_rect_size: FlexRelativeVec2<T>,
+    rect: FlexRelativeRect<T>,
+) -> Rect<T>
+where
+    T: Copy + std::ops::Add<Output = T> + std::ops::Sub<Output = T>,
+{
+    // First, convert from (start corner, size) to offsets from the edges of the base rectangle
+
+    let end_corner_position = rect.start_corner + rect.size;
+    let end_corner_offsets = base_rect_size - end_corner_position;
+    // No-ops, but hopefully clarifies to human readers:
+    let start_corner_position = rect.start_corner;
+    let start_corner_offsets = start_corner_position;
+
+    // Then, convert to flow-relative using methods above
+    let flow_relative_offsets =
+        main_start_cross_start_sides_are.sides_to_flow_relative(FlexRelativeSides {
+            main_start: start_corner_offsets.main,
+            cross_start: start_corner_offsets.cross,
+            main_end: end_corner_offsets.main,
+            cross_end: end_corner_offsets.cross,
+        });
+    let flow_relative_base_rect_size = flex_axis.vec2_to_flow_relative(base_rect_size);
+
+    // Finally, convert back to (start corner, size)
+    let start_corner = Vec2 {
+        inline: flow_relative_offsets.inline_start,
+        block: flow_relative_offsets.block_start,
+    };
+    let end_corner_position = Vec2 {
+        inline: flow_relative_base_rect_size.inline - flow_relative_offsets.inline_end,
+        block: flow_relative_base_rect_size.block - flow_relative_offsets.block_end,
+    };
+    let size = &end_corner_position - &start_corner;
+    Rect { start_corner, size }
+}
diff --git a/components/layout_2020/flexbox/layout.rs b/components/layout_2020/flexbox/layout.rs
index 1da062b7764..666eca3055f 100644
--- a/components/layout_2020/flexbox/layout.rs
+++ b/components/layout_2020/flexbox/layout.rs
@@ -2,17 +2,130 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-use super::FlexContainer;
+use super::geom::{
+    FlexAxis, FlexRelativeRect, FlexRelativeSides, FlexRelativeVec2, MainStartCrossStart,
+};
+use super::{FlexContainer, FlexLevelBox};
 use crate::context::LayoutContext;
-use crate::formatting_contexts::IndependentLayout;
-use crate::positioned::PositioningContext;
+use crate::formatting_contexts::{IndependentFormattingContext, IndependentLayout};
+use crate::fragments::{
+    AbsoluteOrFixedPositionedFragment, BoxFragment, CollapsedBlockMargins, Fragment,
+};
+use crate::geom::flow_relative::{Rect, Sides, Vec2};
+use crate::geom::LengthOrAuto;
+use crate::positioned::{AbsolutelyPositionedBox, PositioningContext};
+use crate::sizing::ContentSizes;
+use crate::style_ext::ComputedValuesExt;
 use crate::ContainingBlock;
+use atomic_refcell::AtomicRefMut;
+use std::cell::Cell;
+use style::properties::longhands::box_sizing::computed_value::T as BoxSizing;
+use style::properties::longhands::flex_direction::computed_value::T as FlexDirection;
+use style::properties::longhands::flex_wrap::computed_value::T as FlexWrap;
+use style::values::computed::length::Size;
 use style::values::computed::Length;
+use style::values::generics::flex::GenericFlexBasis as FlexBasis;
 use style::Zero;
 
-// FIXME: `min-width: auto` is not zero: https://drafts.csswg.org/css-flexbox/#min-size-auto
+// FIMXE: “Flex items […] `z-index` values other than `auto` create a stacking context
+// even if `position` is `static` (behaving exactly as if `position` were `relative`).”
+// https://drafts.csswg.org/css-flexbox/#painting
+// (likely in `display_list/stacking_context.rs`)
+
+/// Layout parameters and intermediate results about a flex container,
+/// grouped to avoid passing around many parameters
+struct FlexContext<'a> {
+    layout_context: &'a LayoutContext<'a>,
+    positioning_context: &'a mut PositioningContext,
+    containing_block: &'a ContainingBlock<'a>, // For items
+    container_is_single_line: bool,
+    container_min_cross_size: Length,
+    container_max_cross_size: Option<Length>,
+    flex_axis: FlexAxis,
+    main_start_cross_start_sides_are: MainStartCrossStart,
+    container_definite_inner_size: FlexRelativeVec2<Option<Length>>,
+}
+
+/// A flex item with some intermediate results
+struct FlexItem<'a> {
+    box_: &'a mut IndependentFormattingContext,
+    tree_rank: usize,
+    content_box_size: FlexRelativeVec2<LengthOrAuto>,
+    content_min_size: FlexRelativeVec2<Length>,
+    content_max_size: FlexRelativeVec2<Option<Length>>,
+    padding: FlexRelativeSides<Length>,
+    border: FlexRelativeSides<Length>,
+    margin: FlexRelativeSides<LengthOrAuto>,
+
+    /// Sum of padding, border, and margin (with `auto` assumed to be zero) in each axis.
+    /// This is the difference between an outer and inner size.
+    pbm_auto_is_zero: FlexRelativeVec2<Length>,
+
+    /// https://drafts.csswg.org/css-flexbox/#algo-main-item
+    flex_base_size: Length,
+
+    /// https://drafts.csswg.org/css-flexbox/#algo-main-item
+    hypothetical_main_size: Length,
+}
+
+/// A flex line with some intermediate results
+struct FlexLine<'a> {
+    items: &'a mut [FlexItem<'a>],
+    outer_hypothetical_main_sizes_sum: Length,
+}
+
+/// Return type of `FlexItem::layout`
+struct FlexItemLayoutResult {
+    hypothetical_cross_size: Length,
+    fragments: Vec<Fragment>,
+    positioning_context: PositioningContext,
+}
+
+/// Return type of `FlexLine::layout`
+struct FlexLineLayoutResult {
+    cross_size: Length,
+    item_fragments: Vec<BoxFragment>, // One per flex item, in the given order
+}
+
+impl FlexContext<'_> {
+    fn vec2_to_flex_relative<T>(&self, x: Vec2<T>) -> FlexRelativeVec2<T> {
+        self.flex_axis.vec2_to_flex_relative(x)
+    }
+
+    fn sides_to_flex_relative<T>(&self, x: Sides<T>) -> FlexRelativeSides<T> {
+        self.main_start_cross_start_sides_are
+            .sides_to_flex_relative(x)
+    }
+
+    fn sides_to_flow_relative<T>(&self, x: FlexRelativeSides<T>) -> Sides<T> {
+        self.main_start_cross_start_sides_are
+            .sides_to_flow_relative(x)
+    }
+
+    fn rect_to_flow_relative(
+        &self,
+        base_rect_size: FlexRelativeVec2<Length>,
+        rect: FlexRelativeRect<Length>,
+    ) -> Rect<Length> {
+        super::geom::rect_to_flow_relative(
+            self.flex_axis,
+            self.main_start_cross_start_sides_are,
+            base_rect_size,
+            rect,
+        )
+    }
+}
 
 impl FlexContainer {
+    pub fn inline_content_sizes(&self) -> ContentSizes {
+        // FIXME: implement this. The spec for it is the same as for "normal" layout:
+        // https://drafts.csswg.org/css-flexbox/#layout-algorithm
+        // … except that the parts that say “the flex container is being sized
+        // under a min or max-content constraint” apply.
+        ContentSizes::zero() // Return an incorrect result rather than panic
+    }
+
+    /// https://drafts.csswg.org/css-flexbox/#layout-algorithm
     pub(crate) fn layout(
         &self,
         layout_context: &LayoutContext,
@@ -20,14 +133,999 @@ impl FlexContainer {
         containing_block: &ContainingBlock,
         tree_rank: usize,
     ) -> IndependentLayout {
-        // FIXME
-        let _ = layout_context;
-        let _ = positioning_context;
-        let _ = containing_block;
-        let _ = tree_rank;
+        // Actual length may be less, but we guess that usually not by a lot
+        let mut flex_items = Vec::with_capacity(self.children.len());
+
+        // Absolutely-positioned children of the flex container may be interleaved
+        // with flex items. We need to preserve their relative order for correct painting order,
+        // which is the order of `Fragment`s in this function’s return value.
+        let original_order_with_absolutely_positioned = self
+            .children
+            .iter()
+            .enumerate()
+            .map(|(tree_rank, arcrefcell)| {
+                let borrowed = arcrefcell.borrow_mut();
+                match &*borrowed {
+                    FlexLevelBox::OutOfFlowAbsolutelyPositionedBox(absolutely_positioned) => {
+                        Ok(absolutely_positioned.clone())
+                    },
+                    FlexLevelBox::FlexItem(_) => {
+                        let item = AtomicRefMut::map(borrowed, |child| match child {
+                            FlexLevelBox::FlexItem(item) => item,
+                            _ => unreachable!(),
+                        });
+                        flex_items.push((tree_rank, item));
+                        Err(())
+                    },
+                }
+            })
+            .collect::<Vec<_>>();
+
+        let mut content_block_size_option_dance = None;
+        let fragments =
+            positioning_context.adjust_static_positions(tree_rank, |positioning_context| {
+                let (mut flex_item_fragments, content_block_size) = layout(
+                    layout_context,
+                    positioning_context,
+                    containing_block,
+                    flex_items
+                        .iter_mut()
+                        .map(|(tree_rank, child)| (*tree_rank, &mut **child)),
+                );
+                content_block_size_option_dance = Some(content_block_size);
+                let fragments = original_order_with_absolutely_positioned
+                    .into_iter()
+                    .enumerate()
+                    .map(|(tree_rank, child_as_abspos)| match child_as_abspos {
+                        Err(()) => {
+                            // The `()` here is a place-holder for a flex item.
+                            // The `flex_item_fragments` iterator yields one fragment
+                            // per flex item, in the original order.
+                            Fragment::Box(flex_item_fragments.next().unwrap())
+                        },
+                        Ok(absolutely_positioned) => {
+                            let position = absolutely_positioned
+                                .borrow()
+                                .context
+                                .style()
+                                .clone_position();
+                            let hoisted_box = AbsolutelyPositionedBox::to_hoisted(
+                                absolutely_positioned,
+                                Vec2::zero(),
+                                tree_rank,
+                                containing_block,
+                            );
+                            let hoisted_fragment = hoisted_box.fragment.clone();
+                            positioning_context.push(hoisted_box);
+                            Fragment::AbsoluteOrFixedPositioned(AbsoluteOrFixedPositionedFragment {
+                                hoisted_fragment,
+                                position,
+                            })
+                        },
+                    })
+                    .collect::<Vec<_>>();
+                // There should be no more flex items
+                assert!(flex_item_fragments.next().is_none());
+                fragments
+            });
+
         IndependentLayout {
-            fragments: Vec::new(),
-            content_block_size: Length::zero(),
+            fragments,
+            content_block_size: content_block_size_option_dance.unwrap(),
         }
     }
 }
+
+/// Return one fragment for each flex item, in the provided order, and the used block-size.
+fn layout<'context, 'boxes>(
+    layout_context: &LayoutContext,
+    positioning_context: &mut PositioningContext,
+    containing_block: &ContainingBlock,
+    flex_item_boxes: impl Iterator<Item = (usize, &'boxes mut IndependentFormattingContext)>,
+) -> (impl Iterator<Item = BoxFragment>, Length) {
+    // FIXME: get actual min/max cross size for the flex container.
+    // We have access to style for the flex container in `containing_block.style`,
+    // but resolving percentages there requires access
+    // to the flex container’s own containing block which we don’t have.
+    // For now, use incorrect values instead of panicking:
+    let container_min_cross_size = Length::zero();
+    let container_max_cross_size = None;
+
+    let flex_container_position_style = containing_block.style.get_position();
+    let flex_wrap = flex_container_position_style.flex_wrap;
+    let flex_direction = flex_container_position_style.flex_direction;
+
+    // Column flex containers are not fully implemented yet,
+    // so give a different layout instead of panicking.
+    // FIXME: implement `todo!`s for FlexAxis::Column below, and remove this
+    let flex_direction = match flex_direction {
+        FlexDirection::Row | FlexDirection::Column => FlexDirection::Row,
+        FlexDirection::RowReverse | FlexDirection::ColumnReverse => FlexDirection::RowReverse,
+    };
+
+    let container_is_single_line = match containing_block.style.get_position().flex_wrap {
+        FlexWrap::Nowrap => true,
+        FlexWrap::Wrap | FlexWrap::WrapReverse => false,
+    };
+    let flex_axis = FlexAxis::from(flex_direction);
+    let flex_wrap_reverse = match flex_wrap {
+        FlexWrap::Nowrap | FlexWrap::Wrap => false,
+        FlexWrap::WrapReverse => true,
+    };
+    let mut flex_context = FlexContext {
+        layout_context,
+        positioning_context,
+        containing_block,
+        container_min_cross_size,
+        container_max_cross_size,
+        container_is_single_line,
+        flex_axis,
+        main_start_cross_start_sides_are: MainStartCrossStart::from(
+            flex_direction,
+            flex_wrap_reverse,
+        ),
+        // https://drafts.csswg.org/css-flexbox/#definite-sizes
+        container_definite_inner_size: flex_axis.vec2_to_flex_relative(Vec2 {
+            inline: Some(containing_block.inline_size),
+            block: containing_block.block_size.non_auto(),
+        }),
+    };
+
+    let mut flex_items = flex_item_boxes
+        .map(|(tree_rank, box_)| FlexItem::new(&flex_context, box_, tree_rank))
+        .collect::<Vec<_>>();
+
+    // “Determine the main size of the flex container”
+    // https://drafts.csswg.org/css-flexbox/#algo-main-container
+    let container_main_size = match flex_axis {
+        FlexAxis::Row => containing_block.inline_size,
+        FlexAxis::Column => {
+            // FIXME “using the rules of the formatting context in which it participates”
+            // but if block-level with `block-size: max-auto` that requires
+            // layout of the content to be fully done:
+            // https://github.com/w3c/csswg-drafts/issues/4905
+            // Gecko reportedly uses `block-size: fit-content` in this case
+            // (which requires running another pass of the "full" layout algorithm)
+            todo!()
+            // Note: this panic shouldn’t happen since the start of `FlexContainer::layout`
+            // forces `FlexAxis::Row`.
+        },
+    };
+
+    // “Resolve the flexible lengths of all the flex items to find their *used main size*.”
+    // https://drafts.csswg.org/css-flexbox/#algo-flex
+    let flex_lines = collect_flex_lines(
+        &mut flex_context,
+        container_main_size,
+        &mut flex_items,
+        |flex_context, mut line| line.layout(flex_context, container_main_size),
+    );
+
+    // https://drafts.csswg.org/css-flexbox/#algo-cross-container
+    let container_cross_size = flex_context
+        .container_definite_inner_size
+        .cross
+        .unwrap_or_else(|| {
+            flex_lines
+                .iter()
+                .map(|line| line.cross_size)
+                .sum::<Length>()
+        })
+        .clamp_between_extremums(
+            flex_context.container_min_cross_size,
+            flex_context.container_max_cross_size,
+        );
+
+    // https://drafts.csswg.org/css-flexbox/#algo-line-align
+    let mut cross_start_position_cursor = Length::zero();
+    let line_cross_start_positions = flex_lines
+        .iter()
+        .map(|line| {
+            // FIXME: “Align all flex lines per `align-content`.”
+            // For now we hard-code the behavior of `align-content: flex-start`.
+            let cross_start = cross_start_position_cursor;
+            let cross_end = cross_start + line.cross_size;
+            cross_start_position_cursor = cross_end;
+            cross_start
+        })
+        .collect::<Vec<_>>();
+
+    let content_block_size = match flex_context.flex_axis {
+        FlexAxis::Row => {
+            // `container_main_size` ends up unused here but in this case that’s fine
+            // since it was already excatly the one decided by the outer formatting context.
+            container_cross_size
+        },
+        FlexAxis::Column => {
+            // FIXME: `container_cross_size` ends up unused here, which is a bug.
+            // It is meant to be the used inline-size, but the parent formatting context
+            // has already decided a possibly-different used inline-size.
+            // The spec is missing something to resolve this conflict:
+            // https://github.com/w3c/csswg-drafts/issues/5190
+            // And we’ll need to change the signature of `IndependentFormattingContext::layout`
+            // to allow the inner formatting context to “negociate” a used inline-size
+            // with the outer one somehow.
+            container_main_size
+        },
+    };
+    let fragments = flex_lines
+        .into_iter()
+        .zip(line_cross_start_positions)
+        .flat_map(move |(mut line, line_cross_start_position)| {
+            let flow_relative_line_position = match (flex_axis, flex_wrap_reverse) {
+                (FlexAxis::Row, false) => Vec2 {
+                    block: line_cross_start_position,
+                    inline: Length::zero(),
+                },
+                (FlexAxis::Row, true) => Vec2 {
+                    block: container_cross_size - line_cross_start_position - line.cross_size,
+                    inline: Length::zero(),
+                },
+                (FlexAxis::Column, false) => Vec2 {
+                    block: Length::zero(),
+                    inline: line_cross_start_position,
+                },
+                (FlexAxis::Column, true) => Vec2 {
+                    block: Length::zero(),
+                    inline: container_cross_size - line_cross_start_position - line.cross_size,
+                },
+            };
+            for fragment in &mut line.item_fragments {
+                fragment.content_rect.start_corner += &flow_relative_line_position
+            }
+            line.item_fragments
+        })
+        .into_iter();
+    (fragments, content_block_size)
+}
+
+impl<'a> FlexItem<'a> {
+    fn new(
+        flex_context: &FlexContext,
+        box_: &'a mut IndependentFormattingContext,
+        tree_rank: usize,
+    ) -> Self {
+        let containing_block = flex_context.containing_block;
+        let box_style = box_.style();
+
+        // https://drafts.csswg.org/css-writing-modes/#orthogonal-flows
+        assert_eq!(
+            containing_block.style.writing_mode, box_style.writing_mode,
+            "Mixed writing modes are not supported yet"
+        );
+
+        let container_is_horizontal = containing_block.style.writing_mode.is_horizontal();
+        let item_is_horizontal = box_style.writing_mode.is_horizontal();
+        let item_is_orthogonal = item_is_horizontal != container_is_horizontal;
+        let container_is_row = flex_context.flex_axis == FlexAxis::Row;
+        let cross_axis_is_item_block_axis = container_is_row ^ item_is_orthogonal;
+
+        let pbm = box_style.padding_border_margin(containing_block);
+        let content_box_size = box_style.content_box_size(containing_block, &pbm);
+        let max_size = box_style.content_max_box_size(containing_block, &pbm);
+        let min_size = box_style.content_min_box_size(containing_block, &pbm);
+
+        let min_size = min_size.auto_is(|| automatic_min_size(box_));
+        let margin_auto_is_zero = pbm.margin.auto_is(Length::zero);
+
+        let content_box_size = flex_context.vec2_to_flex_relative(content_box_size);
+        let content_max_size = flex_context.vec2_to_flex_relative(max_size);
+        let content_min_size = flex_context.vec2_to_flex_relative(min_size);
+        let margin_auto_is_zero = flex_context.sides_to_flex_relative(margin_auto_is_zero);
+        let margin = flex_context.sides_to_flex_relative(pbm.margin);
+        let padding = flex_context.sides_to_flex_relative(pbm.padding);
+        let border = flex_context.sides_to_flex_relative(pbm.border);
+
+        let padding_border = padding.sum_by_axis() + border.sum_by_axis();
+        let pbm_auto_is_zero = padding_border + margin_auto_is_zero.sum_by_axis();
+
+        let flex_base_size = flex_base_size(
+            flex_context,
+            box_,
+            cross_axis_is_item_block_axis,
+            content_box_size,
+            padding_border,
+        );
+
+        let hypothetical_main_size =
+            flex_base_size.clamp_between_extremums(content_min_size.main, content_max_size.main);
+
+        Self {
+            box_,
+            tree_rank,
+            content_box_size,
+            content_min_size,
+            content_max_size,
+            padding,
+            border,
+            margin,
+            pbm_auto_is_zero,
+            flex_base_size,
+            hypothetical_main_size,
+        }
+    }
+}
+
+/// https://drafts.csswg.org/css-flexbox/#min-size-auto
+fn automatic_min_size(_box: &IndependentFormattingContext) -> Length {
+    // FIMXE: implement the actual algorithm
+    Length::zero() // Give an incorrect value rather than panicking
+}
+
+/// https://drafts.csswg.org/css-flexbox/#algo-main-item
+fn flex_base_size(
+    flex_context: &FlexContext,
+    flex_item: &mut IndependentFormattingContext,
+    cross_axis_is_item_block_axis: bool,
+    content_box_size: FlexRelativeVec2<LengthOrAuto>,
+    padding_border_sums: FlexRelativeVec2<Length>,
+) -> Length {
+    let used_flex_basis = match &flex_item.style().get_position().flex_basis {
+        FlexBasis::Content => FlexBasis::Content,
+        FlexBasis::Size(Size::LengthPercentage(length_percentage)) => {
+            let apply_box_sizing = |length: Length| {
+                match flex_item.style().get_position().box_sizing {
+                    BoxSizing::ContentBox => length,
+                    BoxSizing::BorderBox => {
+                        // This may make `length` negative,
+                        // but it will be clamped in the hypothetical main size
+                        length - padding_border_sums.main
+                    },
+                }
+            };
+            // “For example, percentage values of flex-basis are resolved
+            //  against the flex item’s containing block (i.e. its flex container);”
+            match flex_context.container_definite_inner_size.main {
+                Some(container_definite_main_size) => {
+                    let length = length_percentage
+                        .0
+                        .percentage_relative_to(container_definite_main_size);
+                    FlexBasis::Size(apply_box_sizing(length))
+                },
+                None => {
+                    if let Some(length) = length_percentage.0.to_length() {
+                        FlexBasis::Size(apply_box_sizing(length))
+                    } else {
+                        // “and if that containing block’s size is indefinite,
+                        //  the used value for `flex-basis` is `content`.”
+                        // https://drafts.csswg.org/css-flexbox/#flex-basis-property
+                        FlexBasis::Content
+                    }
+                },
+            }
+        },
+        FlexBasis::Size(Size::Auto) => {
+            // “When specified on a flex item, the `auto` keyword retrieves
+            //  the value of the main size property as the used `flex-basis`.”
+            match content_box_size.main {
+                LengthOrAuto::LengthPercentage(length) => FlexBasis::Size(length),
+                // “If that value is itself `auto`, then the used value is `content`.”
+                LengthOrAuto::Auto => FlexBasis::Content,
+            }
+        },
+    };
+
+    // NOTE: at this point the flex basis is either `content` or a definite length.
+    // However when we add support for additional values for `width` and `height`
+    // from https://drafts.csswg.org/css-sizing/#preferred-size-properties,
+    // it could have those values too.
+
+    match used_flex_basis {
+        FlexBasis::Size(length) => {
+            // Case A: definite flex basis
+            length
+        },
+        FlexBasis::Content => {
+            // FIXME: implement cases B, C, D.
+
+            // Case E: everything else
+            // “treating a value of content as max-content.”
+            if cross_axis_is_item_block_axis {
+                // The main axis is the inline axis
+                flex_item
+                    .inline_content_sizes(flex_context.layout_context)
+                    .max_content
+            } else {
+                // FIXME: block-axis content sizing requires another pass
+                // of "full" layout
+                todo!()
+                // Note: this panic shouldn’t happen since the start of `FlexContainer::layout`
+                // forces `FlexAxis::Row` and the `writing-mode` property is disabled.
+            }
+        },
+    }
+}
+
+// “Collect flex items into flex lines”
+// https://drafts.csswg.org/css-flexbox/#algo-line-break
+fn collect_flex_lines<'items, LineResult>(
+    flex_context: &mut FlexContext,
+    container_main_size: Length,
+    mut items: &'items mut [FlexItem<'items>],
+    mut each: impl FnMut(&mut FlexContext, FlexLine<'items>) -> LineResult,
+) -> Vec<LineResult> {
+    if flex_context.container_is_single_line {
+        let line = FlexLine {
+            outer_hypothetical_main_sizes_sum: items
+                .iter()
+                .map(|item| item.hypothetical_main_size + item.pbm_auto_is_zero.main)
+                .sum(),
+            items,
+        };
+        return vec![each(flex_context, line)];
+    } else {
+        let mut lines = Vec::new();
+        let mut line_size_so_far = Length::zero();
+        let mut line_so_far_is_empty = true;
+        let mut index = 0;
+        while let Some(item) = items.get(index) {
+            let item_size = item.hypothetical_main_size + item.pbm_auto_is_zero.main;
+            let line_size_would_be = line_size_so_far + item_size;
+            let item_fits = line_size_would_be <= container_main_size;
+            if item_fits || line_so_far_is_empty {
+                line_size_so_far = line_size_would_be;
+                line_so_far_is_empty = false;
+                index += 1;
+            } else {
+                // We found something that doesn’t fit. This line ends *before* this item.
+                let (line_items, rest) = items.split_at_mut(index);
+                let line = FlexLine {
+                    items: line_items,
+                    outer_hypothetical_main_sizes_sum: line_size_so_far,
+                };
+                items = rest;
+                lines.push(each(flex_context, line));
+                // The next line has this item.
+                line_size_so_far = item_size;
+                index = 1;
+            }
+        }
+        // The last line is added even without finding an item that doesn’t fit
+        let line = FlexLine {
+            items,
+            outer_hypothetical_main_sizes_sum: line_size_so_far,
+        };
+        lines.push(each(flex_context, line));
+        lines
+    }
+}
+
+impl FlexLine<'_> {
+    fn layout(
+        &mut self,
+        flex_context: &mut FlexContext,
+        container_main_size: Length,
+    ) -> FlexLineLayoutResult {
+        let (item_used_main_sizes, remaining_free_space) =
+            self.resolve_flexible_lengths(container_main_size);
+
+        // https://drafts.csswg.org/css-flexbox/#algo-cross-item
+        let item_layout_results = self
+            .items
+            .iter_mut()
+            .zip(&item_used_main_sizes)
+            .map(|(item, &used_main_size)| item.layout(used_main_size, flex_context, None))
+            .collect::<Vec<_>>();
+
+        // https://drafts.csswg.org/css-flexbox/#algo-cross-line
+        let line_cross_size = self.cross_size(&item_layout_results, &flex_context);
+        let line_size = FlexRelativeVec2 {
+            main: container_main_size,
+            cross: line_cross_size,
+        };
+
+        // FIXME: Handle `align-content: stretch`
+        // https://drafts.csswg.org/css-flexbox/#algo-line-stretch
+
+        // FIXME: Collapse `visibility: collapse` items
+        // This involves “restart layout from the beginning” with a modified second round,
+        // which will make structuring the code… interesting.
+        // https://drafts.csswg.org/css-flexbox/#algo-visibility
+
+        // Determine the used cross size of each flex item
+        // https://drafts.csswg.org/css-flexbox/#algo-stretch
+        // FIXME: For now we hard-code the behavior for `align-self: stretch`
+        let (item_used_cross_sizes, item_fragments): (Vec<_>, Vec<_>) = self
+            .items
+            .iter_mut()
+            .zip(item_layout_results)
+            .zip(&item_used_main_sizes)
+            .map(|((item, mut item_result), &used_main_size)| {
+                let has_stretch_auto = true; // FIXME: use the property
+                let cross_size = if has_stretch_auto &&
+                    item.content_box_size.cross.is_auto() &&
+                    !(item.margin.cross_start.is_auto() || item.margin.cross_end.is_auto())
+                {
+                    (line_cross_size - item.pbm_auto_is_zero.cross).clamp_between_extremums(
+                        item.content_min_size.cross,
+                        item.content_max_size.cross,
+                    )
+                } else {
+                    item_result.hypothetical_cross_size
+                };
+                if has_stretch_auto {
+                    // “If the flex item has `align-self: stretch`, redo layout for its contents,
+                    //  treating this used size as its definite cross size
+                    //  so that percentage-sized children can be resolved.”
+                    item_result = item.layout(used_main_size, flex_context, Some(cross_size));
+                }
+                flex_context
+                    .positioning_context
+                    .append(item_result.positioning_context);
+                (cross_size, item_result.fragments)
+            })
+            .unzip();
+
+        // Distribute any remaining free space
+        // https://drafts.csswg.org/css-flexbox/#algo-main-align
+        let item_main_margins = self.resolve_auto_main_margins(remaining_free_space);
+
+        // FIXME: “Align the items along the main-axis per justify-content.”
+        // For now we hard-code `justify-content` to `flex-start`.
+
+        // https://drafts.csswg.org/css-flexbox/#algo-cross-margins
+        let item_cross_margins = self.items.iter().zip(&item_used_cross_sizes).map(
+            |(item, &item_cross_content_size)| {
+                item.resolve_auto_cross_margins(
+                    &flex_context,
+                    line_cross_size,
+                    item_cross_content_size,
+                )
+            },
+        );
+
+        let item_margins = item_main_margins
+            .zip(item_cross_margins)
+            .map(
+                |((main_start, main_end), (cross_start, cross_end))| FlexRelativeSides {
+                    main_start,
+                    main_end,
+                    cross_start,
+                    cross_end,
+                },
+            )
+            .collect::<Vec<_>>();
+        // https://drafts.csswg.org/css-flexbox/#algo-main-align
+        let items_content_main_start_positions =
+            self.align_along_main_axis(&item_used_main_sizes, &item_margins);
+
+        // https://drafts.csswg.org/css-flexbox/#algo-cross-align
+        let item_content_cross_start_posititons = self
+            .items
+            .iter()
+            .zip(&item_margins)
+            .map(|(item, margin)| item.align_along_cross_axis(margin));
+
+        let item_fragments = self
+            .items
+            .iter()
+            .zip(item_fragments)
+            .zip(
+                item_used_main_sizes
+                    .iter()
+                    .zip(&item_used_cross_sizes)
+                    .map(|(&main, &cross)| FlexRelativeVec2 { main, cross })
+                    .zip(
+                        items_content_main_start_positions
+                            .zip(item_content_cross_start_posititons)
+                            .map(|(main, cross)| FlexRelativeVec2 { main, cross }),
+                    )
+                    .map(|(size, start_corner)| FlexRelativeRect { size, start_corner }),
+            )
+            .zip(&item_margins)
+            .map(|(((item, fragments), content_rect), margin)| {
+                let content_rect = flex_context.rect_to_flow_relative(line_size, content_rect);
+                let margin = flex_context.sides_to_flow_relative(*margin);
+                let collapsed_margin = CollapsedBlockMargins::from_margin(&margin);
+                BoxFragment::new(
+                    item.box_.tag(),
+                    item.box_.style().clone(),
+                    fragments,
+                    content_rect,
+                    flex_context.sides_to_flow_relative(item.padding),
+                    flex_context.sides_to_flow_relative(item.border),
+                    margin,
+                    collapsed_margin,
+                )
+            })
+            .collect();
+        FlexLineLayoutResult {
+            cross_size: line_cross_size,
+            item_fragments,
+        }
+    }
+
+    /// Return the *main size* of each item, and the line’s remainaing free space
+    /// https://drafts.csswg.org/css-flexbox/#resolve-flexible-lengths
+    fn resolve_flexible_lengths(&self, container_main_size: Length) -> (Vec<Length>, Length) {
+        let mut frozen = vec![false; self.items.len()];
+        let mut target_main_sizes_vec = self
+            .items
+            .iter()
+            .map(|item| item.flex_base_size)
+            .collect::<Vec<_>>();
+
+        // Using `Cell`s reconciles mutability with multiple borrows in closures
+        let target_main_sizes = Cell::from_mut(&mut *target_main_sizes_vec).as_slice_of_cells();
+        let frozen = Cell::from_mut(&mut *frozen).as_slice_of_cells();
+        let frozen_count = Cell::new(0);
+
+        let grow = self.outer_hypothetical_main_sizes_sum < container_main_size;
+        let flex_factor = |item: &FlexItem| {
+            let position_style = item.box_.style().get_position();
+            if grow {
+                position_style.flex_grow.0
+            } else {
+                position_style.flex_shrink.0
+            }
+        };
+        let items = || self.items.iter().zip(target_main_sizes).zip(frozen);
+
+        // “Size inflexible items”
+        for ((item, target_main_size), frozen) in items() {
+            let is_inflexible = flex_factor(item) == 0. ||
+                if grow {
+                    item.flex_base_size > item.hypothetical_main_size
+                } else {
+                    item.flex_base_size < item.hypothetical_main_size
+                };
+            if is_inflexible {
+                frozen_count.set(frozen_count.get() + 1);
+                frozen.set(true);
+                target_main_size.set(item.hypothetical_main_size);
+            }
+        }
+
+        let check_for_flexible_items = || frozen_count.get() < self.items.len();
+        let free_space = || {
+            container_main_size -
+                items()
+                    .map(|((item, target_main_size), frozen)| {
+                        item.pbm_auto_is_zero.main +
+                            if frozen.get() {
+                                target_main_size.get()
+                            } else {
+                                item.flex_base_size
+                            }
+                    })
+                    .sum()
+        };
+        // https://drafts.csswg.org/css-flexbox/#initial-free-space
+        let initial_free_space = free_space();
+        let unfrozen_items = || {
+            items().filter_map(|(item_and_target_main_size, frozen)| {
+                if !frozen.get() {
+                    Some(item_and_target_main_size)
+                } else {
+                    None
+                }
+            })
+        };
+        loop {
+            // https://drafts.csswg.org/css-flexbox/#remaining-free-space
+            let mut remaining_free_space = free_space();
+            if !check_for_flexible_items() {
+                return (target_main_sizes_vec, remaining_free_space);
+            }
+            let unfrozen_items_flex_factor_sum: f32 =
+                unfrozen_items().map(|(item, _)| flex_factor(item)).sum();
+            // FIXME: I (Simon) transcribed the spec but I don’t yet understand why this algorithm
+            if unfrozen_items_flex_factor_sum < 1. {
+                let multiplied = initial_free_space * unfrozen_items_flex_factor_sum;
+                if multiplied.abs() < remaining_free_space.abs() {
+                    remaining_free_space = multiplied
+                }
+            }
+
+            // “Distribute free space proportional to the flex factors.”
+            // FIXME: is it a problem if floating point precision errors accumulate
+            // and we get not-quite-zero remaining free space when we should get zero here?
+            if remaining_free_space != Length::zero() {
+                if grow {
+                    for (item, target_main_size) in unfrozen_items() {
+                        let grow_factor = item.box_.style().get_position().flex_grow.0;
+                        let ratio = grow_factor / unfrozen_items_flex_factor_sum;
+                        target_main_size.set(item.flex_base_size + remaining_free_space * ratio);
+                    }
+                } else {
+                    // https://drafts.csswg.org/css-flexbox/#scaled-flex-shrink-factor
+                    let scaled_shrink_factor = |item: &FlexItem| {
+                        let shrink_factor = item.box_.style().get_position().flex_shrink.0;
+                        item.flex_base_size * shrink_factor
+                    };
+                    let scaled_shrink_factors_sum: Length = unfrozen_items()
+                        .map(|(item, _)| scaled_shrink_factor(item))
+                        .sum();
+                    for (item, target_main_size) in unfrozen_items() {
+                        let ratio = scaled_shrink_factor(item) / scaled_shrink_factors_sum;
+                        target_main_size
+                            .set(item.flex_base_size - remaining_free_space.abs() * ratio);
+                    }
+                }
+            }
+
+            // “Fix min/max violations.”
+            let violation = |(item, target_main_size): (&FlexItem, &Cell<Length>)| {
+                let size = target_main_size.get();
+                let clamped = size.clamp_between_extremums(
+                    item.content_min_size.main,
+                    item.content_max_size.main,
+                );
+                clamped - size
+            };
+
+            // “Freeze over-flexed items.”
+            let total_violation: Length = unfrozen_items().map(violation).sum();
+            if total_violation == Length::zero() {
+                // “Freeze all items.”
+                // Return instead, as that’s what the next loop iteration would do.
+                let remaining_free_space =
+                    container_main_size - target_main_sizes_vec.iter().cloned().sum();
+                return (target_main_sizes_vec, remaining_free_space);
+            } else if total_violation > Length::zero() {
+                // “Freeze all the items with min violations.”
+                // “If the item’s target main size was made larger by [clamping],
+                //  it’s a min violation.”
+                for (item_and_target_main_size, frozen) in items() {
+                    if violation(item_and_target_main_size) > Length::zero() {
+                        frozen_count.set(frozen_count.get() + 1);
+                        frozen.set(true);
+                    }
+                }
+            } else {
+                // Negative total violation
+                // “Freeze all the items with max violations.”
+                // “If the item’s target main size was made smaller by [clamping],
+                //  it’s a max violation.”
+                for (item_and_target_main_size, frozen) in items() {
+                    if violation(item_and_target_main_size) < Length::zero() {
+                        frozen_count.set(frozen_count.get() + 1);
+                        frozen.set(true);
+                    }
+                }
+            }
+        }
+    }
+}
+
+impl<'a> FlexItem<'a> {
+    // Return the hypothetical cross size together with laid out contents of the fragment.
+    // https://drafts.csswg.org/css-flexbox/#algo-cross-item
+    // “performing layout as if it were an in-flow block-level box
+    //  with the used main size and the given available space, treating `auto` as `fit-content`.”
+    fn layout(
+        &mut self,
+        used_main_size: Length,
+        flex_context: &mut FlexContext,
+        used_cross_size_override: Option<Length>,
+    ) -> FlexItemLayoutResult {
+        let mut positioning_context = PositioningContext::new_for_rayon(
+            flex_context
+                .positioning_context
+                .collects_for_nearest_positioned_ancestor(),
+        );
+        match flex_context.flex_axis {
+            FlexAxis::Row => {
+                // The main axis is the container’s inline axis
+
+                // https://drafts.csswg.org/css-writing-modes/#orthogonal-flows
+                assert_eq!(
+                    flex_context.containing_block.style.writing_mode,
+                    self.box_.style().writing_mode,
+                    "Mixed writing modes are not supported yet"
+                );
+                // … and also the item’s inline axis.
+
+                match self.box_ {
+                    IndependentFormattingContext::Replaced(replaced) => {
+                        let pbm = replaced
+                            .style
+                            .padding_border_margin(flex_context.containing_block);
+                        let size = replaced.contents.used_size_as_if_inline_element(
+                            flex_context.containing_block,
+                            &replaced.style,
+                            &pbm,
+                        );
+                        let cross_size = flex_context.vec2_to_flex_relative(size.clone()).cross;
+                        let fragments = replaced.contents.make_fragments(&replaced.style, size);
+                        FlexItemLayoutResult {
+                            hypothetical_cross_size: cross_size,
+                            fragments,
+                            positioning_context,
+                        }
+                    },
+                    IndependentFormattingContext::NonReplaced(non_replaced) => {
+                        let block_size = match used_cross_size_override {
+                            Some(s) => LengthOrAuto::LengthPercentage(s),
+                            None => self.content_box_size.cross,
+                        };
+                        let item_as_containing_block = ContainingBlock {
+                            inline_size: used_main_size,
+                            block_size,
+                            style: &non_replaced.style,
+                        };
+                        let IndependentLayout {
+                            fragments,
+                            content_block_size,
+                        } = non_replaced.layout(
+                            flex_context.layout_context,
+                            &mut positioning_context,
+                            &item_as_containing_block,
+                            self.tree_rank,
+                        );
+                        FlexItemLayoutResult {
+                            hypothetical_cross_size: content_block_size,
+                            fragments,
+                            positioning_context,
+                        }
+                    },
+                }
+            },
+            FlexAxis::Column => {
+                todo!()
+                // Note: this panic shouldn’t happen since the start of `FlexContainer::layout`
+                // forces `FlexAxis::Row`.
+            },
+        }
+    }
+}
+
+impl<'items> FlexLine<'items> {
+    /// https://drafts.csswg.org/css-flexbox/#algo-cross-line
+    fn cross_size(
+        &self,
+        item_layout_results: &[FlexItemLayoutResult],
+        flex_context: &FlexContext,
+    ) -> Length {
+        if flex_context.container_is_single_line {
+            if let Some(size) = flex_context.container_definite_inner_size.cross {
+                return size;
+            }
+        }
+        let outer_hypothetical_cross_sizes =
+            item_layout_results
+                .iter()
+                .zip(&*self.items)
+                .map(|(item_result, item)| {
+                    item_result.hypothetical_cross_size + item.pbm_auto_is_zero.cross
+                });
+        // FIXME: add support for `align-self: baseline`
+        // and computing the baseline of flex items.
+        // https://drafts.csswg.org/css-flexbox/#baseline-participation
+        let largest = outer_hypothetical_cross_sizes.fold(Length::zero(), Length::max);
+        if flex_context.container_is_single_line {
+            largest.clamp_between_extremums(
+                flex_context.container_min_cross_size,
+                flex_context.container_max_cross_size,
+            )
+        } else {
+            largest
+        }
+    }
+
+    // Return the main-start and main-end margin of each item in the line,
+    // with `auto` values resolved.
+    fn resolve_auto_main_margins(
+        &self,
+        remaining_free_space: Length,
+    ) -> impl Iterator<Item = (Length, Length)> + '_ {
+        let each_auto_margin = if remaining_free_space > Length::zero() {
+            let auto_margins_count = self
+                .items
+                .iter()
+                .map(|item| {
+                    item.margin.main_start.is_auto() as u32 + item.margin.main_end.is_auto() as u32
+                })
+                .sum::<u32>();
+            if auto_margins_count > 0 {
+                remaining_free_space / auto_margins_count as f32
+            } else {
+                Length::zero()
+            }
+        } else {
+            Length::zero()
+        };
+        self.items.iter().map(move |item| {
+            (
+                item.margin.main_start.auto_is(|| each_auto_margin),
+                item.margin.main_end.auto_is(|| each_auto_margin),
+            )
+        })
+    }
+
+    /// Return the coordinate of the main-start side of the content area of each item
+    fn align_along_main_axis<'a>(
+        &'a self,
+        item_used_main_sizes: &'a [Length],
+        item_margins: &'a [FlexRelativeSides<Length>],
+    ) -> impl Iterator<Item = Length> + 'a {
+        // “Align the items along the main-axis”
+        // FIXME: “per justify-content.”
+        // For now we hard-code the behavior for `justify-content: flex-start`.
+        let mut main_position_cursor = Length::zero();
+        self.items
+            .iter()
+            .zip(item_used_main_sizes)
+            .zip(item_margins)
+            .map(move |((item, &main_content_size), margin)| {
+                main_position_cursor +=
+                    margin.main_start + item.border.main_start + item.padding.main_start;
+                let content_main_start_position = main_position_cursor;
+                main_position_cursor += main_content_size +
+                    item.padding.main_end +
+                    item.border.main_end +
+                    margin.main_end;
+                content_main_start_position
+            })
+    }
+}
+
+impl FlexItem<'_> {
+    /// Return the cross-start and cross-end margin, with `auto` values resolved.
+    /// https://drafts.csswg.org/css-flexbox/#algo-cross-margins
+    fn resolve_auto_cross_margins(
+        &self,
+        flex_context: &FlexContext,
+        line_cross_size: Length,
+        item_cross_content_size: Length,
+    ) -> (Length, Length) {
+        let auto_count = match (self.margin.cross_start, self.margin.cross_end) {
+            (LengthOrAuto::LengthPercentage(start), LengthOrAuto::LengthPercentage(end)) => {
+                return (start, end);
+            },
+            (LengthOrAuto::Auto, LengthOrAuto::Auto) => 2.,
+            _ => 1.,
+        };
+        let outer_size = self.pbm_auto_is_zero.cross + item_cross_content_size;
+        let available = line_cross_size - outer_size;
+        let start;
+        let end;
+        if available > Length::zero() {
+            let each_auto_margin = available / auto_count;
+            start = self.margin.cross_start.auto_is(|| each_auto_margin);
+            end = self.margin.cross_end.auto_is(|| each_auto_margin);
+        } else {
+            // “the block-start or inline-start margin (whichever is in the cross axis)”
+            // This margin is the cross-end on iff `flex-wrap` is `wrap-reverse`,
+            // cross-start otherwise.
+            // We know this because:
+            // https://drafts.csswg.org/css-flexbox/#flex-wrap-property
+            // “For the values that are not wrap-reverse,
+            //  the cross-start direction is equivalent to
+            //  either the inline-start or block-start direction of the current writing mode
+            //  (whichever is in the cross axis)
+            //  and the cross-end direction is the opposite direction of cross-start.
+            //  When flex-wrap is wrap-reverse,
+            //  the cross-start and cross-end directions are swapped.”
+            let flex_wrap = flex_context.containing_block.style.get_position().flex_wrap;
+            let flex_wrap_reverse = match flex_wrap {
+                FlexWrap::Nowrap | FlexWrap::Wrap => false,
+                FlexWrap::WrapReverse => true,
+            };
+            // “if the block-start or inline-start margin (whichever is in the cross axis) is auto,
+            //  set it to zero. Set the opposite margin so that the outer cross size of the item
+            //  equals the cross size of its flex line.”
+            if flex_wrap_reverse {
+                start = self.margin.cross_start.auto_is(|| available);
+                end = self.margin.cross_end.auto_is(Length::zero);
+            } else {
+                start = self.margin.cross_start.auto_is(Length::zero);
+                end = self.margin.cross_end.auto_is(|| available);
+            }
+        }
+        (start, end)
+    }
+
+    /// Return the coordinate of the cross-start side of the content area
+    fn align_along_cross_axis(&self, margin: &FlexRelativeSides<Length>) -> Length {
+        let outer_cross_start =
+            if self.margin.cross_start.is_auto() || self.margin.cross_end.is_auto() {
+                Length::zero()
+            } else {
+                // FIXME: “Align all flex items along the cross-axis per `align-self`”
+                // For now we hard-code the behavior of `stretch`:
+                Length::zero()
+            };
+        outer_cross_start + margin.cross_start + self.border.cross_start + self.padding.cross_start
+    }
+}
diff --git a/components/layout_2020/flexbox/mod.rs b/components/layout_2020/flexbox/mod.rs
index 5dd0c476727..f286acdd690 100644
--- a/components/layout_2020/flexbox/mod.rs
+++ b/components/layout_2020/flexbox/mod.rs
@@ -5,9 +5,9 @@
 use crate::cell::ArcRefCell;
 use crate::formatting_contexts::IndependentFormattingContext;
 use crate::positioned::AbsolutelyPositionedBox;
-use crate::sizing::ContentSizes;
 
 mod construct;
+mod geom;
 mod layout;
 
 #[derive(Debug, Serialize)]
@@ -20,9 +20,3 @@ pub(crate) enum FlexLevelBox {
     FlexItem(IndependentFormattingContext),
     OutOfFlowAbsolutelyPositionedBox(ArcRefCell<AbsolutelyPositionedBox>),
 }
-
-impl FlexContainer {
-    pub fn inline_content_sizes(&self) -> ContentSizes {
-        unimplemented!()
-    }
-}
diff --git a/components/layout_2020/flow/mod.rs b/components/layout_2020/flow/mod.rs
index de22f1a427d..9af17e0a4b1 100644
--- a/components/layout_2020/flow/mod.rs
+++ b/components/layout_2020/flow/mod.rs
@@ -138,18 +138,18 @@ impl BlockContainer {
     pub(super) fn inline_content_sizes(
         &self,
         layout_context: &LayoutContext,
-        containing_block_writing_mode: WritingMode,
+        writing_mode: WritingMode,
     ) -> ContentSizes {
         match &self {
             Self::BlockLevelBoxes(boxes) => boxes
                 .par_iter()
                 .map(|box_| {
                     box_.borrow_mut()
-                        .inline_content_sizes(layout_context, containing_block_writing_mode)
+                        .inline_content_sizes(layout_context, writing_mode)
                 })
                 .reduce(ContentSizes::zero, ContentSizes::max),
             Self::InlineFormattingContext(context) => {
-                context.inline_content_sizes(layout_context, containing_block_writing_mode)
+                context.inline_content_sizes(layout_context, writing_mode)
             },
         }
     }
diff --git a/components/layout_2020/formatting_contexts.rs b/components/layout_2020/formatting_contexts.rs
index 0c3e8212d0c..0ec2bf1144c 100644
--- a/components/layout_2020/formatting_contexts.rs
+++ b/components/layout_2020/formatting_contexts.rs
@@ -134,6 +134,15 @@ impl IndependentFormattingContext {
         }
     }
 
+    pub fn inline_content_sizes(&mut self, layout_context: &LayoutContext) -> ContentSizes {
+        match self {
+            Self::NonReplaced(inner) => inner
+                .contents
+                .inline_content_sizes(layout_context, inner.style.writing_mode),
+            Self::Replaced(inner) => inner.contents.inline_content_sizes(&inner.style),
+        }
+    }
+
     pub fn outer_inline_content_sizes(
         &mut self,
         layout_context: &LayoutContext,
@@ -211,12 +220,12 @@ impl NonReplacedFormattingContextContents {
     pub fn inline_content_sizes(
         &self,
         layout_context: &LayoutContext,
-        containing_block_writing_mode: WritingMode,
+        writing_mode: WritingMode,
     ) -> ContentSizes {
         match self {
             Self::Flow(inner) => inner
                 .contents
-                .inline_content_sizes(layout_context, containing_block_writing_mode),
+                .inline_content_sizes(layout_context, writing_mode),
             Self::Flex(inner) => inner.inline_content_sizes(),
         }
     }
diff --git a/components/layout_2020/geom.rs b/components/layout_2020/geom.rs
index 5ec5bc78bf3..ad8166296b2 100644
--- a/components/layout_2020/geom.rs
+++ b/components/layout_2020/geom.rs
@@ -81,6 +81,20 @@ where
     }
 }
 
+impl<T> Sub<&'_ flow_relative::Vec2<T>> for &'_ flow_relative::Vec2<T>
+where
+    T: Sub<Output = T> + Copy,
+{
+    type Output = flow_relative::Vec2<T>;
+
+    fn sub(self, other: &'_ flow_relative::Vec2<T>) -> Self::Output {
+        flow_relative::Vec2 {
+            inline: self.inline - other.inline,
+            block: self.block - other.block,
+        }
+    }
+}
+
 impl<T> AddAssign<&'_ flow_relative::Vec2<T>> for flow_relative::Vec2<T>
 where
     T: AddAssign<T> + Copy,
diff --git a/components/style/values/computed/length.rs b/components/style/values/computed/length.rs
index 61b8148bb65..9a7e2cbb1a4 100644
--- a/components/style/values/computed/length.rs
+++ b/components/style/values/computed/length.rs
@@ -307,6 +307,12 @@ impl ToCss for CSSPixelLength {
     }
 }
 
+impl std::iter::Sum for CSSPixelLength {
+    fn sum<I: Iterator<Item = Self>>(iter: I) -> Self {
+        iter.fold(Length::zero(), Add::add)
+    }
+}
+
 impl Add for CSSPixelLength {
     type Output = Self;
 
@@ -323,6 +329,15 @@ impl AddAssign for CSSPixelLength {
     }
 }
 
+impl Div for CSSPixelLength {
+    type Output = CSSFloat;
+
+    #[inline]
+    fn div(self, other: Self) -> CSSFloat {
+        self.px() / other.px()
+    }
+}
+
 impl Div<CSSFloat> for CSSPixelLength {
     type Output = Self;
 
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/__dir__.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/__dir__.ini
new file mode 100644
index 00000000000..e4af70583e1
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/__dir__.ini
@@ -0,0 +1 @@
+prefs: ["layout.columns.enabled:true", "layout.flexbox.enabled:true"]
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/align-baseline.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/align-baseline.html.ini
new file mode 100644
index 00000000000..b8a131236f3
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/align-baseline.html.ini
@@ -0,0 +1,2 @@
+[align-baseline.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/align-content-wrap-004.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/align-content-wrap-004.html.ini
new file mode 100644
index 00000000000..e9569e52360
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/align-content-wrap-004.html.ini
@@ -0,0 +1,2 @@
+[align-content-wrap-004.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/align-content_flex-start.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/align-content_flex-start.html.ini
new file mode 100644
index 00000000000..b48569f8a3a
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/align-content_flex-start.html.ini
@@ -0,0 +1,2 @@
+[align-content_flex-start.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/align-items-005.htm.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/align-items-005.htm.ini
deleted file mode 100644
index dfc58b439db..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/align-items-005.htm.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[align-items-005.htm]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/align-items-baseline-overflow-non-visible.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/align-items-baseline-overflow-non-visible.html.ini
new file mode 100644
index 00000000000..b36a3815f35
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/align-items-baseline-overflow-non-visible.html.ini
@@ -0,0 +1,2 @@
+[align-items-baseline-overflow-non-visible.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/align-self-004.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/align-self-004.html.ini
deleted file mode 100644
index 773ba9bd2ef..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/align-self-004.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[align-self-004.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/align-self-005.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/align-self-005.html.ini
deleted file mode 100644
index 24ccf74429f..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/align-self-005.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[align-self-005.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/align-self-011.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/align-self-011.html.ini
deleted file mode 100644
index cc6ea9b03ea..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/align-self-011.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[align-self-011.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/align-self-012.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/align-self-012.html.ini
deleted file mode 100644
index c674e397004..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/align-self-012.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[align-self-012.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/align-self-015.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/align-self-015.html.ini
new file mode 100644
index 00000000000..8153e4a71ce
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/align-self-015.html.ini
@@ -0,0 +1,2 @@
+[align-self-015.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/animation/flex-basis-interpolation.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/animation/flex-basis-interpolation.html.ini
index 81cd4bdf864..86560048f75 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/animation/flex-basis-interpolation.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/animation/flex-basis-interpolation.html.ini
@@ -1,73 +1,22 @@
 [flex-basis-interpolation.html]
-  [CSS Transitions: property <flex-basis> from [0%\] to [100%\] at (1) should be [100%\]]
-    expected: FAIL
-
   [Web Animations: property <flex-basis> from [inherit\] to [2%\] at (1.5) should be [1.5%\]]
     expected: FAIL
 
-  [CSS Transitions: property <flex-basis> from [0%\] to [100%\] at (0) should be [0%\]]
-    expected: FAIL
-
   [CSS Animations: property <flex-basis> from [unset\] to [2%\] at (0.6) should be [2%\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <flex-basis> from [initial\] to [2%\] at (0.6) should be [2%\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-basis> from neutral to [2%\] at (-0.3) should be [0.7%\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-basis> from [initial\] to [2%\] at (1.5) should be [2%\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-basis> from [0px\] to [100px\] at (1.5) should be [150px\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-basis> from [inherit\] to [2%\] at (1) should be [2%\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-basis> from neutral to [2%\] at (0.3) should be [1.3%\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-basis> from [0px\] to [100px\] at (0.4) should be [40px\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-basis> from [0px\] to [100px\] at (1) should be [100px\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-basis> from [inherit\] to [2%\] at (-0.3) should be [3.3%\]]
-    expected: FAIL
-
   [Web Animations: property <flex-basis> from neutral to [2%\] at (0) should be [1%\]]
     expected: FAIL
 
   [Web Animations: property <flex-basis> from neutral to [2%\] at (1) should be [2%\]]
     expected: FAIL
 
-  [CSS Animations: property <flex-basis> from [inherit\] to [2%\] at (0.3) should be [2.7%\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-basis> from [inherit\] to [2%\] at (1.5) should be [1.5%\]]
-    expected: FAIL
-
   [Web Animations: property <flex-basis> from [0%\] to [100%\] at (-0.3) should be [0%\]]
     expected: FAIL
 
-  [CSS Transitions: property <flex-basis> from [unset\] to [2%\] at (0.6) should be [2%\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-basis> from [inherit\] to [2%\] at (1) should be [2%\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-basis> from [initial\] to [2%\] at (0.5) should be [2%\]]
-    expected: FAIL
-
   [Web Animations: property <flex-basis> from [initial\] to [2%\] at (1) should be [2%\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <flex-basis> from [0px\] to [100px\] at (0) should be [0px\]]
-    expected: FAIL
-
   [Web Animations: property <flex-basis> from [inherit\] to [2%\] at (1) should be [2%\]]
     expected: FAIL
 
@@ -77,24 +26,9 @@
   [CSS Animations: property <flex-basis> from [unset\] to [2%\] at (1.5) should be [2%\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <flex-basis> from [unset\] to [2%\] at (1) should be [2%\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-basis> from [initial\] to [2%\] at (0.6) should be [2%\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-basis> from [0%\] to [100%\] at (-0.3) should be [0%\]]
-    expected: FAIL
-
   [Web Animations: property <flex-basis> from [initial\] to [2%\] at (-0.3) should be [initial\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <flex-basis> from [inherit\] to [2%\] at (0.3) should be [2.7%\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-basis> from [0%\] to [100%\] at (1.5) should be [150%\]]
-    expected: FAIL
-
   [Web Animations: property <flex-basis> from [inherit\] to [2%\] at (0) should be [3%\]]
     expected: FAIL
 
@@ -107,327 +41,99 @@
   [Web Animations: property <flex-basis> from neutral to [2%\] at (0.3) should be [1.3%\]]
     expected: FAIL
 
-  [CSS Transitions: property <flex-basis> from neutral to [2%\] at (-0.3) should be [0.7%\]]
-    expected: FAIL
-
   [Web Animations: property <flex-basis> from [initial\] to [2%\] at (0.6) should be [2%\]]
     expected: FAIL
 
   [CSS Animations: property <flex-basis> from [initial\] to [2%\] at (1.5) should be [2%\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <flex-basis> from neutral to [2%\] at (1.5) should be [2.5%\]]
-    expected: FAIL
-
   [Web Animations: property <flex-basis> from [initial\] to [2%\] at (0.3) should be [initial\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <flex-basis> from [0%\] to [100%\] at (-0.3) should be [0%\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-basis> from [inherit\] to [2%\] at (0.6) should be [2.4%\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-basis> from [0px\] to [100px\] at (0.4) should be [40px\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-basis> from neutral to [2%\] at (0.3) should be [1.3%\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-basis> from [inherit\] to [2%\] at (0.3) should be [2.7%\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-basis> from neutral to [2%\] at (0.3) should be [1.3%\]]
-    expected: FAIL
-
   [Web Animations: property <flex-basis> from [unset\] to [2%\] at (-0.3) should be [unset\]]
     expected: FAIL
 
-  [CSS Transitions: property <flex-basis> from [initial\] to [2%\] at (-0.3) should be [2%\]]
-    expected: FAIL
-
   [Web Animations: property <flex-basis> from neutral to [2%\] at (0.6) should be [1.6%\]]
     expected: FAIL
 
-  [CSS Transitions: property <flex-basis> from neutral to [2%\] at (1.5) should be [2.5%\]]
-    expected: FAIL
-
   [Web Animations: property <flex-basis> from [inherit\] to [2%\] at (-0.3) should be [3.3%\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <flex-basis> from [initial\] to [2%\] at (0) should be [2%\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-basis> from neutral to [2%\] at (1.5) should be [2.5%\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-basis> from [initial\] to [2%\] at (1.5) should be [2%\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-basis> from neutral to [2%\] at (0) should be [1%\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-basis> from [unset\] to [2%\] at (0) should be [2%\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-basis> from neutral to [2%\] at (0) should be [1%\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-basis> from [initial\] to [2%\] at (0) should be [2%\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-basis> from neutral to [2%\] at (1) should be [2%\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-basis> from neutral to [2%\] at (0.6) should be [1.6%\]]
-    expected: FAIL
-
   [Web Animations: property <flex-basis> from [initial\] to [2%\] at (0.5) should be [2%\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <flex-basis> from [unset\] to [2%\] at (0.6) should be [2%\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-basis> from [unset\] to [2%\] at (0.3) should be [2%\]]
-    expected: FAIL
-
   [CSS Animations: property <flex-basis> from [initial\] to [2%\] at (0) should be [initial\]]
     expected: FAIL
 
-  [CSS Transitions: property <flex-basis> from [unset\] to [2%\] at (-0.3) should be [2%\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-basis> from [initial\] to [2%\] at (-0.3) should be [2%\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-basis> from neutral to [2%\] at (1) should be [2%\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-basis> from [unset\] to [2%\] at (0.3) should be [2%\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-basis> from [0%\] to [100%\] at (0) should be [0%\]]
-    expected: FAIL
-
   [Web Animations: property <flex-basis> from [0px\] to [100px\] at (1) should be [100px\]]
     expected: FAIL
 
   [Web Animations: property <flex-basis> from [initial\] to [2%\] at (0) should be [initial\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <flex-basis> from neutral to [2%\] at (0) should be [1%\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-basis> from [inherit\] to [2%\] at (0.6) should be [2.4%\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-basis> from [initial\] to [2%\] at (0.3) should be [2%\]]
-    expected: FAIL
-
   [Web Animations: property <flex-basis> from [unset\] to [2%\] at (0.3) should be [unset\]]
     expected: FAIL
 
-  [CSS Transitions: property <flex-basis> from [0%\] to [100%\] at (0.6) should be [60%\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-basis> from [0%\] to [100%\] at (1.5) should be [150%\]]
-    expected: FAIL
-
   [Web Animations: property <flex-basis> from [unset\] to [2%\] at (1.5) should be [2%\]]
     expected: FAIL
 
   [Web Animations: property <flex-basis> from [unset\] to [2%\] at (0.5) should be [2%\]]
     expected: FAIL
 
-  [CSS Animations: property <flex-basis> from [0px\] to [100px\] at (0.4) should be [40px\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-basis> from [0px\] to [100px\] at (-0.3) should be [0px\]]
-    expected: FAIL
-
   [CSS Animations: property <flex-basis> from [unset\] to [2%\] at (0) should be [unset\]]
     expected: FAIL
 
   [Web Animations: property <flex-basis> from [0%\] to [100%\] at (0.4) should be [40%\]]
     expected: FAIL
 
-  [CSS Transitions: property <flex-basis> from [unset\] to [2%\] at (1) should be [2%\]]
-    expected: FAIL
-
   [CSS Animations: property <flex-basis> from [unset\] to [2%\] at (-0.3) should be [unset\]]
     expected: FAIL
 
   [Web Animations: property <flex-basis> from [0%\] to [100%\] at (1) should be [100%\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <flex-basis> from [0px\] to [100px\] at (0.6) should be [60px\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-basis> from [0px\] to [100px\] at (1) should be [100px\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-basis> from [inherit\] to [2%\] at (0) should be [3%\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-basis> from [0%\] to [100%\] at (1.5) should be [150%\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-basis> from [0%\] to [100%\] at (0.6) should be [60%\]]
-    expected: FAIL
-
   [Web Animations: property <flex-basis> from [0%\] to [100%\] at (0) should be [0%\]]
     expected: FAIL
 
-  [CSS Transitions: property <flex-basis> from [unset\] to [2%\] at (1.5) should be [2%\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-basis> from [initial\] to [2%\] at (1) should be [2%\]]
-    expected: FAIL
-
   [Web Animations: property <flex-basis> from [unset\] to [2%\] at (0.6) should be [2%\]]
     expected: FAIL
 
-  [CSS Transitions: property <flex-basis> from [0%\] to [100%\] at (-0.3) should be [0%\]]
-    expected: FAIL
-
   [Web Animations: property <flex-basis> from [0px\] to [100px\] at (0) should be [0px\]]
     expected: FAIL
 
-  [CSS Transitions: property <flex-basis> from [0px\] to [100px\] at (1) should be [100px\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-basis> from [0%\] to [100%\] at (0.4) should be [40%\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-basis> from [initial\] to [2%\] at (0.3) should be [2%\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-basis> from [0px\] to [100px\] at (1.5) should be [150px\]]
-    expected: FAIL
-
   [CSS Animations: property <flex-basis> from [initial\] to [2%\] at (1) should be [2%\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <flex-basis> from [0%\] to [100%\] at (0.4) should be [40%\]]
-    expected: FAIL
-
   [Web Animations: property <flex-basis> from [0%\] to [100%\] at (0.6) should be [60%\]]
     expected: FAIL
 
-  [CSS Animations: property <flex-basis> from [inherit\] to [2%\] at (0.6) should be [2.4%\]]
-    expected: FAIL
-
   [CSS Animations: property <flex-basis> from [initial\] to [2%\] at (0.3) should be [initial\]]
     expected: FAIL
 
-  [CSS Transitions: property <flex-basis> from [inherit\] to [2%\] at (1.5) should be [1.5%\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-basis> from [initial\] to [2%\] at (0.5) should be [2%\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-basis> from neutral to [2%\] at (0.6) should be [1.6%\]]
-    expected: FAIL
-
   [Web Animations: property <flex-basis> from [0px\] to [100px\] at (0.6) should be [60px\]]
     expected: FAIL
 
   [Web Animations: property <flex-basis> from [initial\] to [2%\] at (1.5) should be [2%\]]
     expected: FAIL
 
-  [CSS Transitions: property <flex-basis> from [inherit\] to [2%\] at (1) should be [2%\]]
-    expected: FAIL
-
   [CSS Animations: property <flex-basis> from [unset\] to [2%\] at (1) should be [2%\]]
     expected: FAIL
 
-  [CSS Animations: property <flex-basis> from [0px\] to [100px\] at (-0.3) should be [0px\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-basis> from [0%\] to [100%\] at (0) should be [0%\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-basis> from neutral to [2%\] at (-0.3) should be [0.7%\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-basis> from [unset\] to [2%\] at (1.5) should be [2%\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-basis> from [unset\] to [2%\] at (0.5) should be [2%\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-basis> from neutral to [2%\] at (1) should be [2%\]]
-    expected: FAIL
-
   [Web Animations: property <flex-basis> from [unset\] to [2%\] at (0) should be [unset\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <flex-basis> from [0px\] to [100px\] at (-0.3) should be [0px\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-basis> from [0px\] to [100px\] at (0.6) should be [60px\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-basis> from [unset\] to [2%\] at (0.5) should be [2%\]]
-    expected: FAIL
-
   [Web Animations: property <flex-basis> from neutral to [2%\] at (1.5) should be [2.5%\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <flex-basis> from [0px\] to [100px\] at (1.5) should be [150px\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-basis> from [0px\] to [100px\] at (0) should be [0px\]]
-    expected: FAIL
-
   [Web Animations: property <flex-basis> from [0%\] to [100%\] at (1.5) should be [150%\]]
     expected: FAIL
 
   [Web Animations: property <flex-basis> from [inherit\] to [2%\] at (0.3) should be [2.7%\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <flex-basis> from [0%\] to [100%\] at (0.6) should be [60%\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-basis> from [unset\] to [2%\] at (-0.3) should be [2%\]]
-    expected: FAIL
-
   [Web Animations: property <flex-basis> from [unset\] to [2%\] at (1) should be [2%\]]
     expected: FAIL
 
-  [CSS Transitions: property <flex-basis> from [inherit\] to [2%\] at (0) should be [3%\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-basis> from [inherit\] to [2%\] at (0) should be [3%\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-basis> from [initial\] to [2%\] at (1) should be [2%\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-basis> from neutral to [2%\] at (0.6) should be [1.6%\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-basis> from [0px\] to [100px\] at (0.6) should be [60px\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-basis> from [0%\] to [100%\] at (0.4) should be [40%\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-basis> from [0px\] to [100px\] at (0) should be [0px\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-basis> from [inherit\] to [2%\] at (-0.3) should be [3.3%\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-basis> from [unset\] to [2%\] at (0) should be [2%\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-basis> from [inherit\] to [2%\] at (-0.3) should be [3.3%\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-basis> from [0%\] to [100%\] at (1) should be [100%\]]
-    expected: FAIL
-
   [Web Animations: property <flex-basis> from [0px\] to [100px\] at (-0.3) should be [0px\]]
     expected: FAIL
 
@@ -449,9 +155,3 @@
   [Web Animations: property <flex-basis> from [inherit\] to [2%\] at (0.6) should be [2.4%\]]
     expected: FAIL
 
-  [CSS Animations: property <flex-basis> from [0%\] to [100%\] at (1) should be [100%\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-basis> from [inherit\] to [2%\] at (1.5) should be [1.5%\]]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/animation/flex-grow-interpolation.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/animation/flex-grow-interpolation.html.ini
index 27645b5ee50..bc00b931ef5 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/animation/flex-grow-interpolation.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/animation/flex-grow-interpolation.html.ini
@@ -1,25 +1,10 @@
 [flex-grow-interpolation.html]
-  [CSS Animations: property <flex-grow> from [1\] to [2\] at (1.5) should be [2.5\]]
-    expected: FAIL
-
   [Web Animations: property <flex-grow> from neutral to [2\] at (0.3) should be [1.3\]]
     expected: FAIL
 
-  [CSS Transitions: property <flex-grow> from [1\] to [2\] at (-5) should be [0\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-grow> from [unset\] to [2\] at (0.3) should be [0.6\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-grow> from [1\] to [2\] at (1) should be [2\]]
-    expected: FAIL
-
   [Web Animations: property <flex-grow> from [0\] to [1\] at (-0.3) should be [0\]]
     expected: FAIL
 
-  [CSS Animations: property <flex-grow> from [unset\] to [2\] at (0.6) should be [1.2\]]
-    expected: FAIL
-
   [Web Animations: property <flex-grow> from [0\] to [1\] at (-5) should be [0\]]
     expected: FAIL
 
@@ -29,81 +14,21 @@
   [Web Animations: property <flex-grow> from neutral to [2\] at (0.6) should be [1.6\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <flex-grow> from [0\] to [1\] at (-0.3) should be [0\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-grow> from neutral to [2\] at (1) should be [2\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-grow> from [0\] to [1\] at (1) should be [1\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-grow> from [inherit\] to [2\] at (1) should be [2\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-grow> from [1\] to [2\] at (-0.3) should be [0.7\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-grow> from [unset\] to [2\] at (1.5) should be [3\]]
-    expected: FAIL
-
   [Web Animations: property <flex-grow> from [unset\] to [2\] at (1) should be [2\]]
     expected: FAIL
 
-  [CSS Transitions: property <flex-grow> from [0\] to [1\] at (-0.3) should be [0\]]
-    expected: FAIL
-
   [Web Animations: property <flex-grow> from [1\] to [2\] at (-5) should be [0\]]
     expected: FAIL
 
-  [CSS Transitions: property <flex-grow> from [inherit\] to [2\] at (-0.3) should be [3.3\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-grow> from neutral to [2\] at (0.3) should be [1.3\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-grow> from neutral to [2\] at (-0.3) should be [0.7\]]
-    expected: FAIL
-
   [Web Animations: property <flex-grow> from neutral to [2\] at (1.5) should be [2.5\]]
     expected: FAIL
 
-  [CSS Transitions: property <flex-grow> from [inherit\] to [2\] at (0.3) should be [2.7\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-grow> from [1\] to [2\] at (0.6) should be [1.6\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-grow> from neutral to [2\] at (0.3) should be [1.3\]]
-    expected: FAIL
-
   [Web Animations: property <flex-grow> from [1\] to [2\] at (0.6) should be [1.6\]]
     expected: FAIL
 
-  [CSS Animations: property <flex-grow> from [unset\] to [2\] at (1.5) should be [3\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-grow> from [0\] to [1\] at (1.5) should be [1.5\]]
-    expected: FAIL
-
   [Web Animations: property <flex-grow> from [0\] to [1\] at (0.3) should be [0.3\]]
     expected: FAIL
 
-  [CSS Animations: property <flex-grow> from [initial\] to [2\] at (-0.3) should be [0\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-grow> from [unset\] to [2\] at (0.3) should be [0.6\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-grow> from neutral to [2\] at (0.6) should be [1.6\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-grow> from [1\] to [2\] at (0.3) should be [1.3\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-grow> from [inherit\] to [2\] at (0.6) should be [2.4\]]
-    expected: FAIL
-
   [Web Animations: property <flex-grow> from [inherit\] to [2\] at (-0.3) should be [3.3\]]
     expected: FAIL
 
@@ -116,51 +41,21 @@
   [Web Animations: property <flex-grow> from [0\] to [1\] at (1) should be [1\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <flex-grow> from neutral to [2\] at (0) should be [1\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-grow> from [0\] to [1\] at (-5) should be [0\]]
-    expected: FAIL
-
   [Web Animations: property <flex-grow> from [1\] to [2\] at (1.5) should be [2.5\]]
     expected: FAIL
 
   [Web Animations: property <flex-grow> from [0\] to [1\] at (0) should be [0\]]
     expected: FAIL
 
-  [CSS Animations: property <flex-grow> from [inherit\] to [2\] at (1.5) should be [1.5\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-grow> from [initial\] to [2\] at (0.3) should be [0.6\]]
-    expected: FAIL
-
   [Web Animations: property <flex-grow> from [unset\] to [2\] at (0) should be [0\]]
     expected: FAIL
 
-  [CSS Animations: property <flex-grow> from [1\] to [2\] at (-5) should be [0\]]
-    expected: FAIL
-
   [Web Animations: property <flex-grow> from neutral to [2\] at (1) should be [2\]]
     expected: FAIL
 
-  [CSS Transitions: property <flex-grow> from [unset\] to [2\] at (0) should be [0\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-grow> from neutral to [2\] at (-0.3) should be [0.7\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-grow> from neutral to [2\] at (1) should be [2\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-grow> from [1\] to [2\] at (1.5) should be [2.5\]]
-    expected: FAIL
-
   [Web Animations: property <flex-grow> from [initial\] to [2\] at (0.3) should be [0.6\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <flex-grow> from [1\] to [2\] at (1.5) should be [2.5\]]
-    expected: FAIL
-
   [Web Animations: property <flex-grow> from [initial\] to [2\] at (1) should be [2\]]
     expected: FAIL
 
@@ -170,288 +65,51 @@
   [Web Animations: property <flex-grow> from neutral to [2\] at (0) should be [1\]]
     expected: FAIL
 
-  [CSS Transitions: property <flex-grow> from neutral to [2\] at (0) should be [1\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-grow> from [1\] to [2\] at (0.3) should be [1.3\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-grow> from [0\] to [1\] at (0.3) should be [0.3\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-grow> from [initial\] to [2\] at (0.3) should be [0.6\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-grow> from neutral to [2\] at (1.5) should be [2.5\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-grow> from neutral to [2\] at (1.5) should be [2.5\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-grow> from [inherit\] to [2\] at (-0.3) should be [3.3\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-grow> from [1\] to [2\] at (0.6) should be [1.6\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-grow> from [1\] to [2\] at (0.3) should be [1.3\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-grow> from [initial\] to [2\] at (1.5) should be [3\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-grow> from [0\] to [1\] at (0) should be [0\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-grow> from [0\] to [1\] at (0) should be [0\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-grow> from [unset\] to [2\] at (1) should be [2\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-grow> from [1\] to [2\] at (-5) should be [0\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-grow> from [0\] to [1\] at (-5) should be [0\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-grow> from [initial\] to [2\] at (1.5) should be [3\]]
-    expected: FAIL
-
   [Web Animations: property <flex-grow> from [unset\] to [2\] at (0.6) should be [1.2\]]
     expected: FAIL
 
-  [CSS Animations: property <flex-grow> from neutral to [2\] at (-0.3) should be [0.7\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-grow> from [inherit\] to [2\] at (1) should be [2\]]
-    expected: FAIL
-
   [Web Animations: property <flex-grow> from [0\] to [1\] at (1.5) should be [1.5\]]
     expected: FAIL
 
-  [CSS Transitions: property <flex-grow> from [initial\] to [2\] at (-0.3) should be [0\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-grow> from neutral to [2\] at (0.6) should be [1.6\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-grow> from [inherit\] to [2\] at (0) should be [3\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-grow> from [1\] to [2\] at (1) should be [2\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-grow> from [initial\] to [2\] at (0.6) should be [1.2\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-grow> from [1\] to [2\] at (0) should be [1\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-grow> from [inherit\] to [2\] at (1.5) should be [1.5\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-grow> from [initial\] to [2\] at (0.6) should be [1.2\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-grow> from neutral to [2\] at (0.3) should be [1.3\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-grow> from [unset\] to [2\] at (-0.3) should be [0\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-grow> from [unset\] to [2\] at (-0.3) should be [0\]]
-    expected: FAIL
-
   [Web Animations: property <flex-grow> from [inherit\] to [2\] at (1.5) should be [1.5\]]
     expected: FAIL
 
-  [CSS Transitions: property <flex-grow> from [initial\] to [2\] at (1) should be [2\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-grow> from [0\] to [1\] at (-0.3) should be [0\]]
-    expected: FAIL
-
   [Web Animations: property <flex-grow> from [initial\] to [2\] at (0.6) should be [1.2\]]
     expected: FAIL
 
-  [CSS Animations: property <flex-grow> from [inherit\] to [2\] at (0) should be [3\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-grow> from [0\] to [1\] at (0.6) should be [0.6\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-grow> from [unset\] to [2\] at (0) should be [0\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-grow> from [initial\] to [2\] at (0.3) should be [0.6\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-grow> from [initial\] to [2\] at (1.5) should be [3\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-grow> from [1\] to [2\] at (0) should be [1\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-grow> from [initial\] to [2\] at (-0.3) should be [0\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-grow> from [unset\] to [2\] at (1) should be [2\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-grow> from [inherit\] to [2\] at (0.6) should be [2.4\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-grow> from [inherit\] to [2\] at (0.3) should be [2.7\]]
-    expected: FAIL
-
   [Web Animations: property <flex-grow> from [inherit\] to [2\] at (1) should be [2\]]
     expected: FAIL
 
-  [CSS Animations: property <flex-grow> from [unset\] to [2\] at (1) should be [2\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-grow> from [0\] to [1\] at (1) should be [1\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-grow> from [unset\] to [2\] at (0.3) should be [0.6\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-grow> from [0\] to [1\] at (0.3) should be [0.3\]]
-    expected: FAIL
-
   [Web Animations: property <flex-grow> from [inherit\] to [2\] at (0) should be [3\]]
     expected: FAIL
 
-  [CSS Transitions: property <flex-grow> from [inherit\] to [2\] at (1) should be [2\]]
-    expected: FAIL
-
   [Web Animations: property <flex-grow> from [initial\] to [2\] at (1.5) should be [3\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <flex-grow> from [0\] to [1\] at (-5) should be [0\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-grow> from [initial\] to [2\] at (1) should be [2\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-grow> from [0\] to [1\] at (1) should be [1\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-grow> from [inherit\] to [2\] at (0) should be [3\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-grow> from [1\] to [2\] at (-0.3) should be [0.7\]]
-    expected: FAIL
-
   [Web Animations: property <flex-grow> from [unset\] to [2\] at (0.3) should be [0.6\]]
     expected: FAIL
 
-  [CSS Transitions: property <flex-grow> from [1\] to [2\] at (0.6) should be [1.6\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-grow> from [1\] to [2\] at (-0.3) should be [0.7\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-grow> from [unset\] to [2\] at (0.6) should be [1.2\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-grow> from [unset\] to [2\] at (1.5) should be [3\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-grow> from [inherit\] to [2\] at (0.3) should be [2.7\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-grow> from [inherit\] to [2\] at (-0.3) should be [3.3\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-grow> from [unset\] to [2\] at (-0.3) should be [0\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-grow> from neutral to [2\] at (1) should be [2\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-grow> from [initial\] to [2\] at (0.6) should be [1.2\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-grow> from [unset\] to [2\] at (0.6) should be [1.2\]]
-    expected: FAIL
-
   [Web Animations: property <flex-grow> from [1\] to [2\] at (-0.3) should be [0.7\]]
     expected: FAIL
 
   [Web Animations: property <flex-grow> from [0\] to [1\] at (0.6) should be [0.6\]]
     expected: FAIL
 
-  [CSS Transitions: property <flex-grow> from [0\] to [1\] at (0.6) should be [0.6\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-grow> from [initial\] to [2\] at (0) should be [0\]]
-    expected: FAIL
-
   [Web Animations: property <flex-grow> from [1\] to [2\] at (1) should be [2\]]
     expected: FAIL
 
-  [CSS Animations: property <flex-grow> from [0\] to [1\] at (0.3) should be [0.3\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-grow> from [0\] to [1\] at (1.5) should be [1.5\]]
-    expected: FAIL
-
   [Web Animations: property <flex-grow> from neutral to [2\] at (-0.3) should be [0.7\]]
     expected: FAIL
 
-  [CSS Transitions: property <flex-grow> from [0\] to [1\] at (1.5) should be [1.5\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-grow> from [0\] to [1\] at (0) should be [0\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-grow> from neutral to [2\] at (0.6) should be [1.6\]]
-    expected: FAIL
-
   [Web Animations: property <flex-grow> from [1\] to [2\] at (0) should be [1\]]
     expected: FAIL
 
   [Web Animations: property <flex-grow> from [initial\] to [2\] at (-0.3) should be [0\]]
     expected: FAIL
 
-  [CSS Animations: property <flex-grow> from [1\] to [2\] at (1) should be [2\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-grow> from neutral to [2\] at (1.5) should be [2.5\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-grow> from [initial\] to [2\] at (0) should be [0\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-grow> from [0\] to [1\] at (0.6) should be [0.6\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-grow> from neutral to [2\] at (0) should be [1\]]
-    expected: FAIL
-
   [Web Animations: property <flex-grow> from [unset\] to [2\] at (1.5) should be [3\]]
     expected: FAIL
 
-  [CSS Animations: property <flex-grow> from [1\] to [2\] at (0) should be [1\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-grow> from [unset\] to [2\] at (0) should be [0\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-grow> from [initial\] to [2\] at (1) should be [2\]]
-    expected: FAIL
-
   [Web Animations: property <flex-grow> from [inherit\] to [2\] at (0.3) should be [2.7\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <flex-grow> from [initial\] to [2\] at (0) should be [0\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-grow> from [inherit\] to [2\] at (1.5) should be [1.5\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-grow> from [inherit\] to [2\] at (0.6) should be [2.4\]]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/animation/flex-shrink-interpolation.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/animation/flex-shrink-interpolation.html.ini
index a92909646eb..32882c5fc56 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/animation/flex-shrink-interpolation.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/animation/flex-shrink-interpolation.html.ini
@@ -5,30 +5,6 @@
   [Web Animations: property <flex-shrink> from neutral to [2\] at (-0.3) should be [1.35\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <flex-shrink> from [unset\] to [2\] at (0.6) should be [1.6\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-shrink> from [initial\] to [2\] at (0) should be [1\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-shrink> from neutral to [2\] at (0) should be [1.5\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-shrink> from [unset\] to [2\] at (1.5) should be [2.5\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-shrink> from [inherit\] to [2\] at (0) should be [3\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-shrink> from [initial\] to [2\] at (1.5) should be [2.5\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-shrink> from [inherit\] to [2\] at (0.6) should be [2.4\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-shrink> from neutral to [2\] at (0.3) should be [1.65\]]
-    expected: FAIL
-
   [Web Animations: property <flex-shrink> from [1\] to [2\] at (1.5) should be [2.5\]]
     expected: FAIL
 
@@ -38,282 +14,51 @@
   [Web Animations: property <flex-shrink> from [0\] to [1\] at (1) should be [1\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <flex-shrink> from [1\] to [2\] at (-5) should be [0\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-shrink> from [inherit\] to [2\] at (1.5) should be [1.5\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-shrink> from [1\] to [2\] at (0) should be [1\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-shrink> from neutral to [2\] at (1) should be [2\]]
-    expected: FAIL
-
   [Web Animations: property <flex-shrink> from [0\] to [1\] at (0.6) should be [0.6\]]
     expected: FAIL
 
-  [CSS Animations: property <flex-shrink> from neutral to [2\] at (0.6) should be [1.8\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-shrink> from [unset\] to [2\] at (0.6) should be [1.6\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-shrink> from [1\] to [2\] at (-0.3) should be [0.7\]]
-    expected: FAIL
-
   [Web Animations: property <flex-shrink> from [unset\] to [2\] at (0.3) should be [1.3\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <flex-shrink> from [unset\] to [2\] at (0) should be [1\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-shrink> from [inherit\] to [2\] at (1) should be [2\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-shrink> from [unset\] to [2\] at (1) should be [2\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-shrink> from [inherit\] to [2\] at (-0.3) should be [3.3\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-shrink> from neutral to [2\] at (1.5) should be [2.25\]]
-    expected: FAIL
-
   [Web Animations: property <flex-shrink> from [unset\] to [2\] at (0) should be [1\]]
     expected: FAIL
 
   [Web Animations: property <flex-shrink> from [unset\] to [2\] at (-0.3) should be [0.7\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <flex-shrink> from [1\] to [2\] at (0) should be [1\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-shrink> from [1\] to [2\] at (0.6) should be [1.6\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-shrink> from [initial\] to [2\] at (1.5) should be [2.5\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-shrink> from [unset\] to [2\] at (1.5) should be [2.5\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-shrink> from neutral to [2\] at (1) should be [2\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-shrink> from [unset\] to [2\] at (1) should be [2\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-shrink> from [unset\] to [2\] at (0.3) should be [1.3\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-shrink> from [0\] to [1\] at (-5) should be [0\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-shrink> from neutral to [2\] at (1.5) should be [2.25\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-shrink> from neutral to [2\] at (0.3) should be [1.65\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-shrink> from [1\] to [2\] at (0.6) should be [1.6\]]
-    expected: FAIL
-
   [Web Animations: property <flex-shrink> from [inherit\] to [2\] at (1.5) should be [1.5\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <flex-shrink> from [1\] to [2\] at (1) should be [2\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-shrink> from [1\] to [2\] at (-5) should be [0\]]
-    expected: FAIL
-
   [Web Animations: property <flex-shrink> from [initial\] to [2\] at (0.6) should be [1.6\]]
     expected: FAIL
 
   [Web Animations: property <flex-shrink> from [0\] to [1\] at (1.5) should be [1.5\]]
     expected: FAIL
 
-  [CSS Transitions: property <flex-shrink> from [initial\] to [2\] at (0.6) should be [1.6\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-shrink> from [inherit\] to [2\] at (0.6) should be [2.4\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-shrink> from [unset\] to [2\] at (-0.3) should be [0.7\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-shrink> from neutral to [2\] at (-0.3) should be [1.35\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-shrink> from [inherit\] to [2\] at (0.6) should be [2.4\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-shrink> from [1\] to [2\] at (1.5) should be [2.5\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-shrink> from [0\] to [1\] at (1.5) should be [1.5\]]
-    expected: FAIL
-
   [Web Animations: property <flex-shrink> from neutral to [2\] at (0.6) should be [1.8\]]
     expected: FAIL
 
-  [CSS Animations: property <flex-shrink> from [0\] to [1\] at (-5) should be [0\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-shrink> from [1\] to [2\] at (0.6) should be [1.6\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-shrink> from [0\] to [1\] at (0.6) should be [0.6\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-shrink> from [1\] to [2\] at (1) should be [2\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-shrink> from [1\] to [2\] at (1) should be [2\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-shrink> from [0\] to [1\] at (-0.3) should be [0\]]
-    expected: FAIL
-
   [Web Animations: property <flex-shrink> from [0\] to [1\] at (-5) should be [0\]]
     expected: FAIL
 
-  [CSS Animations: property <flex-shrink> from [initial\] to [2\] at (1) should be [2\]]
-    expected: FAIL
-
   [Web Animations: property <flex-shrink> from [initial\] to [2\] at (-0.3) should be [0.7\]]
     expected: FAIL
 
-  [CSS Transitions: property <flex-shrink> from [initial\] to [2\] at (0) should be [1\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-shrink> from [inherit\] to [2\] at (0.3) should be [2.7\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-shrink> from [unset\] to [2\] at (1.5) should be [2.5\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-shrink> from neutral to [2\] at (-0.3) should be [1.35\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-shrink> from [unset\] to [2\] at (1) should be [2\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-shrink> from [0\] to [1\] at (-0.3) should be [0\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-shrink> from [initial\] to [2\] at (-0.3) should be [0.7\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-shrink> from [0\] to [1\] at (0.6) should be [0.6\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-shrink> from [inherit\] to [2\] at (-0.3) should be [3.3\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-shrink> from [0\] to [1\] at (1.5) should be [1.5\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-shrink> from [initial\] to [2\] at (1) should be [2\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-shrink> from [inherit\] to [2\] at (1) should be [2\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-shrink> from [1\] to [2\] at (-0.3) should be [0.7\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-shrink> from [unset\] to [2\] at (0.3) should be [1.3\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-shrink> from [1\] to [2\] at (1.5) should be [2.5\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-shrink> from [0\] to [1\] at (0.3) should be [0.3\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-shrink> from [1\] to [2\] at (0.3) should be [1.3\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-shrink> from [initial\] to [2\] at (0.3) should be [1.3\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-shrink> from [1\] to [2\] at (0.3) should be [1.3\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-shrink> from neutral to [2\] at (0.3) should be [1.65\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-shrink> from [inherit\] to [2\] at (1.5) should be [1.5\]]
-    expected: FAIL
-
   [Web Animations: property <flex-shrink> from [0\] to [1\] at (0) should be [0\]]
     expected: FAIL
 
-  [CSS Transitions: property <flex-shrink> from neutral to [2\] at (1) should be [2\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-shrink> from [0\] to [1\] at (0.3) should be [0.3\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-shrink> from [initial\] to [2\] at (0.6) should be [1.6\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-shrink> from [unset\] to [2\] at (0) should be [1\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-shrink> from [1\] to [2\] at (1.5) should be [2.5\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-shrink> from [0\] to [1\] at (-5) should be [0\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-shrink> from neutral to [2\] at (0) should be [1.5\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-shrink> from [unset\] to [2\] at (-0.3) should be [0.7\]]
-    expected: FAIL
-
   [Web Animations: property <flex-shrink> from [1\] to [2\] at (0) should be [1\]]
     expected: FAIL
 
-  [CSS Transitions: property <flex-shrink> from neutral to [2\] at (0.6) should be [1.8\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-shrink> from [initial\] to [2\] at (0.6) should be [1.6\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-shrink> from [inherit\] to [2\] at (0) should be [3\]]
-    expected: FAIL
-
   [Web Animations: property <flex-shrink> from [inherit\] to [2\] at (0.6) should be [2.4\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <flex-shrink> from [initial\] to [2\] at (0.3) should be [1.3\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-shrink> from [0\] to [1\] at (-0.3) should be [0\]]
-    expected: FAIL
-
   [Web Animations: property <flex-shrink> from [initial\] to [2\] at (1) should be [2\]]
     expected: FAIL
 
-  [CSS Transitions: property <flex-shrink> from [1\] to [2\] at (-5) should be [0\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-shrink> from [0\] to [1\] at (0) should be [0\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-shrink> from neutral to [2\] at (0) should be [1.5\]]
-    expected: FAIL
-
   [Web Animations: property <flex-shrink> from [1\] to [2\] at (-5) should be [0\]]
     expected: FAIL
 
-  [CSS Transitions: property <flex-shrink> from [1\] to [2\] at (0.3) should be [1.3\]]
-    expected: FAIL
-
   [Web Animations: property <flex-shrink> from [initial\] to [2\] at (0.3) should be [1.3\]]
     expected: FAIL
 
@@ -323,30 +68,12 @@
   [Web Animations: property <flex-shrink> from [initial\] to [2\] at (1.5) should be [2.5\]]
     expected: FAIL
 
-  [CSS Animations: property <flex-shrink> from neutral to [2\] at (-0.3) should be [1.35\]]
-    expected: FAIL
-
   [Web Animations: property <flex-shrink> from [inherit\] to [2\] at (1) should be [2\]]
     expected: FAIL
 
   [Web Animations: property <flex-shrink> from neutral to [2\] at (0) should be [1.5\]]
     expected: FAIL
 
-  [CSS Animations: property <flex-shrink> from [inherit\] to [2\] at (1.5) should be [1.5\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-shrink> from [inherit\] to [2\] at (1) should be [2\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-shrink> from [inherit\] to [2\] at (0) should be [3\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-shrink> from [0\] to [1\] at (0) should be [0\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-shrink> from [unset\] to [2\] at (0.6) should be [1.6\]]
-    expected: FAIL
-
   [Web Animations: property <flex-shrink> from [1\] to [2\] at (-0.3) should be [0.7\]]
     expected: FAIL
 
@@ -356,102 +83,33 @@
   [Web Animations: property <flex-shrink> from neutral to [2\] at (1.5) should be [2.25\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <flex-shrink> from [inherit\] to [2\] at (0.3) should be [2.7\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-shrink> from [0\] to [1\] at (1) should be [1\]]
-    expected: FAIL
-
   [Web Animations: property <flex-shrink> from [1\] to [2\] at (1) should be [2\]]
     expected: FAIL
 
-  [CSS Transitions: property <flex-shrink> from [initial\] to [2\] at (1) should be [2\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-shrink> from [initial\] to [2\] at (1.5) should be [2.5\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-shrink> from [1\] to [2\] at (0) should be [1\]]
-    expected: FAIL
-
   [Web Animations: property <flex-shrink> from [unset\] to [2\] at (1) should be [2\]]
     expected: FAIL
 
-  [CSS Animations: property <flex-shrink> from [0\] to [1\] at (0.3) should be [0.3\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-shrink> from neutral to [2\] at (0.6) should be [1.8\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-shrink> from [inherit\] to [2\] at (0.3) should be [2.7\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-shrink> from [0\] to [1\] at (0.6) should be [0.6\]]
-    expected: FAIL
-
   [Web Animations: property <flex-shrink> from [1\] to [2\] at (0.6) should be [1.6\]]
     expected: FAIL
 
-  [CSS Transitions: property <flex-shrink> from [unset\] to [2\] at (0) should be [1\]]
-    expected: FAIL
-
   [Web Animations: property <flex-shrink> from neutral to [2\] at (1) should be [2\]]
     expected: FAIL
 
-  [CSS Animations: property <flex-shrink> from [0\] to [1\] at (1) should be [1\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-shrink> from [unset\] to [2\] at (0.3) should be [1.3\]]
-    expected: FAIL
-
   [Web Animations: property <flex-shrink> from neutral to [2\] at (0.3) should be [1.65\]]
     expected: FAIL
 
   [Web Animations: property <flex-shrink> from [0\] to [1\] at (0.3) should be [0.3\]]
     expected: FAIL
 
-  [CSS Animations: property <flex-shrink> from [0\] to [1\] at (1.5) should be [1.5\]]
-    expected: FAIL
-
-  [CSS Transitions: property <flex-shrink> from [initial\] to [2\] at (-0.3) should be [0.7\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-shrink> from [1\] to [2\] at (-0.3) should be [0.7\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-shrink> from [inherit\] to [2\] at (-0.3) should be [3.3\]]
-    expected: FAIL
-
-  [CSS Animations: property <flex-shrink> from [initial\] to [2\] at (-0.3) should be [0.7\]]
-    expected: FAIL
-
   [Web Animations: property <flex-shrink> from [1\] to [2\] at (0.3) should be [1.3\]]
     expected: FAIL
 
-  [CSS Transitions: property <flex-shrink> from [0\] to [1\] at (1) should be [1\]]
-    expected: FAIL
-
   [Web Animations: property <flex-shrink> from [inherit\] to [2\] at (0.3) should be [2.7\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <flex-shrink> from neutral to [2\] at (1.5) should be [2.25\]]
-    expected: FAIL
-
   [Web Animations: property <flex-shrink> from [unset\] to [2\] at (1.5) should be [2.5\]]
     expected: FAIL
 
   [Web Animations: property <flex-shrink> from [inherit\] to [2\] at (0) should be [3\]]
     expected: FAIL
 
-  [CSS Animations: property <flex-shrink> from [initial\] to [2\] at (0.3) should be [1.3\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-shrink> from [unset\] to [2\] at (-0.3) should be [0.7\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-shrink> from [initial\] to [2\] at (0) should be [1\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <flex-shrink> from [0\] to [1\] at (0) should be [0\]]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/animation/order-interpolation.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/animation/order-interpolation.html.ini
index 022e9d42c4f..24f3a5c0596 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/animation/order-interpolation.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/animation/order-interpolation.html.ini
@@ -1,19 +1,7 @@
 [order-interpolation.html]
-  [CSS Transitions: property <order> from neutral to [20\] at (0.6) should be [16\]]
-    expected: FAIL
-
   [Web Animations: property <order> from [initial\] to [20\] at (0.3) should be [6\]]
     expected: FAIL
 
-  [CSS Animations: property <order> from [initial\] to [20\] at (1.5) should be [30\]]
-    expected: FAIL
-
-  [CSS Transitions: property <order> from [unset\] to [20\] at (0.3) should be [6\]]
-    expected: FAIL
-
-  [CSS Animations: property <order> from [initial\] to [20\] at (0) should be [0\]]
-    expected: FAIL
-
   [Web Animations: property <order> from [inherit\] to [20\] at (0.6) should be [24\]]
     expected: FAIL
 
@@ -23,480 +11,114 @@
   [Web Animations: property <order> from [initial\] to [20\] at (0.6) should be [12\]]
     expected: FAIL
 
-  [CSS Transitions: property <order> from [initial\] to [20\] at (1) should be [20\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <order> from [unset\] to [20\] at (1) should be [20\]]
-    expected: FAIL
-
   [Web Animations: property <order> from [inherit\] to [20\] at (-0.5) should be [35\]]
     expected: FAIL
 
-  [CSS Transitions: property <order> from [unset\] to [20\] at (0) should be [0\]]
-    expected: FAIL
-
-  [CSS Animations: property <order> from [10\] to [20\] at (0.3) should be [13\]]
-    expected: FAIL
-
-  [CSS Animations: property <order> from [inherit\] to [20\] at (-3) should be [60\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <order> from [inherit\] to [20\] at (1) should be [20\]]
-    expected: FAIL
-
   [Web Animations: property <order> from neutral to [20\] at (-3) should be [-20\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <order> from [10\] to [20\] at (0) should be [10\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <order> from neutral to [20\] at (1.5) should be [25\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <order> from neutral to [20\] at (1) should be [20\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <order> from [initial\] to [20\] at (-3) should be [-60\]]
-    expected: FAIL
-
   [Web Animations: property <order> from [2\] to [4\] at (1.5) should be [5\]]
     expected: FAIL
 
-  [CSS Transitions: property <order> from [unset\] to [20\] at (1) should be [20\]]
-    expected: FAIL
-
-  [CSS Animations: property <order> from [2\] to [4\] at (0.6) should be [3\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <order> from [unset\] to [20\] at (-0.5) should be [-10\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <order> from [10\] to [20\] at (-3) should be [-20\]]
-    expected: FAIL
-
   [Web Animations: property <order> from [10\] to [20\] at (1) should be [20\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <order> from [2\] to [4\] at (0.3) should be [3\]]
-    expected: FAIL
-
-  [CSS Animations: property <order> from [10\] to [20\] at (0) should be [10\]]
-    expected: FAIL
-
-  [CSS Transitions: property <order> from [unset\] to [20\] at (-0.5) should be [-10\]]
-    expected: FAIL
-
-  [CSS Animations: property <order> from [10\] to [20\] at (-0.5) should be [5\]]
-    expected: FAIL
-
-  [CSS Transitions: property <order> from [10\] to [20\] at (1.5) should be [25\]]
-    expected: FAIL
-
-  [CSS Animations: property <order> from [initial\] to [20\] at (0.3) should be [6\]]
-    expected: FAIL
-
-  [CSS Transitions: property <order> from [unset\] to [20\] at (0.6) should be [12\]]
-    expected: FAIL
-
   [Web Animations: property <order> from [inherit\] to [20\] at (0) should be [30\]]
     expected: FAIL
 
-  [CSS Animations: property <order> from neutral to [20\] at (0.3) should be [13\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <order> from neutral to [20\] at (0.6) should be [16\]]
-    expected: FAIL
-
-  [CSS Transitions: property <order> from [unset\] to [20\] at (1.5) should be [30\]]
-    expected: FAIL
-
   [Web Animations: property <order> from [inherit\] to [20\] at (1.5) should be [15\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <order> from [initial\] to [20\] at (0) should be [0\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <order> from neutral to [20\] at (0.3) should be [13\]]
-    expected: FAIL
-
-  [CSS Transitions: property <order> from neutral to [20\] at (-0.5) should be [5\]]
-    expected: FAIL
-
   [Web Animations: property <order> from [unset\] to [20\] at (0.6) should be [12\]]
     expected: FAIL
 
-  [CSS Animations: property <order> from neutral to [20\] at (0.6) should be [16\]]
-    expected: FAIL
-
-  [CSS Transitions: property <order> from [10\] to [20\] at (0.6) should be [16\]]
-    expected: FAIL
-
-  [CSS Animations: property <order> from [unset\] to [20\] at (0.3) should be [6\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <order> from [inherit\] to [20\] at (0.6) should be [24\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <order> from [initial\] to [20\] at (0.6) should be [12\]]
-    expected: FAIL
-
   [Web Animations: property <order> from [2\] to [4\] at (1) should be [4\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <order> from [10\] to [20\] at (1.5) should be [25\]]
-    expected: FAIL
-
-  [CSS Animations: property <order> from neutral to [20\] at (1.5) should be [25\]]
-    expected: FAIL
-
-  [CSS Transitions: property <order> from [initial\] to [20\] at (0.3) should be [6\]]
-    expected: FAIL
-
-  [CSS Animations: property <order> from [2\] to [4\] at (-0.5) should be [1\]]
-    expected: FAIL
-
   [Web Animations: property <order> from [10\] to [20\] at (1.5) should be [25\]]
     expected: FAIL
 
-  [CSS Transitions: property <order> from [inherit\] to [20\] at (-3) should be [60\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <order> from [unset\] to [20\] at (0) should be [0\]]
-    expected: FAIL
-
-  [CSS Animations: property <order> from [10\] to [20\] at (1.5) should be [25\]]
-    expected: FAIL
-
-  [CSS Transitions: property <order> from [10\] to [20\] at (0) should be [10\]]
-    expected: FAIL
-
-  [CSS Animations: property <order> from neutral to [20\] at (1) should be [20\]]
-    expected: FAIL
-
-  [CSS Animations: property <order> from [2\] to [4\] at (0) should be [2\]]
-    expected: FAIL
-
-  [CSS Animations: property <order> from [inherit\] to [20\] at (1.5) should be [15\]]
-    expected: FAIL
-
-  [CSS Transitions: property <order> from [10\] to [20\] at (0.3) should be [13\]]
-    expected: FAIL
-
   [Web Animations: property <order> from [2\] to [4\] at (-0.5) should be [1\]]
     expected: FAIL
 
-  [CSS Animations: property <order> from [unset\] to [20\] at (-3) should be [-60\]]
-    expected: FAIL
-
-  [CSS Animations: property <order> from [initial\] to [20\] at (0.6) should be [12\]]
-    expected: FAIL
-
-  [CSS Animations: property <order> from [inherit\] to [20\] at (0.3) should be [27\]]
-    expected: FAIL
-
   [Web Animations: property <order> from [10\] to [20\] at (0.6) should be [16\]]
     expected: FAIL
 
-  [CSS Transitions: property <order> from [inherit\] to [20\] at (0) should be [30\]]
-    expected: FAIL
-
   [Web Animations: property <order> from neutral to [20\] at (1) should be [20\]]
     expected: FAIL
 
   [Web Animations: property <order> from [initial\] to [20\] at (-3) should be [-60\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <order> from [initial\] to [20\] at (1.5) should be [30\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <order> from [inherit\] to [20\] at (0.3) should be [27\]]
-    expected: FAIL
-
-  [CSS Transitions: property <order> from [10\] to [20\] at (1) should be [20\]]
-    expected: FAIL
-
   [Web Animations: property <order> from [10\] to [20\] at (-3) should be [-20\]]
     expected: FAIL
 
-  [CSS Animations: property <order> from [initial\] to [20\] at (-3) should be [-60\]]
-    expected: FAIL
-
-  [CSS Animations: property <order> from [unset\] to [20\] at (0) should be [0\]]
-    expected: FAIL
-
   [Web Animations: property <order> from [initial\] to [20\] at (1) should be [20\]]
     expected: FAIL
 
-  [CSS Animations: property <order> from [2\] to [4\] at (-3) should be [-4\]]
-    expected: FAIL
-
-  [CSS Animations: property <order> from neutral to [20\] at (0) should be [10\]]
-    expected: FAIL
-
   [Web Animations: property <order> from [inherit\] to [20\] at (-3) should be [60\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <order> from [2\] to [4\] at (-0.5) should be [1\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <order> from [inherit\] to [20\] at (-0.5) should be [35\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <order> from [2\] to [4\] at (1.5) should be [5\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <order> from [initial\] to [20\] at (0.3) should be [6\]]
-    expected: FAIL
-
-  [CSS Transitions: property <order> from [initial\] to [20\] at (1.5) should be [30\]]
-    expected: FAIL
-
-  [CSS Animations: property <order> from [2\] to [4\] at (1.5) should be [5\]]
-    expected: FAIL
-
   [Web Animations: property <order> from neutral to [20\] at (0.3) should be [13\]]
     expected: FAIL
 
-  [CSS Animations: property <order> from [unset\] to [20\] at (-0.5) should be [-10\]]
-    expected: FAIL
-
-  [CSS Transitions: property <order> from neutral to [20\] at (1) should be [20\]]
-    expected: FAIL
-
   [Web Animations: property <order> from [10\] to [20\] at (0.3) should be [13\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <order> from [unset\] to [20\] at (0.6) should be [12\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <order> from [unset\] to [20\] at (1.5) should be [30\]]
-    expected: FAIL
-
   [Web Animations: property <order> from [unset\] to [20\] at (0) should be [0\]]
     expected: FAIL
 
-  [CSS Transitions: property <order> from [2\] to [4\] at (-0.5) should be [1\]]
-    expected: FAIL
-
-  [CSS Transitions: property <order> from [2\] to [4\] at (0.6) should be [3\]]
-    expected: FAIL
-
-  [CSS Animations: property <order> from [inherit\] to [20\] at (0) should be [30\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <order> from [initial\] to [20\] at (-0.5) should be [-10\]]
-    expected: FAIL
-
   [Web Animations: property <order> from neutral to [20\] at (0) should be [10\]]
     expected: FAIL
 
-  [CSS Transitions: property <order> from [2\] to [4\] at (0.3) should be [3\]]
-    expected: FAIL
-
-  [CSS Transitions: property <order> from [2\] to [4\] at (-3) should be [-4\]]
-    expected: FAIL
-
-  [CSS Transitions: property <order> from neutral to [20\] at (-3) should be [-20\]]
-    expected: FAIL
-
-  [CSS Transitions: property <order> from [10\] to [20\] at (-0.5) should be [5\]]
-    expected: FAIL
-
-  [CSS Animations: property <order> from [inherit\] to [20\] at (-0.5) should be [35\]]
-    expected: FAIL
-
   [Web Animations: property <order> from neutral to [20\] at (0.6) should be [16\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <order> from neutral to [20\] at (-0.5) should be [5\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <order> from [initial\] to [20\] at (1) should be [20\]]
-    expected: FAIL
-
-  [CSS Transitions: property <order> from [inherit\] to [20\] at (0.3) should be [27\]]
-    expected: FAIL
-
-  [CSS Transitions: property <order> from neutral to [20\] at (0.3) should be [13\]]
-    expected: FAIL
-
-  [CSS Animations: property <order> from [10\] to [20\] at (1) should be [20\]]
-    expected: FAIL
-
-  [CSS Animations: property <order> from [2\] to [4\] at (0.3) should be [3\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <order> from neutral to [20\] at (0) should be [10\]]
-    expected: FAIL
-
-  [CSS Animations: property <order> from [inherit\] to [20\] at (1) should be [20\]]
-    expected: FAIL
-
-  [CSS Animations: property <order> from [unset\] to [20\] at (1) should be [20\]]
-    expected: FAIL
-
-  [CSS Animations: property <order> from [initial\] to [20\] at (1) should be [20\]]
-    expected: FAIL
-
-  [CSS Animations: property <order> from [unset\] to [20\] at (0.6) should be [12\]]
-    expected: FAIL
-
-  [CSS Transitions: property <order> from [2\] to [4\] at (1.5) should be [5\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <order> from [2\] to [4\] at (0) should be [2\]]
-    expected: FAIL
-
-  [CSS Animations: property <order> from neutral to [20\] at (-3) should be [-20\]]
-    expected: FAIL
-
-  [CSS Transitions: property <order> from [inherit\] to [20\] at (0.6) should be [24\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <order> from [10\] to [20\] at (0.3) should be [13\]]
-    expected: FAIL
-
-  [CSS Animations: property <order> from [inherit\] to [20\] at (0.6) should be [24\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <order> from [10\] to [20\] at (1) should be [20\]]
-    expected: FAIL
-
-  [CSS Transitions: property <order> from [initial\] to [20\] at (0.6) should be [12\]]
-    expected: FAIL
-
-  [CSS Transitions: property <order> from [2\] to [4\] at (1) should be [4\]]
-    expected: FAIL
-
-  [CSS Transitions: property <order> from [10\] to [20\] at (-3) should be [-20\]]
-    expected: FAIL
-
-  [CSS Animations: property <order> from [2\] to [4\] at (1) should be [4\]]
-    expected: FAIL
-
   [Web Animations: property <order> from [2\] to [4\] at (0) should be [2\]]
     expected: FAIL
 
-  [CSS Transitions: property <order> from [inherit\] to [20\] at (1.5) should be [15\]]
-    expected: FAIL
-
-  [CSS Animations: property <order> from [10\] to [20\] at (-3) should be [-20\]]
-    expected: FAIL
-
   [Web Animations: property <order> from [initial\] to [20\] at (0) should be [0\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <order> from [inherit\] to [20\] at (1.5) should be [15\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <order> from [2\] to [4\] at (0.6) should be [3\]]
-    expected: FAIL
-
-  [CSS Transitions: property <order> from [inherit\] to [20\] at (-0.5) should be [35\]]
-    expected: FAIL
-
   [Web Animations: property <order> from [unset\] to [20\] at (-3) should be [-60\]]
     expected: FAIL
 
-  [CSS Animations: property <order> from [initial\] to [20\] at (-0.5) should be [-10\]]
-    expected: FAIL
-
-  [CSS Transitions: property <order> from neutral to [20\] at (1.5) should be [25\]]
-    expected: FAIL
-
-  [CSS Transitions: property <order> from [initial\] to [20\] at (-0.5) should be [-10\]]
-    expected: FAIL
-
   [Web Animations: property <order> from [inherit\] to [20\] at (0.3) should be [27\]]
     expected: FAIL
 
-  [CSS Transitions: property <order> from [inherit\] to [20\] at (1) should be [20\]]
-    expected: FAIL
-
   [Web Animations: property <order> from [initial\] to [20\] at (1.5) should be [30\]]
     expected: FAIL
 
-  [CSS Transitions: property <order> from [2\] to [4\] at (0) should be [2\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <order> from neutral to [20\] at (-3) should be [-20\]]
-    expected: FAIL
-
   [Web Animations: property <order> from [2\] to [4\] at (0.6) should be [3\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <order> from [unset\] to [20\] at (0.3) should be [6\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <order> from [inherit\] to [20\] at (0) should be [30\]]
-    expected: FAIL
-
-  [CSS Animations: property <order> from [10\] to [20\] at (0.6) should be [16\]]
-    expected: FAIL
-
   [Web Animations: property <order> from [2\] to [4\] at (0.3) should be [3\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <order> from [10\] to [20\] at (-0.5) should be [5\]]
-    expected: FAIL
-
   [Web Animations: property <order> from neutral to [20\] at (1.5) should be [25\]]
     expected: FAIL
 
-  [CSS Transitions: property <order> from [initial\] to [20\] at (0) should be [0\]]
-    expected: FAIL
-
   [Web Animations: property <order> from [inherit\] to [20\] at (1) should be [20\]]
     expected: FAIL
 
-  [CSS Transitions: property <order> from [unset\] to [20\] at (-3) should be [-60\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <order> from [inherit\] to [20\] at (-3) should be [60\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <order> from [2\] to [4\] at (-3) should be [-4\]]
-    expected: FAIL
-
   [Web Animations: property <order> from [initial\] to [20\] at (-0.5) should be [-10\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <order> from [2\] to [4\] at (1) should be [4\]]
-    expected: FAIL
-
-  [CSS Transitions with transition: all: property <order> from [10\] to [20\] at (0.6) should be [16\]]
-    expected: FAIL
-
   [Web Animations: property <order> from [unset\] to [20\] at (0.3) should be [6\]]
     expected: FAIL
 
   [Web Animations: property <order> from neutral to [20\] at (-0.5) should be [5\]]
     expected: FAIL
 
-  [CSS Transitions: property <order> from neutral to [20\] at (0) should be [10\]]
-    expected: FAIL
-
-  [CSS Animations: property <order> from neutral to [20\] at (-0.5) should be [5\]]
-    expected: FAIL
-
   [Web Animations: property <order> from [unset\] to [20\] at (-0.5) should be [-10\]]
     expected: FAIL
 
-  [CSS Animations: property <order> from [unset\] to [20\] at (1.5) should be [30\]]
-    expected: FAIL
-
-  [CSS Transitions: property <order> from [initial\] to [20\] at (-3) should be [-60\]]
-    expected: FAIL
-
   [Web Animations: property <order> from [unset\] to [20\] at (1) should be [20\]]
     expected: FAIL
 
   [Web Animations: property <order> from [unset\] to [20\] at (1.5) should be [30\]]
     expected: FAIL
 
-  [CSS Transitions with transition: all: property <order> from [unset\] to [20\] at (-3) should be [-60\]]
-    expected: FAIL
-
   [Web Animations: property <order> from [10\] to [20\] at (0) should be [10\]]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/auto-height-with-flex.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/auto-height-with-flex.html.ini
new file mode 100644
index 00000000000..f13a42b589b
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/auto-height-with-flex.html.ini
@@ -0,0 +1,2 @@
+[auto-height-with-flex.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/auto-margins-003.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/auto-margins-003.html.ini
new file mode 100644
index 00000000000..58f80727857
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/auto-margins-003.html.ini
@@ -0,0 +1,2 @@
+[auto-margins-003.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/css-flexbox-column-reverse.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/css-flexbox-column-reverse.html.ini
new file mode 100644
index 00000000000..f81e563d8dc
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/css-flexbox-column-reverse.html.ini
@@ -0,0 +1,2 @@
+[css-flexbox-column-reverse.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/css-flexbox-column.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/css-flexbox-column.html.ini
new file mode 100644
index 00000000000..8f08618d7ce
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/css-flexbox-column.html.ini
@@ -0,0 +1,2 @@
+[css-flexbox-column.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/display-flex-001.htm.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/display-flex-001.htm.ini
deleted file mode 100644
index e905bd40eee..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/display-flex-001.htm.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[display-flex-001.htm]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/display_flex_exist.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/display_flex_exist.html.ini
deleted file mode 100644
index 999c3eeebf5..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/display_flex_exist.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[display_flex_exist.html]
-  [CSS Flexible Box Test: display_flex]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/display_inline-flex_exist.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/display_inline-flex_exist.html.ini
deleted file mode 100644
index 5d9179606af..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/display_inline-flex_exist.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[display_inline-flex_exist.html]
-  [CSS Flexible Box Test: display_inline-flex]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/dynamic-change-simplified-layout-002.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/dynamic-change-simplified-layout-002.html.ini
new file mode 100644
index 00000000000..e530450491a
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/dynamic-change-simplified-layout-002.html.ini
@@ -0,0 +1,2 @@
+[dynamic-change-simplified-layout-002.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/dynamic-change-simplified-layout.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/dynamic-change-simplified-layout.html.ini
new file mode 100644
index 00000000000..821870fdc77
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/dynamic-change-simplified-layout.html.ini
@@ -0,0 +1,2 @@
+[dynamic-change-simplified-layout.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/fit-content-item-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/fit-content-item-001.html.ini
deleted file mode 100644
index 6beee86e999..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/fit-content-item-001.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[fit-content-item-001.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-align-content-space-between.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-align-content-space-between.html.ini
new file mode 100644
index 00000000000..e10b2f33ae2
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-align-content-space-between.html.ini
@@ -0,0 +1,2 @@
+[flex-align-content-space-between.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-align-content-start.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-align-content-start.html.ini
new file mode 100644
index 00000000000..19e606aada8
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-align-content-start.html.ini
@@ -0,0 +1,2 @@
+[flex-align-content-start.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-aspect-ratio-img-column-004.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-aspect-ratio-img-column-004.html.ini
new file mode 100644
index 00000000000..c62249a6aba
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-aspect-ratio-img-column-004.html.ini
@@ -0,0 +1,2 @@
+[flex-aspect-ratio-img-column-004.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-basis-005.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-basis-005.html.ini
deleted file mode 100644
index 7f97a040efc..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-basis-005.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flex-basis-005.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-basis-006.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-basis-006.html.ini
deleted file mode 100644
index 737b7b8cfe1..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-basis-006.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flex-basis-006.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-box-wrap.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-box-wrap.html.ini
new file mode 100644
index 00000000000..53be7c3c03c
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-box-wrap.html.ini
@@ -0,0 +1,2 @@
+[flex-box-wrap.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-direction-modify.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-direction-modify.html.ini
deleted file mode 100644
index 4628cda4267..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-direction-modify.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flex-direction-modify.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-direction-row-reverse.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-direction-row-reverse.html.ini
deleted file mode 100644
index b0ddd9425d3..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-direction-row-reverse.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flex-direction-row-reverse.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-flexitem-childmargin.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-flexitem-childmargin.html.ini
deleted file mode 100644
index fdd2ec61a60..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-flexitem-childmargin.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flex-flexitem-childmargin.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-flexitem-percentage-prescation.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-flexitem-percentage-prescation.html.ini
deleted file mode 100644
index 82b44af76d1..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-flexitem-percentage-prescation.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flex-flexitem-percentage-prescation.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-grow-003.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-grow-003.html.ini
deleted file mode 100644
index a6cfb2877b8..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-grow-003.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flex-grow-003.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-grow-005.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-grow-005.html.ini
deleted file mode 100644
index 0de2312e9ce..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-grow-005.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flex-grow-005.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-item-vertical-align.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-item-vertical-align.html.ini
new file mode 100644
index 00000000000..b38c46e3ba3
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-item-vertical-align.html.ini
@@ -0,0 +1,2 @@
+[flex-item-vertical-align.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-height-flex-items-013.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-height-flex-items-013.html.ini
new file mode 100644
index 00000000000..2ac5d4cca1b
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-height-flex-items-013.html.ini
@@ -0,0 +1,2 @@
+[flex-minimum-height-flex-items-013.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-height-flex-items-016.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-height-flex-items-016.html.ini
new file mode 100644
index 00000000000..951affe1206
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-height-flex-items-016.html.ini
@@ -0,0 +1,2 @@
+[flex-minimum-height-flex-items-016.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-height-flex-items-017.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-height-flex-items-017.html.ini
new file mode 100644
index 00000000000..b13aa56680f
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-height-flex-items-017.html.ini
@@ -0,0 +1,2 @@
+[flex-minimum-height-flex-items-017.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-height-flex-items-018.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-height-flex-items-018.html.ini
new file mode 100644
index 00000000000..4744bcf636d
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-minimum-height-flex-items-018.html.ini
@@ -0,0 +1,2 @@
+[flex-minimum-height-flex-items-018.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-flex-wrap-default.htm.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-flex-wrap-default.htm.ini
deleted file mode 100644
index d1737d1cdb5..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-flex-wrap-default.htm.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox-flex-wrap-default.htm]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-flex-wrap-nowrap.htm.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-flex-wrap-nowrap.htm.ini
deleted file mode 100644
index c68a2ae7ee7..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-flex-wrap-nowrap.htm.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox-flex-wrap-nowrap.htm]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-gap-position-absolute.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-gap-position-absolute.html.ini
new file mode 100644
index 00000000000..0f12b4d1a2a
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-gap-position-absolute.html.ini
@@ -0,0 +1,2 @@
+[flexbox-gap-position-absolute.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-with-multi-column-property.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-with-multi-column-property.html.ini
new file mode 100644
index 00000000000..1a5d16bcfb2
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox-with-multi-column-property.html.ini
@@ -0,0 +1,2 @@
+[flexbox-with-multi-column-property.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_absolute-atomic.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_absolute-atomic.html.ini
new file mode 100644
index 00000000000..4ac53227ffc
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_absolute-atomic.html.ini
@@ -0,0 +1,2 @@
+[flexbox_absolute-atomic.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_align-items-flexstart-2.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_align-items-flexstart-2.html.ini
new file mode 100644
index 00000000000..841c8205a99
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_align-items-flexstart-2.html.ini
@@ -0,0 +1,2 @@
+[flexbox_align-items-flexstart-2.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_align-items-flexstart.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_align-items-flexstart.html.ini
new file mode 100644
index 00000000000..7e5c7f05193
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_align-items-flexstart.html.ini
@@ -0,0 +1,2 @@
+[flexbox_align-items-flexstart.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_align-items-stretch-3.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_align-items-stretch-3.html.ini
deleted file mode 100644
index 9880266ee58..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_align-items-stretch-3.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_align-items-stretch-3.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_align-items-stretch.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_align-items-stretch.html.ini
deleted file mode 100644
index aab6c626c43..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_align-items-stretch.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_align-items-stretch.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_columns.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_columns.html.ini
deleted file mode 100644
index 08b2b625490..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_columns.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_columns.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_direction-row-reverse.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_direction-row-reverse.html.ini
deleted file mode 100644
index 38287afa386..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_direction-row-reverse.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_direction-row-reverse.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_fbfc2.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_fbfc2.html.ini
new file mode 100644
index 00000000000..4b224993b2f
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_fbfc2.html.ini
@@ -0,0 +1,2 @@
+[flexbox_fbfc2.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-0-0-1-unitless-basis.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-0-0-1-unitless-basis.html.ini
deleted file mode 100644
index 5d1556e7fe6..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-0-0-1-unitless-basis.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-0-0-1-unitless-basis.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-0-0-N-shrink.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-0-0-N-shrink.html.ini
deleted file mode 100644
index 7e809f9bd13..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-0-0-N-shrink.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-0-0-N-shrink.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-0-0-N-unitless-basis.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-0-0-N-unitless-basis.html.ini
deleted file mode 100644
index 511e21c4bfe..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-0-0-N-unitless-basis.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-0-0-N-unitless-basis.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-0-0-N.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-0-0-N.html.ini
deleted file mode 100644
index 786ed3cb67b..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-0-0-N.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-0-0-N.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-0-0-Npercent-shrink.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-0-0-Npercent-shrink.html.ini
deleted file mode 100644
index b4df4a3fc46..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-0-0-Npercent-shrink.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-0-0-Npercent-shrink.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-0-0-Npercent.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-0-0-Npercent.html.ini
deleted file mode 100644
index 52658e6f8e9..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-0-0-Npercent.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-0-0-Npercent.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-0-0-auto-shrink.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-0-0-auto-shrink.html.ini
deleted file mode 100644
index 6314943272c..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-0-0-auto-shrink.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-0-0-auto-shrink.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-0-0-auto.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-0-0-auto.html.ini
deleted file mode 100644
index 0dfc48343ee..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-0-0-auto.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-0-0-auto.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-0-1-1-unitless-basis.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-0-1-1-unitless-basis.html.ini
deleted file mode 100644
index 05defbf9c55..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-0-1-1-unitless-basis.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-0-1-1-unitless-basis.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-0-1-N-shrink.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-0-1-N-shrink.html.ini
deleted file mode 100644
index b213525ee8f..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-0-1-N-shrink.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-0-1-N-shrink.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-0-1-N-unitless-basis.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-0-1-N-unitless-basis.html.ini
deleted file mode 100644
index f9f6c1743eb..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-0-1-N-unitless-basis.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-0-1-N-unitless-basis.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-0-1-N.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-0-1-N.html.ini
deleted file mode 100644
index 6ac3e89c6f6..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-0-1-N.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-0-1-N.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-0-1-Npercent-shrink.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-0-1-Npercent-shrink.html.ini
deleted file mode 100644
index a7184fc8390..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-0-1-Npercent-shrink.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-0-1-Npercent-shrink.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-0-1-Npercent.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-0-1-Npercent.html.ini
deleted file mode 100644
index 452a800a42a..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-0-1-Npercent.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-0-1-Npercent.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-0-1-auto-shrink.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-0-1-auto-shrink.html.ini
deleted file mode 100644
index 861f7d58b22..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-0-1-auto-shrink.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-0-1-auto-shrink.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-0-1-auto.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-0-1-auto.html.ini
deleted file mode 100644
index 81941c9f5de..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-0-1-auto.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-0-1-auto.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-0-N-N-shrink.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-0-N-N-shrink.html.ini
deleted file mode 100644
index 5720131f7cd..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-0-N-N-shrink.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-0-N-N-shrink.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-0-N-N.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-0-N-N.html.ini
deleted file mode 100644
index f5bf9fb3cb9..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-0-N-N.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-0-N-N.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-0-N-Npercent-shrink.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-0-N-Npercent-shrink.html.ini
deleted file mode 100644
index 8e153f3d442..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-0-N-Npercent-shrink.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-0-N-Npercent-shrink.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-0-N-Npercent.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-0-N-Npercent.html.ini
deleted file mode 100644
index 9e747f47e06..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-0-N-Npercent.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-0-N-Npercent.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-0-N-auto-shrink.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-0-N-auto-shrink.html.ini
deleted file mode 100644
index eff4c689886..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-0-N-auto-shrink.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-0-N-auto-shrink.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-0-N-auto.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-0-N-auto.html.ini
deleted file mode 100644
index 0f8e71fafce..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-0-N-auto.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-0-N-auto.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-0-auto.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-0-auto.html.ini
deleted file mode 100644
index 1fb95f4f2c0..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-0-auto.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-0-auto.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-0-0-unitless.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-0-0-unitless.html.ini
deleted file mode 100644
index 4f20ed955f3..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-0-0-unitless.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-1-0-0-unitless.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-0-0.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-0-0.html.ini
deleted file mode 100644
index 154cb16bd19..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-0-0.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-1-0-0.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-0-N-shrink.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-0-N-shrink.html.ini
deleted file mode 100644
index 70aa9ddf524..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-0-N-shrink.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-1-0-N-shrink.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-0-N.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-0-N.html.ini
deleted file mode 100644
index 43f1d5760ef..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-0-N.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-1-0-N.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-0-Npercent-shrink.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-0-Npercent-shrink.html.ini
deleted file mode 100644
index 2e4a569d57d..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-0-Npercent-shrink.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-1-0-Npercent-shrink.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-0-Npercent.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-0-Npercent.html.ini
deleted file mode 100644
index 3e2a1a43bf7..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-0-Npercent.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-1-0-Npercent.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-0-auto-shrink.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-0-auto-shrink.html.ini
deleted file mode 100644
index 3c512aab913..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-0-auto-shrink.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-1-0-auto-shrink.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-0-auto.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-0-auto.html.ini
deleted file mode 100644
index 36eb39d793b..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-0-auto.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-1-0-auto.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-0.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-0.html.ini
deleted file mode 100644
index 0dd5a347cbc..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-0.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-1-0.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-1-0-unitless.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-1-0-unitless.html.ini
deleted file mode 100644
index ecc8a4c0324..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-1-0-unitless.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-1-1-0-unitless.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-1-0.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-1-0.html.ini
deleted file mode 100644
index 8ca302dcf95..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-1-0.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-1-1-0.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-1-N-shrink.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-1-N-shrink.html.ini
deleted file mode 100644
index ec4ea8ded9f..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-1-N-shrink.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-1-1-N-shrink.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-1-N.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-1-N.html.ini
deleted file mode 100644
index d90a57072b0..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-1-N.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-1-1-N.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-1-Npercent-shrink.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-1-Npercent-shrink.html.ini
deleted file mode 100644
index bcef71b19fe..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-1-Npercent-shrink.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-1-1-Npercent-shrink.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-1-Npercent.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-1-Npercent.html.ini
deleted file mode 100644
index 41a9989255e..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-1-Npercent.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-1-1-Npercent.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-1-auto-shrink.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-1-auto-shrink.html.ini
deleted file mode 100644
index aec63881253..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-1-auto-shrink.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-1-1-auto-shrink.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-1-auto.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-1-auto.html.ini
deleted file mode 100644
index bac09567bfc..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-1-auto.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-1-1-auto.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-1.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-1.html.ini
deleted file mode 100644
index c3b86b1e789..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-1.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-1-1.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-N-0-unitless.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-N-0-unitless.html.ini
deleted file mode 100644
index 27440635c8f..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-N-0-unitless.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-1-N-0-unitless.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-N-0.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-N-0.html.ini
deleted file mode 100644
index 0a334e1ffb3..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-N-0.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-1-N-0.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-N-N-shrink.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-N-N-shrink.html.ini
deleted file mode 100644
index ad49347166d..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-N-N-shrink.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-1-N-N-shrink.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-N-N.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-N-N.html.ini
deleted file mode 100644
index ea4405f0d16..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-N-N.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-1-N-N.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-N-Npercent-shrink.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-N-Npercent-shrink.html.ini
deleted file mode 100644
index 8e5a80cc33f..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-N-Npercent-shrink.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-1-N-Npercent-shrink.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-N-Npercent.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-N-Npercent.html.ini
deleted file mode 100644
index eef001d8812..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-N-Npercent.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-1-N-Npercent.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-N-auto-shrink.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-N-auto-shrink.html.ini
deleted file mode 100644
index 0acb46c3bfc..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-N-auto-shrink.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-1-N-auto-shrink.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-N-auto.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-N-auto.html.ini
deleted file mode 100644
index 793bd4750cd..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-N-auto.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-1-N-auto.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-N.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-N.html.ini
deleted file mode 100644
index 29d97021f94..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-1-N.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-1-N.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-0-0-unitless.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-0-0-unitless.html.ini
deleted file mode 100644
index 0fdbb1d438f..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-0-0-unitless.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-N-0-0-unitless.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-0-0.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-0-0.html.ini
deleted file mode 100644
index 90e0ae4cbcc..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-0-0.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-N-0-0.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-0-N-shrink.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-0-N-shrink.html.ini
deleted file mode 100644
index a635816d37a..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-0-N-shrink.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-N-0-N-shrink.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-0-N.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-0-N.html.ini
deleted file mode 100644
index fa7cd7f3f8d..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-0-N.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-N-0-N.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-0-Npercent-shrink.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-0-Npercent-shrink.html.ini
deleted file mode 100644
index 87784f1ac94..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-0-Npercent-shrink.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-N-0-Npercent-shrink.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-0-Npercent.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-0-Npercent.html.ini
deleted file mode 100644
index 98b086b1fdd..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-0-Npercent.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-N-0-Npercent.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-0-auto-shrink.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-0-auto-shrink.html.ini
deleted file mode 100644
index febcef74b54..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-0-auto-shrink.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-N-0-auto-shrink.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-0-auto.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-0-auto.html.ini
deleted file mode 100644
index b0119833eff..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-0-auto.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-N-0-auto.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-0.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-0.html.ini
deleted file mode 100644
index 42329cce32b..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-0.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-N-0.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-1-0-unitless.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-1-0-unitless.html.ini
deleted file mode 100644
index f76cc23d75a..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-1-0-unitless.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-N-1-0-unitless.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-1-0.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-1-0.html.ini
deleted file mode 100644
index 41fcc212d78..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-1-0.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-N-1-0.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-1-N-shrink.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-1-N-shrink.html.ini
deleted file mode 100644
index 8df9bd76fe8..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-1-N-shrink.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-N-1-N-shrink.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-1-N.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-1-N.html.ini
deleted file mode 100644
index f2d338e83de..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-1-N.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-N-1-N.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-1-Npercent-shrink.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-1-Npercent-shrink.html.ini
deleted file mode 100644
index d04d750a54c..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-1-Npercent-shrink.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-N-1-Npercent-shrink.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-1-Npercent.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-1-Npercent.html.ini
deleted file mode 100644
index 6fd93cd1517..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-1-Npercent.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-N-1-Npercent.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-1-auto-shrink.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-1-auto-shrink.html.ini
deleted file mode 100644
index e2dc2fcec18..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-1-auto-shrink.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-N-1-auto-shrink.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-1-auto.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-1-auto.html.ini
deleted file mode 100644
index 8b078b62653..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-1-auto.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-N-1-auto.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-1.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-1.html.ini
deleted file mode 100644
index 1d0b3e56f16..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-1.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-N-1.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-N-0-unitless.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-N-0-unitless.html.ini
deleted file mode 100644
index f5ae7f4d01e..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-N-0-unitless.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-N-N-0-unitless.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-N-0.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-N-0.html.ini
deleted file mode 100644
index 474240cb79f..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-N-0.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-N-N-0.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-N-N-shrink.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-N-N-shrink.html.ini
deleted file mode 100644
index 5323a5e88a5..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-N-N-shrink.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-N-N-N-shrink.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-N-N.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-N-N.html.ini
deleted file mode 100644
index c8b7ce856f2..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-N-N.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-N-N-N.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-N-Npercent-shrink.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-N-Npercent-shrink.html.ini
deleted file mode 100644
index a15d08d874e..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-N-Npercent-shrink.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-N-N-Npercent-shrink.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-N-Npercent.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-N-Npercent.html.ini
deleted file mode 100644
index ef56865a49d..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-N-Npercent.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-N-N-Npercent.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-N-auto-shrink.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-N-auto-shrink.html.ini
deleted file mode 100644
index bcc836068df..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-N-auto-shrink.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-N-N-auto-shrink.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-N-auto.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-N-auto.html.ini
deleted file mode 100644
index e613850b53e..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-N-auto.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-N-N-auto.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-N.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-N.html.ini
deleted file mode 100644
index 3121e26b0ad..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-N-N.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-N-N.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-auto.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-auto.html.ini
deleted file mode 100644
index 785b5e56c13..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-auto.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-auto.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-basis-shrink.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-basis-shrink.html.ini
deleted file mode 100644
index eb2ff371034..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-basis-shrink.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-basis-shrink.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-basis.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-basis.html.ini
deleted file mode 100644
index c8d9b133207..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-basis.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-basis.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-formatting-interop.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-formatting-interop.html.ini
new file mode 100644
index 00000000000..0a5916356e7
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-formatting-interop.html.ini
@@ -0,0 +1,2 @@
+[flexbox_flex-formatting-interop.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-initial-2.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-initial-2.html.ini
deleted file mode 100644
index 3e62ebca173..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-initial-2.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-initial-2.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-initial.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-initial.html.ini
deleted file mode 100644
index 59f2d2ec926..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-initial.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-initial.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-natural-mixed-basis-auto.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-natural-mixed-basis-auto.html.ini
deleted file mode 100644
index 89743c42258..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-natural-mixed-basis-auto.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-natural-mixed-basis-auto.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-natural-mixed-basis.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-natural-mixed-basis.html.ini
deleted file mode 100644
index 03413398626..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-natural-mixed-basis.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-natural-mixed-basis.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-natural.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-natural.html.ini
deleted file mode 100644
index da4c8b70a1b..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-natural.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-natural.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-none.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-none.html.ini
deleted file mode 100644
index 35f632f37ae..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flex-none.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flex-none.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_generated-flex.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_generated-flex.html.ini
deleted file mode 100644
index 1c7a35ca24b..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_generated-flex.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_generated-flex.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_generated-nested-flex.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_generated-nested-flex.html.ini
deleted file mode 100644
index 451647db0a0..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_generated-nested-flex.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_generated-nested-flex.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_item-bottom-float.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_item-bottom-float.html.ini
new file mode 100644
index 00000000000..cf3481ffbfc
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_item-bottom-float.html.ini
@@ -0,0 +1,2 @@
+[flexbox_item-bottom-float.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_item-clear.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_item-clear.html.ini
new file mode 100644
index 00000000000..b6b83785053
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_item-clear.html.ini
@@ -0,0 +1,2 @@
+[flexbox_item-clear.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_item-float.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_item-float.html.ini
new file mode 100644
index 00000000000..5f91b0496e1
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_item-float.html.ini
@@ -0,0 +1,2 @@
+[flexbox_item-float.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_item-top-float.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_item-top-float.html.ini
new file mode 100644
index 00000000000..421a0213bcd
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_item-top-float.html.ini
@@ -0,0 +1,2 @@
+[flexbox_item-top-float.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_item-vertical-align.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_item-vertical-align.html.ini
new file mode 100644
index 00000000000..f57cde7009d
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_item-vertical-align.html.ini
@@ -0,0 +1,2 @@
+[flexbox_item-vertical-align.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_justifycontent-spacebetween-negative.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_justifycontent-spacebetween-negative.html.ini
deleted file mode 100644
index d24cfe1c8bf..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_justifycontent-spacebetween-negative.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_justifycontent-spacebetween-negative.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_margin-auto-overflow.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_margin-auto-overflow.html.ini
deleted file mode 100644
index e94f390c682..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_margin-auto-overflow.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_margin-auto-overflow.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_margin-auto.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_margin-auto.html.ini
deleted file mode 100644
index 71c46cda843..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_margin-auto.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_margin-auto.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_margin-left-ex.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_margin-left-ex.html.ini
deleted file mode 100644
index dd95d6395e7..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_margin-left-ex.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_margin-left-ex.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_stf-abspos.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_stf-abspos.html.ini
deleted file mode 100644
index 53a91fe9f60..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_stf-abspos.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_stf-abspos.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_stf-fixpos.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_stf-fixpos.html.ini
deleted file mode 100644
index 285fcb2a4cc..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_stf-fixpos.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_stf-fixpos.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_stf-inline-block.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_stf-inline-block.html.ini
deleted file mode 100644
index 77322e52d38..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_stf-inline-block.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_stf-inline-block.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexitem-stretch-range.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexitem-stretch-range.html.ini
deleted file mode 100644
index e5010b774b5..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexitem-stretch-range.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexitem-stretch-range.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/gap-001-lr.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/gap-001-lr.html.ini
new file mode 100644
index 00000000000..a2a3c119b87
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/gap-001-lr.html.ini
@@ -0,0 +1,2 @@
+[gap-001-lr.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/gap-001-ltr.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/gap-001-ltr.html.ini
new file mode 100644
index 00000000000..374de8b3559
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/gap-001-ltr.html.ini
@@ -0,0 +1,2 @@
+[gap-001-ltr.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/gap-001-rl.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/gap-001-rl.html.ini
new file mode 100644
index 00000000000..10e5eff6d0b
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/gap-001-rl.html.ini
@@ -0,0 +1,2 @@
+[gap-001-rl.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/gap-001-rtl.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/gap-001-rtl.html.ini
new file mode 100644
index 00000000000..9251a8bbc6d
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/gap-001-rtl.html.ini
@@ -0,0 +1,2 @@
+[gap-001-rtl.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-base.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/gap-013.html.ini
similarity index 50%
rename from tests/wpt/metadata-layout-2020/css/css-flexbox/flex-base.html.ini
rename to tests/wpt/metadata-layout-2020/css/css-flexbox/gap-013.html.ini
index f104e72aa67..856975d6f05 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-base.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/gap-013.html.ini
@@ -1,2 +1,2 @@
-[flex-base.html]
+[gap-013.html]
   expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_display-inline.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_display-inline.html.ini
deleted file mode 100644
index d3ee6e95f48..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_display-inline.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_display-inline.html]
-  [flexbox | computed style | display: inline-flex]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_display.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_display.html.ini
deleted file mode 100644
index 95279a15f95..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_display.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_display.html]
-  [flexbox | computed style | display: flex]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-basis-0.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-basis-0.html.ini
deleted file mode 100644
index 34880cfaa0d..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-basis-0.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-basis-0.html]
-  [flexbox | computed style | flex-basis: 0]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-basis-auto.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-basis-auto.html.ini
deleted file mode 100644
index c3339934a4e..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-basis-auto.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-basis-auto.html]
-  [flexbox | computed style | flex-basis: auto]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-basis-percent.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-basis-percent.html.ini
deleted file mode 100644
index 6b98cbdb719..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-basis-percent.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-basis-percent.html]
-  [flexbox | computed style | flex-basis: percent]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-direction-column-reverse.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-direction-column-reverse.html.ini
deleted file mode 100644
index 614ef55805a..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-direction-column-reverse.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-direction-column-reverse.html]
-  [flexbox | computed style | flex-direction: column-reverse]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-direction-column.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-direction-column.html.ini
deleted file mode 100644
index 92ef3690721..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-direction-column.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-direction-column.html]
-  [flexbox | computed style | flex-direction: column]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-direction-invalid.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-direction-invalid.html.ini
deleted file mode 100644
index a8ec32d18f9..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-direction-invalid.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-direction-invalid.html]
-  [flexbox | computed style | flex-direction: row]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-direction-row-reverse.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-direction-row-reverse.html.ini
deleted file mode 100644
index 2ce69320a8d..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-direction-row-reverse.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-direction-row-reverse.html]
-  [flexbox | computed style | flex-direction: row-reverse]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-direction-row.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-direction-row.html.ini
deleted file mode 100644
index e58b2d2ea97..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-direction-row.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-direction-row.html]
-  [flexbox | computed style | flex-direction: row]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column-nowrap.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column-nowrap.html.ini
deleted file mode 100644
index fc197cb6ec0..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column-nowrap.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-flow-column-nowrap.html]
-  [flexbox | computed style | flex-flow: column nowrap]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column-reverse-nowrap.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column-reverse-nowrap.html.ini
deleted file mode 100644
index c5ee46bf6e2..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column-reverse-nowrap.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-flow-column-reverse-nowrap.html]
-  [flexbox | computed style | flex-flow: column-reverse nowrap]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column-reverse-wrap.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column-reverse-wrap.html.ini
deleted file mode 100644
index 13b116ec47e..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column-reverse-wrap.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-flow-column-reverse-wrap.html]
-  [flexbox | computed style | flex-flow: column-reverse wrap]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column-reverse.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column-reverse.html.ini
deleted file mode 100644
index 4f60805341c..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column-reverse.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-flow-column-reverse.html]
-  [flexbox | computed style | flex-flow: column-reverse]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column-wrap-reverse.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column-wrap-reverse.html.ini
deleted file mode 100644
index 901afba629e..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column-wrap-reverse.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-flow-column-wrap-reverse.html]
-  [flexbox | computed style | flex-flow: column wrap-reverse]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column-wrap.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column-wrap.html.ini
deleted file mode 100644
index 94d16f09623..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column-wrap.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-flow-column-wrap.html]
-  [flexbox | computed style | flex-flow: column wrap]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column.html.ini
deleted file mode 100644
index 0e08f759bab..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-column.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-flow-column.html]
-  [flexbox | computed style | flex-flow: column]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-nowrap.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-nowrap.html.ini
deleted file mode 100644
index d7c4a4050fd..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-nowrap.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-flow-nowrap.html]
-  [flexbox | computed style | flex-flow: nowrap]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-nowrap.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-nowrap.html.ini
deleted file mode 100644
index a5c966541aa..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-nowrap.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-flow-row-nowrap.html]
-  [flexbox | computed style | flex-flow: row nowrap]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-reverse-nowrap.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-reverse-nowrap.html.ini
deleted file mode 100644
index 88bbe8d0a6a..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-reverse-nowrap.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-flow-row-reverse-nowrap.html]
-  [flexbox | computed style | flex-flow: row-reverse nowrap]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-reverse-wrap-reverse.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-reverse-wrap-reverse.html.ini
deleted file mode 100644
index 815110a0480..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-reverse-wrap-reverse.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-flow-row-reverse-wrap-reverse.html]
-  [flexbox | computed style | flex-flow: row-reverse wrap-reverse]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-reverse-wrap.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-reverse-wrap.html.ini
deleted file mode 100644
index 718372fc420..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-reverse-wrap.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-flow-row-reverse-wrap.html]
-  [flexbox | computed style | flex-flow: row-reverse wrap]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-reverse.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-reverse.html.ini
deleted file mode 100644
index 5554988bfb1..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-reverse.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-flow-row-reverse.html]
-  [flexbox | computed style | flex-flow: row-reverse]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-wrap-reverse.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-wrap-reverse.html.ini
deleted file mode 100644
index 36ba04149ef..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-wrap-reverse.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-flow-row-wrap-reverse.html]
-  [flexbox | computed style | flex-flow: row wrap-reverse]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-wrap.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-wrap.html.ini
deleted file mode 100644
index 5e5190b2858..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row-wrap.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-flow-row-wrap.html]
-  [flexbox | computed style | flex-flow: row wrap]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row.html.ini
deleted file mode 100644
index 67b31fd6552..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-row.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-flow-row.html]
-  [flexbox | computed style | flex-flow: row]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-wrap.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-wrap.html.ini
deleted file mode 100644
index 003bdd3e5b1..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-flow-wrap.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-flow-wrap.html]
-  [flexbox | computed style | flex-flow: wrap]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-grow-0.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-grow-0.html.ini
deleted file mode 100644
index fd7326350f4..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-grow-0.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-grow-0.html]
-  [flexbox | computed style | flex-grow: 0]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-grow-invalid.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-grow-invalid.html.ini
deleted file mode 100644
index 2a99afcd1f0..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-grow-invalid.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-grow-invalid.html]
-  [flexbox | computed style | flex-grow: negative]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-grow-number.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-grow-number.html.ini
deleted file mode 100644
index fc3b4541f11..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-grow-number.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-grow-number.html]
-  [flexbox | computed style | flex-grow: number]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shorthand-0-auto.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shorthand-0-auto.html.ini
deleted file mode 100644
index 52c82c27c4a..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shorthand-0-auto.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-shorthand-0-auto.html]
-  [flexbox | computed style | flex: 0 auto]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shorthand-auto.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shorthand-auto.html.ini
deleted file mode 100644
index 4dd6b18b9a1..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shorthand-auto.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-shorthand-auto.html]
-  [flexbox | computed style | flex: auto]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shorthand-initial.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shorthand-initial.html.ini
deleted file mode 100644
index 7398fd1c05d..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shorthand-initial.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-shorthand-initial.html]
-  [flexbox | computed style | flex: initial]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shorthand-invalid.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shorthand-invalid.html.ini
deleted file mode 100644
index d5a26995479..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shorthand-invalid.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-shorthand-invalid.html]
-  [flexbox | computed style | flex: invalid]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shorthand-none.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shorthand-none.html.ini
deleted file mode 100644
index b5c7ea0e059..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shorthand-none.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-shorthand-none.html]
-  [flexbox | computed style | flex: auto]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shorthand.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shorthand.html.ini
deleted file mode 100644
index ba239f1c45f..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shorthand.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-shorthand.html]
-  [flexbox | computed style | flex: invalid]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shrink-0.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shrink-0.html.ini
deleted file mode 100644
index 19cdb9b30a9..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shrink-0.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-shrink-0.html]
-  [flexbox | computed style | flex-shrink: 0]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shrink-invalid.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shrink-invalid.html.ini
deleted file mode 100644
index 8bf5fd3bc7e..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shrink-invalid.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-shrink-invalid.html]
-  [flexbox | computed style | flex-shrink: negative]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shrink-number.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shrink-number.html.ini
deleted file mode 100644
index 885bf985359..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-shrink-number.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-shrink-number.html]
-  [flexbox | computed style | flex-shrink: number]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-wrap-invalid.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-wrap-invalid.html.ini
deleted file mode 100644
index a9e5785fa48..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-wrap-invalid.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-wrap-invalid.html]
-  [flexbox | computed style | flex-wrap: wrap]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-wrap-nowrap.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-wrap-nowrap.html.ini
deleted file mode 100644
index 351acbbf4eb..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-wrap-nowrap.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-wrap-nowrap.html]
-  [flexbox | computed style | flex-wrap: nowrap]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-wrap-wrap-reverse.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-wrap-wrap-reverse.html.ini
deleted file mode 100644
index e5c292e64d2..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-wrap-wrap-reverse.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-wrap-wrap-reverse.html]
-  [flexbox | computed style | flex-wrap: wrap-reverse]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-wrap-wrap.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-wrap-wrap.html.ini
deleted file mode 100644
index 7313ee84c10..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_flex-wrap-wrap.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_flex-wrap-wrap.html]
-  [flexbox | computed style | flex-wrap: wrap]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_order-inherit.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_order-inherit.html.ini
deleted file mode 100644
index 1cb646a0e70..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_order-inherit.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_order-inherit.html]
-  [flexbox | computed style | order: -1]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_order-integer.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_order-integer.html.ini
deleted file mode 100644
index 2c5dd1710ef..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_order-integer.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_order-integer.html]
-  [flexbox | computed style | order: integer]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_order-invalid.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_order-invalid.html.ini
deleted file mode 100644
index 7fae032d536..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_order-invalid.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_order-invalid.html]
-  [flexbox | computed style | order: noninteger]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_order-negative.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_order-negative.html.ini
deleted file mode 100644
index 1e4068b8f72..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_order-negative.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_order-negative.html]
-  [flexbox | computed style | order: -1]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_order.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_order.html.ini
deleted file mode 100644
index a34142cf16c..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_order.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_computedstyle_order.html]
-  [flexbox | computed style | order: 0]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/inheritance.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/inheritance.html.ini
index 862f9664076..7f017d75b1d 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/inheritance.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/inheritance.html.ini
@@ -1,58 +1,22 @@
 [inheritance.html]
-  [Property flex-wrap has initial value nowrap]
-    expected: FAIL
-
-  [Property order has initial value 0]
-    expected: FAIL
-
   [Property align-self does not inherit]
     expected: FAIL
 
-  [Property flex-direction does not inherit]
-    expected: FAIL
-
-  [Property flex-wrap does not inherit]
-    expected: FAIL
-
-  [Property flex-grow has initial value 0]
-    expected: FAIL
-
-  [Property flex-direction has initial value row]
-    expected: FAIL
-
   [Property align-items has initial value normal]
     expected: FAIL
 
-  [Property flex-basis has initial value auto]
-    expected: FAIL
-
   [Property align-content has initial value normal]
     expected: FAIL
 
   [Property justify-content has initial value normal]
     expected: FAIL
 
-  [Property flex-grow does not inherit]
-    expected: FAIL
-
-  [Property order does not inherit]
-    expected: FAIL
-
-  [Property flex-shrink does not inherit]
-    expected: FAIL
-
   [Property align-items does not inherit]
     expected: FAIL
 
   [Property align-self has initial value auto]
     expected: FAIL
 
-  [Property flex-basis does not inherit]
-    expected: FAIL
-
-  [Property flex-shrink has initial value 1]
-    expected: FAIL
-
   [Property justify-content does not inherit]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/justify-content-002.htm.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/justify-content-002.htm.ini
deleted file mode 100644
index 7e68eb86f2c..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/justify-content-002.htm.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[justify-content-002.htm]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/layout-algorithm_algo-cross-line-002.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/layout-algorithm_algo-cross-line-002.html.ini
new file mode 100644
index 00000000000..e724aaff1ff
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/layout-algorithm_algo-cross-line-002.html.ini
@@ -0,0 +1,2 @@
+[layout-algorithm_algo-cross-line-002.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/nested-orthogonal-flexbox-relayout.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/nested-orthogonal-flexbox-relayout.html.ini
new file mode 100644
index 00000000000..a1dee88680c
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/nested-orthogonal-flexbox-relayout.html.ini
@@ -0,0 +1,2 @@
+[nested-orthogonal-flexbox-relayout.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/overflow-area-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/overflow-area-001.html.ini
new file mode 100644
index 00000000000..78e4433fc14
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/overflow-area-001.html.ini
@@ -0,0 +1,2 @@
+[overflow-area-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/overflow-area-002.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/overflow-area-002.html.ini
new file mode 100644
index 00000000000..5b1a9bb41ad
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/overflow-area-002.html.ini
@@ -0,0 +1,2 @@
+[overflow-area-002.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/overflow-auto-005.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/overflow-auto-005.html.ini
new file mode 100644
index 00000000000..f9df389a34e
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/overflow-auto-005.html.ini
@@ -0,0 +1,2 @@
+[overflow-auto-005.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-basis-computed.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-basis-computed.html.ini
deleted file mode 100644
index 19fcc32c5b0..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-basis-computed.html.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-[flex-basis-computed.html]
-  [Property flex-basis value 'auto']
-    expected: FAIL
-
-  [Property flex-basis value 'calc(10% + 0px)']
-    expected: FAIL
-
-  [Property flex-basis value 'calc(10px - 0.5em)']
-    expected: FAIL
-
-  [Property flex-basis value '1px']
-    expected: FAIL
-
-  [Property flex-basis value '400%']
-    expected: FAIL
-
-  [Property flex-basis value 'calc(10px + 0.5em)']
-    expected: FAIL
-
-  [Property flex-basis value 'calc(10%)']
-    expected: FAIL
-
-  [Property flex-basis value 'calc(0% + 10px)']
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-basis-valid.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-basis-valid.html.ini
deleted file mode 100644
index 7c16080be8f..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-basis-valid.html.ini
+++ /dev/null
@@ -1,13 +0,0 @@
-[flex-basis-valid.html]
-  [e.style['flex-basis'\] = "400%" should set the property value]
-    expected: FAIL
-
-  [e.style['flex-basis'\] = "calc(2em + 3ex)" should set the property value]
-    expected: FAIL
-
-  [e.style['flex-basis'\] = "auto" should set the property value]
-    expected: FAIL
-
-  [e.style['flex-basis'\] = "1px" should set the property value]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-direction-computed.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-direction-computed.html.ini
deleted file mode 100644
index 888fd616228..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-direction-computed.html.ini
+++ /dev/null
@@ -1,13 +0,0 @@
-[flex-direction-computed.html]
-  [Property flex-direction value 'row']
-    expected: FAIL
-
-  [Property flex-direction value 'row-reverse']
-    expected: FAIL
-
-  [Property flex-direction value 'column-reverse']
-    expected: FAIL
-
-  [Property flex-direction value 'column']
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-direction-valid.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-direction-valid.html.ini
deleted file mode 100644
index 6fdd5b2932a..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-direction-valid.html.ini
+++ /dev/null
@@ -1,13 +0,0 @@
-[flex-direction-valid.html]
-  [e.style['flex-direction'\] = "column" should set the property value]
-    expected: FAIL
-
-  [e.style['flex-direction'\] = "row" should set the property value]
-    expected: FAIL
-
-  [e.style['flex-direction'\] = "row-reverse" should set the property value]
-    expected: FAIL
-
-  [e.style['flex-direction'\] = "column-reverse" should set the property value]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-flow-shorthand.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-flow-shorthand.html.ini
deleted file mode 100644
index f855827a8da..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-flow-shorthand.html.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-[flex-flow-shorthand.html]
-  [e.style['flex-flow'\] = "wrap row-reverse" should set flex-wrap]
-    expected: FAIL
-
-  [e.style['flex-flow'\] = "nowrap column" should set flex-wrap]
-    expected: FAIL
-
-  [e.style['flex-flow'\] = "nowrap column" should not set unrelated longhands]
-    expected: FAIL
-
-  [e.style['flex-flow'\] = "nowrap column" should set flex-direction]
-    expected: FAIL
-
-  [e.style['flex-flow'\] = "wrap row-reverse" should not set unrelated longhands]
-    expected: FAIL
-
-  [e.style['flex-flow'\] = "wrap row-reverse" should set flex-direction]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-flow-valid.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-flow-valid.html.ini
deleted file mode 100644
index d1e9bbb4dd8..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-flow-valid.html.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[flex-flow-valid.html]
-  [e.style['flex-flow'\] = "column nowrap" should set the property value]
-    expected: FAIL
-
-  [e.style['flex-flow'\] = "nowrap column" should set the property value]
-    expected: FAIL
-
-  [e.style['flex-flow'\] = "wrap row-reverse" should set the property value]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-grow-computed.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-grow-computed.html.ini
index 096b1fb6fa9..61f4f40409e 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-grow-computed.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-grow-computed.html.ini
@@ -5,9 +5,3 @@
   [Property flex-grow value '6.78e+08']
     expected: FAIL
 
-  [Property flex-grow value '1']
-    expected: FAIL
-
-  [Property flex-grow value '0']
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-grow-valid.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-grow-valid.html.ini
deleted file mode 100644
index 5c825aafb52..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-grow-valid.html.ini
+++ /dev/null
@@ -1,13 +0,0 @@
-[flex-grow-valid.html]
-  [e.style['flex-grow'\] = "23.4e5" should set the property value]
-    expected: FAIL
-
-  [e.style['flex-grow'\] = "1" should set the property value]
-    expected: FAIL
-
-  [e.style['flex-grow'\] = "+.678E9" should set the property value]
-    expected: FAIL
-
-  [e.style['flex-grow'\] = ".0" should set the property value]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-shorthand.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-shorthand.html.ini
deleted file mode 100644
index 986891e5386..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-shorthand.html.ini
+++ /dev/null
@@ -1,73 +0,0 @@
-[flex-shorthand.html]
-  [e.style['flex'\] = "2 3" should set flex-basis]
-    expected: FAIL
-
-  [e.style['flex'\] = "4 5 6px" should set flex-basis]
-    expected: FAIL
-
-  [e.style['flex'\] = "2 3" should set flex-grow]
-    expected: FAIL
-
-  [e.style['flex'\] = "4 5 6px" should set flex-shrink]
-    expected: FAIL
-
-  [e.style['flex'\] = "none" should set flex-grow]
-    expected: FAIL
-
-  [e.style['flex'\] = "none" should set flex-shrink]
-    expected: FAIL
-
-  [e.style['flex'\] = "1" should not set unrelated longhands]
-    expected: FAIL
-
-  [e.style['flex'\] = "none" should not set unrelated longhands]
-    expected: FAIL
-
-  [e.style['flex'\] = "8 auto" should set flex-basis]
-    expected: FAIL
-
-  [e.style['flex'\] = "7% 8" should set flex-basis]
-    expected: FAIL
-
-  [e.style['flex'\] = "8 auto" should set flex-grow]
-    expected: FAIL
-
-  [e.style['flex'\] = "1" should set flex-grow]
-    expected: FAIL
-
-  [e.style['flex'\] = "4 5 6px" should set flex-grow]
-    expected: FAIL
-
-  [e.style['flex'\] = "1" should set flex-shrink]
-    expected: FAIL
-
-  [e.style['flex'\] = "7% 8" should set flex-grow]
-    expected: FAIL
-
-  [e.style['flex'\] = "8 auto" should set flex-shrink]
-    expected: FAIL
-
-  [e.style['flex'\] = "4 5 6px" should not set unrelated longhands]
-    expected: FAIL
-
-  [e.style['flex'\] = "none" should set flex-basis]
-    expected: FAIL
-
-  [e.style['flex'\] = "1" should set flex-basis]
-    expected: FAIL
-
-  [e.style['flex'\] = "7% 8" should set flex-shrink]
-    expected: FAIL
-
-  [e.style['flex'\] = "2 3" should not set unrelated longhands]
-    expected: FAIL
-
-  [e.style['flex'\] = "2 3" should set flex-shrink]
-    expected: FAIL
-
-  [e.style['flex'\] = "8 auto" should not set unrelated longhands]
-    expected: FAIL
-
-  [e.style['flex'\] = "7% 8" should not set unrelated longhands]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-shrink-computed.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-shrink-computed.html.ini
index 0be944c836b..3e7167c2837 100644
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-shrink-computed.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-shrink-computed.html.ini
@@ -1,10 +1,4 @@
 [flex-shrink-computed.html]
-  [Property flex-shrink value '1']
-    expected: FAIL
-
-  [Property flex-shrink value '0']
-    expected: FAIL
-
   [Property flex-shrink value '2.34e+06']
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-shrink-valid.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-shrink-valid.html.ini
deleted file mode 100644
index 8aab89d4aac..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-shrink-valid.html.ini
+++ /dev/null
@@ -1,13 +0,0 @@
-[flex-shrink-valid.html]
-  [e.style['flex-shrink'\] = ".0" should set the property value]
-    expected: FAIL
-
-  [e.style['flex-shrink'\] = "+.678E9" should set the property value]
-    expected: FAIL
-
-  [e.style['flex-shrink'\] = "23.4e5" should set the property value]
-    expected: FAIL
-
-  [e.style['flex-shrink'\] = "1" should set the property value]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-valid.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-valid.html.ini
deleted file mode 100644
index e0903f4895d..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-valid.html.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-[flex-valid.html]
-  [e.style['flex'\] = "4 5 6px" should set the property value]
-    expected: FAIL
-
-  [e.style['flex'\] = "7% 8" should set the property value]
-    expected: FAIL
-
-  [e.style['flex'\] = "1" should set the property value]
-    expected: FAIL
-
-  [e.style['flex'\] = "2 3" should set the property value]
-    expected: FAIL
-
-  [e.style['flex'\] = "none" should set the property value]
-    expected: FAIL
-
-  [e.style['flex'\] = "8 auto" should set the property value]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-wrap-computed.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-wrap-computed.html.ini
deleted file mode 100644
index 1df07deeb82..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-wrap-computed.html.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[flex-wrap-computed.html]
-  [Property flex-wrap value 'wrap-reverse']
-    expected: FAIL
-
-  [Property flex-wrap value 'nowrap']
-    expected: FAIL
-
-  [Property flex-wrap value 'wrap']
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-wrap-valid.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-wrap-valid.html.ini
deleted file mode 100644
index 07ed21672a1..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/flex-wrap-valid.html.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[flex-wrap-valid.html]
-  [e.style['flex-wrap'\] = "wrap" should set the property value]
-    expected: FAIL
-
-  [e.style['flex-wrap'\] = "wrap-reverse" should set the property value]
-    expected: FAIL
-
-  [e.style['flex-wrap'\] = "nowrap" should set the property value]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/order-computed.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/order-computed.html.ini
deleted file mode 100644
index e1910036ad0..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/order-computed.html.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[order-computed.html]
-  [Property order value '123']
-    expected: FAIL
-
-  [Property order value '0']
-    expected: FAIL
-
-  [Property order value '-45']
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/order-valid.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/order-valid.html.ini
deleted file mode 100644
index 0e08fe62a12..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/parsing/order-valid.html.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[order-valid.html]
-  [e.style['order'\] = "0" should set the property value]
-    expected: FAIL
-
-  [e.style['order'\] = "123" should set the property value]
-    expected: FAIL
-
-  [e.style['order'\] = "-45" should set the property value]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-heights-008.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-heights-008.html.ini
new file mode 100644
index 00000000000..95ad315960d
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-heights-008.html.ini
@@ -0,0 +1,2 @@
+[percentage-heights-008.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-heights-010.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-heights-010.html.ini
deleted file mode 100644
index e8a75b458af..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-heights-010.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[percentage-heights-010.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-heights-014.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-heights-014.html.ini
new file mode 100644
index 00000000000..d0931b7035b
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-heights-014.html.ini
@@ -0,0 +1,2 @@
+[percentage-heights-014.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-size-subitems-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-size-subitems-001.html.ini
deleted file mode 100644
index 737426ab549..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/percentage-size-subitems-001.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[percentage-size-subitems-001.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/position-fixed-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/position-fixed-001.html.ini
new file mode 100644
index 00000000000..bfb8983f15e
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/position-fixed-001.html.ini
@@ -0,0 +1,2 @@
+[position-fixed-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/stretch-input-in-column.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/stretch-input-in-column.html.ini
new file mode 100644
index 00000000000..198674c9407
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/stretch-input-in-column.html.ini
@@ -0,0 +1,2 @@
+[stretch-input-in-column.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/stretching-orthogonal-flows.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/stretching-orthogonal-flows.html.ini
new file mode 100644
index 00000000000..df59e9b5328
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/stretching-orthogonal-flows.html.ini
@@ -0,0 +1,2 @@
+[stretching-orthogonal-flows.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/table-as-item-change-cell.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/table-as-item-change-cell.html.ini
new file mode 100644
index 00000000000..e8672a3bd87
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/table-as-item-change-cell.html.ini
@@ -0,0 +1,2 @@
+[table-as-item-change-cell.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/table-as-item-narrow-content.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/table-as-item-narrow-content.html.ini
deleted file mode 100644
index 194e30876c1..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/table-as-item-narrow-content.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[table-as-item-narrow-content.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/text-overflow-on-flexbox-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/text-overflow-on-flexbox-001.html.ini
new file mode 100644
index 00000000000..21a3897f188
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/text-overflow-on-flexbox-001.html.ini
@@ -0,0 +1,2 @@
+[text-overflow-on-flexbox-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/whitespace-in-flexitem-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/whitespace-in-flexitem-001.html.ini
deleted file mode 100644
index cf2cffe5267..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/whitespace-in-flexitem-001.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[whitespace-in-flexitem-001.html]
-  expected: FAIL