diff --git a/components/layout_2020/flow/mod.rs b/components/layout_2020/flow/mod.rs
index ee6afaea637..d192410cb71 100644
--- a/components/layout_2020/flow/mod.rs
+++ b/components/layout_2020/flow/mod.rs
@@ -657,6 +657,7 @@ fn layout_in_flow_non_replaced_block_level(
                 collapsible_margins_in_children.collapsed_through &&
                     block_is_same_formatting_context &&
                     pbm.padding_border_sums.block == Length::zero() &&
+                    clearance == Length::zero() &&
                     block_size.auto_is(|| Length::zero()) == Length::zero() &&
                     min_box_size.block == Length::zero();
         },
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats-clear/clear-after-top-margin.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats-clear/clear-after-top-margin.html.ini
deleted file mode 100644
index 45e4300c13a..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/floats-clear/clear-after-top-margin.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[clear-after-top-margin.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats-clear/margin-collapse-018.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats-clear/margin-collapse-018.xht.ini
deleted file mode 100644
index 27f65ceefa2..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/floats-clear/margin-collapse-018.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[margin-collapse-018.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats-clear/margin-collapse-027.xht.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats-clear/margin-collapse-027.xht.ini
deleted file mode 100644
index 519aa8a80eb..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/floats-clear/margin-collapse-027.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[margin-collapse-027.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats-clear/no-clearance-due-to-large-margin-after-left-right.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats-clear/no-clearance-due-to-large-margin-after-left-right.html.ini
new file mode 100644
index 00000000000..d4a609c9975
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/floats-clear/no-clearance-due-to-large-margin-after-left-right.html.ini
@@ -0,0 +1,2 @@
+[no-clearance-due-to-large-margin-after-left-right.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats-clear/remove-block-before-self-collapsing-sibling-with-clearance.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats-clear/remove-block-before-self-collapsing-sibling-with-clearance.html.ini
deleted file mode 100644
index 70784ff0b07..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/floats-clear/remove-block-before-self-collapsing-sibling-with-clearance.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[remove-block-before-self-collapsing-sibling-with-clearance.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flow-row-wrap-reverse.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flow-row-wrap-reverse.html.ini
deleted file mode 100644
index c403938da21..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flow-row-wrap-reverse.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flow-row-wrap-reverse.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flow-row-wrap.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flow-row-wrap.html.ini
deleted file mode 100644
index 4552518fc1a..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_flow-row-wrap.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_flow-row-wrap.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
deleted file mode 100644
index 5f91b0496e1..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_item-float.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[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
deleted file mode 100644
index 421a0213bcd..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_item-top-float.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[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
deleted file mode 100644
index f57cde7009d..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_item-vertical-align.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_item-vertical-align.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_wrap-long.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_wrap-long.html.ini
deleted file mode 100644
index c0dec9a6e9f..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_wrap-long.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_wrap-long.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_wrap-reverse.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_wrap-reverse.html.ini
deleted file mode 100644
index 5b41b08dcad..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_wrap-reverse.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_wrap-reverse.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_wrap.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_wrap.html.ini
deleted file mode 100644
index 4cf0be253dc..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-flexbox/flexbox_wrap.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox_wrap.html]
-  expected: FAIL
diff --git a/tests/wpt/mozilla/meta-layout-2020/css/acid1_a.html.ini b/tests/wpt/mozilla/meta-layout-2020/css/acid1_a.html.ini
deleted file mode 100644
index df0718b2040..00000000000
--- a/tests/wpt/mozilla/meta-layout-2020/css/acid1_a.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[acid1_a.html]
-  expected: FAIL