diff --git a/components/layout_2020/flow/float.rs b/components/layout_2020/flow/float.rs
index 85f405558ce..c2c88128e84 100644
--- a/components/layout_2020/flow/float.rs
+++ b/components/layout_2020/flow/float.rs
@@ -938,13 +938,16 @@ impl FloatBox {
                         });
                         let inline_size = tentative_inline_size
                             .clamp_between_extremums(min_box_size.inline, max_box_size.inline);
+                        let block_size = box_size.block.map(|size| {
+                            size.clamp_between_extremums(min_box_size.block, max_box_size.block)
+                        });
 
                         // Calculate block size.
                         // https://drafts.csswg.org/css2/#block-root-margin
                         // FIXME(pcwalton): Is a tree rank of zero correct here?
                         let containing_block_for_children = ContainingBlock {
                             inline_size: inline_size.into(),
-                            block_size: box_size.block.map(|t| t.into()),
+                            block_size: block_size.map(|t| t.into()),
                             style: &non_replaced.style,
                         };
                         let independent_layout = non_replaced.layout(
@@ -955,9 +958,10 @@ impl FloatBox {
                         );
                         content_size = LogicalVec2 {
                             inline: inline_size,
-                            block: box_size
-                                .block
-                                .auto_is(|| independent_layout.content_block_size.into()),
+                            block: block_size.auto_is(|| {
+                                Length::from(independent_layout.content_block_size)
+                                    .clamp_between_extremums(min_box_size.block, max_box_size.block)
+                            }),
                         };
                         children = independent_layout.fragments;
                     },
diff --git a/tests/wpt/meta/css/CSS2/normal-flow/min-height-106.xht.ini b/tests/wpt/meta/css/CSS2/normal-flow/min-height-106.xht.ini
deleted file mode 100644
index bed0c772d23..00000000000
--- a/tests/wpt/meta/css/CSS2/normal-flow/min-height-106.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[min-height-106.xht]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-flexbox/flex-vertical-align-effect.html.ini b/tests/wpt/meta/css/css-flexbox/flex-vertical-align-effect.html.ini
deleted file mode 100644
index b1007b3f0f9..00000000000
--- a/tests/wpt/meta/css/css-flexbox/flex-vertical-align-effect.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flex-vertical-align-effect.html]
-  expected: FAIL