diff --git a/components/layout_2020/flexbox/layout.rs b/components/layout_2020/flexbox/layout.rs
index 5fd8c3dd44d..cf755a64d78 100644
--- a/components/layout_2020/flexbox/layout.rs
+++ b/components/layout_2020/flexbox/layout.rs
@@ -361,13 +361,11 @@ impl FlexContainer {
                     // columns, and sum the column sizes and gaps.
                     // TODO: Use the proper automatic minimum size.
                     let ifc = &mut item.independent_formatting_context;
-                    content_sizes.max_assign(ifc.inline_content_sizes(
+                    content_sizes.max_assign(ifc.outer_inline_content_sizes(
                         layout_context,
-                        &containing_block_for_children.new_for_intrinsic_inline_size_of_child(
-                            &ifc.style().clone(),
-                            &LogicalVec2::zero(),
-                        ),
                         containing_block_for_children,
+                        &LogicalVec2::zero(),
+                        false, /* auto_block_size_stretches_to_containing_block */
                     ));
                 },
                 FlexLevelBox::OutOfFlowAbsolutelyPositionedBox(_) => {},
diff --git a/tests/wpt/meta/css/css-flexbox/flex-item-contains-strict.html.ini b/tests/wpt/meta/css/css-flexbox/flex-item-contains-strict.html.ini
index 17ab2c3a118..8c3d99e8d24 100644
--- a/tests/wpt/meta/css/css-flexbox/flex-item-contains-strict.html.ini
+++ b/tests/wpt/meta/css/css-flexbox/flex-item-contains-strict.html.ini
@@ -5,12 +5,6 @@
   [.inline-flex 6]
     expected: FAIL
 
-  [.inline-flex 3]
-    expected: FAIL
-
-  [.inline-flex 7]
-    expected: FAIL
-
   [.inline-flex 1]
     expected: FAIL
 
diff --git a/tests/wpt/meta/css/css-flexbox/flexbox-justify-content-vert-001a.xhtml.ini b/tests/wpt/meta/css/css-flexbox/flexbox-justify-content-vert-001a.xhtml.ini
deleted file mode 100644
index c27504c826b..00000000000
--- a/tests/wpt/meta/css/css-flexbox/flexbox-justify-content-vert-001a.xhtml.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox-justify-content-vert-001a.xhtml]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-flexbox/flexbox-justify-content-vert-002.xhtml.ini b/tests/wpt/meta/css/css-flexbox/flexbox-justify-content-vert-002.xhtml.ini
deleted file mode 100644
index c89a4d4010b..00000000000
--- a/tests/wpt/meta/css/css-flexbox/flexbox-justify-content-vert-002.xhtml.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox-justify-content-vert-002.xhtml]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-flexbox/flexbox-justify-content-vert-003.xhtml.ini b/tests/wpt/meta/css/css-flexbox/flexbox-justify-content-vert-003.xhtml.ini
deleted file mode 100644
index 1416bdedf25..00000000000
--- a/tests/wpt/meta/css/css-flexbox/flexbox-justify-content-vert-003.xhtml.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox-justify-content-vert-003.xhtml]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-flexbox/flexbox-justify-content-vert-004.xhtml.ini b/tests/wpt/meta/css/css-flexbox/flexbox-justify-content-vert-004.xhtml.ini
deleted file mode 100644
index a53ba9778e7..00000000000
--- a/tests/wpt/meta/css/css-flexbox/flexbox-justify-content-vert-004.xhtml.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox-justify-content-vert-004.xhtml]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-flexbox/flexbox-min-height-auto-001.html.ini b/tests/wpt/meta/css/css-flexbox/flexbox-min-height-auto-001.html.ini
deleted file mode 100644
index 8158009ceaa..00000000000
--- a/tests/wpt/meta/css/css-flexbox/flexbox-min-height-auto-001.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox-min-height-auto-001.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-flexbox/flexbox-min-height-auto-002a.html.ini b/tests/wpt/meta/css/css-flexbox/flexbox-min-height-auto-002a.html.ini
deleted file mode 100644
index 52e14a67a05..00000000000
--- a/tests/wpt/meta/css/css-flexbox/flexbox-min-height-auto-002a.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox-min-height-auto-002a.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-flexbox/flexbox-min-height-auto-002b.html.ini b/tests/wpt/meta/css/css-flexbox/flexbox-min-height-auto-002b.html.ini
deleted file mode 100644
index fe71f687818..00000000000
--- a/tests/wpt/meta/css/css-flexbox/flexbox-min-height-auto-002b.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox-min-height-auto-002b.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-flexbox/flexbox-min-height-auto-002c.html.ini b/tests/wpt/meta/css/css-flexbox/flexbox-min-height-auto-002c.html.ini
deleted file mode 100644
index 8a387e1761c..00000000000
--- a/tests/wpt/meta/css/css-flexbox/flexbox-min-height-auto-002c.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox-min-height-auto-002c.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-flexbox/flexbox-min-height-auto-003.html.ini b/tests/wpt/meta/css/css-flexbox/flexbox-min-height-auto-003.html.ini
deleted file mode 100644
index 4bdbe70d1c7..00000000000
--- a/tests/wpt/meta/css/css-flexbox/flexbox-min-height-auto-003.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox-min-height-auto-003.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-flexbox/flexbox-min-height-auto-004.html.ini b/tests/wpt/meta/css/css-flexbox/flexbox-min-height-auto-004.html.ini
deleted file mode 100644
index e275f10a12b..00000000000
--- a/tests/wpt/meta/css/css-flexbox/flexbox-min-height-auto-004.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox-min-height-auto-004.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-flexbox/inline-flexbox-wrap-vertically-width-calculation.html.ini b/tests/wpt/meta/css/css-flexbox/inline-flexbox-wrap-vertically-width-calculation.html.ini
index 8b3906525b1..64b703dece0 100644
--- a/tests/wpt/meta/css/css-flexbox/inline-flexbox-wrap-vertically-width-calculation.html.ini
+++ b/tests/wpt/meta/css/css-flexbox/inline-flexbox-wrap-vertically-width-calculation.html.ini
@@ -1,16 +1,10 @@
 [inline-flexbox-wrap-vertically-width-calculation.html]
