diff --git a/components/layout_2020/flow/inline.rs b/components/layout_2020/flow/inline.rs
index df96d0bbd4e..c59ffca9215 100644
--- a/components/layout_2020/flow/inline.rs
+++ b/components/layout_2020/flow/inline.rs
@@ -461,7 +461,7 @@ impl InlineBox {
             margin.inline_start = Length::zero();
         }
         let mut start_corner = Vec2 {
-            block: padding.block_start + border.block_start + margin.block_start,
+            block: Length::zero(),
             inline: ifc.inline_position - ifc.current_nesting_level.inline_start,
         };
         if style.clone_position().is_relative() {
@@ -533,12 +533,7 @@ impl<'box_tree> PartialInlineBoxFragment<'box_tree> {
         }
         self.parent_nesting_level
             .max_block_size_of_fragments_so_far
-            .max_assign(
-                fragment.content_rect.size.block +
-                    fragment.padding.block_sum() +
-                    fragment.border.block_sum() +
-                    fragment.margin.block_sum(),
-            );
+            .max_assign(fragment.content_rect.size.block);
 
         if let Some(context) = nesting_level.positioning_context.as_mut() {
             context.layout_collected_children(layout_context, &mut fragment);
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-root-017.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-root-017.xht.ini
deleted file mode 100644
index e2d49f73031..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/backgrounds/background-root-017.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-root-017.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/borders/border-width-applies-to-008.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/borders/border-width-applies-to-008.xht.ini
deleted file mode 100644
index 4eb0277abb9..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/borders/border-width-applies-to-008.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[border-width-applies-to-008.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/css1/c5506-ipadn-t-002.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/css1/c5506-ipadn-t-002.xht.ini
deleted file mode 100644
index 5fc7c3ea6db..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/css1/c5506-ipadn-t-002.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[c5506-ipadn-t-002.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/linebox/vertical-align-top-bottom-padding.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/linebox/vertical-align-top-bottom-padding.html.ini
deleted file mode 100644
index da6a05516c3..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/linebox/vertical-align-top-bottom-padding.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[vertical-align-top-bottom-padding.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/margin-padding-clear/margin-bottom-applies-to-008.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/margin-padding-clear/margin-bottom-applies-to-008.xht.ini
deleted file mode 100644
index b27a13dcf4e..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/margin-padding-clear/margin-bottom-applies-to-008.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[margin-bottom-applies-to-008.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/margin-padding-clear/margin-collapse-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/margin-padding-clear/margin-collapse-001.xht.ini
deleted file mode 100644
index 5c53f1fd754..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/margin-padding-clear/margin-collapse-001.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[margin-collapse-001.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/margin-padding-clear/margin-inline-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/margin-padding-clear/margin-inline-001.xht.ini
deleted file mode 100644
index 39b7c344900..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/margin-padding-clear/margin-inline-001.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[margin-inline-001.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/margin-padding-clear/margin-inline-002.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/margin-padding-clear/margin-inline-002.xht.ini
deleted file mode 100644
index 6fae1978ccf..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/margin-padding-clear/margin-inline-002.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[margin-inline-002.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/margin-padding-clear/margin-top-applies-to-008.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/margin-padding-clear/margin-top-applies-to-008.xht.ini
deleted file mode 100644
index 707f5dad6a4..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/margin-padding-clear/margin-top-applies-to-008.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[margin-top-applies-to-008.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/block-in-inline-empty-001.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/block-in-inline-empty-001.xht.ini
deleted file mode 100644
index 9db08636660..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/block-in-inline-empty-001.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[block-in-inline-empty-001.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/inlines-002.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/inlines-002.xht.ini
deleted file mode 100644
index e75f6075d6c..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/normal-flow/inlines-002.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[inlines-002.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/tables/table-visual-layout-018.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/tables/table-visual-layout-018.xht.ini
deleted file mode 100644
index 08e1831b912..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/tables/table-visual-layout-018.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[table-visual-layout-018.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/visuren/emptyspan-1.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/visuren/emptyspan-1.html.ini
deleted file mode 100644
index 8a9ef8c200e..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/visuren/emptyspan-1.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[emptyspan-1.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/item-with-table-with-infinite-max-intrinsic-width.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/item-with-table-with-infinite-max-intrinsic-width.html.ini
new file mode 100644
index 00000000000..81de7819bb8
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/item-with-table-with-infinite-max-intrinsic-width.html.ini
@@ -0,0 +1,2 @@
+[item-with-table-with-infinite-max-intrinsic-width.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/table-with-infinite-max-intrinsic-width.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/table-with-infinite-max-intrinsic-width.html.ini
new file mode 100644
index 00000000000..434f3e40277
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/table-with-infinite-max-intrinsic-width.html.ini
@@ -0,0 +1,2 @@
+[table-with-infinite-max-intrinsic-width.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-ui/outline-020.html.ini b/tests/wpt/metadata-layout-2020/css/css-ui/outline-020.html.ini
deleted file mode 100644
index a9eab7bd4e5..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-ui/outline-020.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[outline-020.html]
-  expected: FAIL
diff --git a/tests/wpt/mozilla/meta-layout-2020/css/inline_border_baseline_a.html.ini b/tests/wpt/mozilla/meta-layout-2020/css/inline_border_baseline_a.html.ini
deleted file mode 100644
index 55376e6b1ee..00000000000
--- a/tests/wpt/mozilla/meta-layout-2020/css/inline_border_baseline_a.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[inline_border_baseline_a.html]
-  expected: FAIL
diff --git a/tests/wpt/mozilla/meta-layout-2020/css/inline_element_padding_margin.html.ini b/tests/wpt/mozilla/meta-layout-2020/css/inline_element_padding_margin.html.ini
deleted file mode 100644
index 239b34c0e62..00000000000
--- a/tests/wpt/mozilla/meta-layout-2020/css/inline_element_padding_margin.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[inline_element_padding_margin.html]
-  expected: FAIL