-  [.inline-flexbox 13]
-    expected: FAIL
-
   [.inline-flexbox 12]
     expected: FAIL
 
   [.inline-flexbox 11]
     expected: FAIL
 
-  [.inline-flexbox 10]
-    expected: FAIL
-
   [.inline-flexbox 16]
     expected: FAIL
 
@@ -23,26 +17,14 @@
   [.inline-flexbox 3]
     expected: FAIL
 
-  [.inline-flexbox 2]
-    expected: FAIL
-
   [.inline-flexbox 7]
     expected: FAIL
 
   [.inline-flexbox 6]
     expected: FAIL
 
-  [.inline-flexbox 5]
-    expected: FAIL
-
   [.inline-flexbox 4]
     expected: FAIL
 
   [.inline-flexbox 8]
     expected: FAIL
-
-  [.inline-flexbox 1]
-    expected: FAIL
-
-  [.inline-flexbox 9]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-flexbox/multiline-shrink-to-fit.html.ini b/tests/wpt/meta/css/css-flexbox/multiline-shrink-to-fit.html.ini
deleted file mode 100644
index 35a72187950..00000000000
--- a/tests/wpt/meta/css/css-flexbox/multiline-shrink-to-fit.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[multiline-shrink-to-fit.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-flexbox/overflow-auto-006.html.ini b/tests/wpt/meta/css/css-flexbox/overflow-auto-006.html.ini
deleted file mode 100644
index b40844fd0cf..00000000000
--- a/tests/wpt/meta/css/css-flexbox/overflow-auto-006.html.ini
+++ /dev/null
@@ -1,12 +0,0 @@
-[overflow-auto-006.html]
-  [.flexbox, .inline-flexbox 7]
-    expected: FAIL
-
-  [.flexbox, .inline-flexbox 8]
-    expected: FAIL
-
-  [.flexbox, .inline-flexbox 9]
-    expected: FAIL
-
-  [.flexbox, .inline-flexbox 10]
-    expected: FAIL