diff --git a/Tests/LibWeb/Layout/expected/atomic-inline-with-percentage-vertical-align.txt b/Tests/LibWeb/Layout/expected/block-and-inline/atomic-inline-with-percentage-vertical-align.txt
similarity index 100%
rename from Tests/LibWeb/Layout/expected/atomic-inline-with-percentage-vertical-align.txt
rename to Tests/LibWeb/Layout/expected/block-and-inline/atomic-inline-with-percentage-vertical-align.txt
diff --git a/Tests/LibWeb/Layout/expected/bfc-consider-all-currently-stacked-floats.txt b/Tests/LibWeb/Layout/expected/block-and-inline/bfc-consider-all-currently-stacked-floats.txt
similarity index 100%
rename from Tests/LibWeb/Layout/expected/bfc-consider-all-currently-stacked-floats.txt
rename to Tests/LibWeb/Layout/expected/block-and-inline/bfc-consider-all-currently-stacked-floats.txt
diff --git a/Tests/LibWeb/Layout/expected/bfc-float-left-break-vertically-2.txt b/Tests/LibWeb/Layout/expected/block-and-inline/bfc-float-left-break-vertically-2.txt
similarity index 100%
rename from Tests/LibWeb/Layout/expected/bfc-float-left-break-vertically-2.txt
rename to Tests/LibWeb/Layout/expected/block-and-inline/bfc-float-left-break-vertically-2.txt
diff --git a/Tests/LibWeb/Layout/expected/bfc-float-left-break-vertically.txt b/Tests/LibWeb/Layout/expected/block-and-inline/bfc-float-left-break-vertically.txt
similarity index 100%
rename from Tests/LibWeb/Layout/expected/bfc-float-left-break-vertically.txt
rename to Tests/LibWeb/Layout/expected/block-and-inline/bfc-float-left-break-vertically.txt
diff --git a/Tests/LibWeb/Layout/expected/clearfix.txt b/Tests/LibWeb/Layout/expected/block-and-inline/clearfix.txt
similarity index 100%
rename from Tests/LibWeb/Layout/expected/clearfix.txt
rename to Tests/LibWeb/Layout/expected/block-and-inline/clearfix.txt
diff --git a/Tests/LibWeb/Layout/expected/float-1.txt b/Tests/LibWeb/Layout/expected/block-and-inline/float-1.txt
similarity index 100%
rename from Tests/LibWeb/Layout/expected/float-1.txt
rename to Tests/LibWeb/Layout/expected/block-and-inline/float-1.txt
diff --git a/Tests/LibWeb/Layout/expected/float-2.txt b/Tests/LibWeb/Layout/expected/block-and-inline/float-2.txt
similarity index 100%
rename from Tests/LibWeb/Layout/expected/float-2.txt
rename to Tests/LibWeb/Layout/expected/block-and-inline/float-2.txt
diff --git a/Tests/LibWeb/Layout/expected/float-3.txt b/Tests/LibWeb/Layout/expected/block-and-inline/float-3.txt
similarity index 100%
rename from Tests/LibWeb/Layout/expected/float-3.txt
rename to Tests/LibWeb/Layout/expected/block-and-inline/float-3.txt
diff --git a/Tests/LibWeb/Layout/expected/float-stress-1.txt b/Tests/LibWeb/Layout/expected/block-and-inline/float-stress-1.txt
similarity index 100%
rename from Tests/LibWeb/Layout/expected/float-stress-1.txt
rename to Tests/LibWeb/Layout/expected/block-and-inline/float-stress-1.txt
diff --git a/Tests/LibWeb/Layout/expected/float-stress-2.txt b/Tests/LibWeb/Layout/expected/block-and-inline/float-stress-2.txt
similarity index 100%
rename from Tests/LibWeb/Layout/expected/float-stress-2.txt
rename to Tests/LibWeb/Layout/expected/block-and-inline/float-stress-2.txt
diff --git a/Tests/LibWeb/Layout/expected/float-stress-3.txt b/Tests/LibWeb/Layout/expected/block-and-inline/float-stress-3.txt
similarity index 100%
rename from Tests/LibWeb/Layout/expected/float-stress-3.txt
rename to Tests/LibWeb/Layout/expected/block-and-inline/float-stress-3.txt
diff --git a/Tests/LibWeb/Layout/expected/ifc-float-left-and-sibling-with-margin-left.txt b/Tests/LibWeb/Layout/expected/block-and-inline/ifc-float-left-and-sibling-with-margin-left.txt
similarity index 100%
rename from Tests/LibWeb/Layout/expected/ifc-float-left-and-sibling-with-margin-left.txt
rename to Tests/LibWeb/Layout/expected/block-and-inline/ifc-float-left-and-sibling-with-margin-left.txt
diff --git a/Tests/LibWeb/Layout/expected/inline-box-with-vertical-margins-vertical-align-top.txt b/Tests/LibWeb/Layout/expected/block-and-inline/inline-box-with-vertical-margins-vertical-align-top.txt
similarity index 100%
rename from Tests/LibWeb/Layout/expected/inline-box-with-vertical-margins-vertical-align-top.txt
rename to Tests/LibWeb/Layout/expected/block-and-inline/inline-box-with-vertical-margins-vertical-align-top.txt
diff --git a/Tests/LibWeb/Layout/expected/inline-box-with-vertical-margins.txt b/Tests/LibWeb/Layout/expected/block-and-inline/inline-box-with-vertical-margins.txt
similarity index 100%
rename from Tests/LibWeb/Layout/expected/inline-box-with-vertical-margins.txt
rename to Tests/LibWeb/Layout/expected/block-and-inline/inline-box-with-vertical-margins.txt
diff --git a/Tests/LibWeb/Layout/expected/join-out-of-flow-box-with-previous-sibling-if-wrapped-in-anonymous-box.txt b/Tests/LibWeb/Layout/expected/block-and-inline/join-out-of-flow-box-with-previous-sibling-if-wrapped-in-anonymous-box.txt
similarity index 100%
rename from Tests/LibWeb/Layout/expected/join-out-of-flow-box-with-previous-sibling-if-wrapped-in-anonymous-box.txt
rename to Tests/LibWeb/Layout/expected/block-and-inline/join-out-of-flow-box-with-previous-sibling-if-wrapped-in-anonymous-box.txt
diff --git a/Tests/LibWeb/Layout/expected/margin-collapse-1.txt b/Tests/LibWeb/Layout/expected/block-and-inline/margin-collapse-1.txt
similarity index 100%
rename from Tests/LibWeb/Layout/expected/margin-collapse-1.txt
rename to Tests/LibWeb/Layout/expected/block-and-inline/margin-collapse-1.txt
diff --git a/Tests/LibWeb/Layout/expected/margin-collapse-2.txt b/Tests/LibWeb/Layout/expected/block-and-inline/margin-collapse-2.txt
similarity index 100%
rename from Tests/LibWeb/Layout/expected/margin-collapse-2.txt
rename to Tests/LibWeb/Layout/expected/block-and-inline/margin-collapse-2.txt
diff --git a/Tests/LibWeb/Layout/expected/margin-collapse-3.txt b/Tests/LibWeb/Layout/expected/block-and-inline/margin-collapse-3.txt
similarity index 100%
rename from Tests/LibWeb/Layout/expected/margin-collapse-3.txt
rename to Tests/LibWeb/Layout/expected/block-and-inline/margin-collapse-3.txt
diff --git a/Tests/LibWeb/Layout/expected/margin-collapse-4.txt b/Tests/LibWeb/Layout/expected/block-and-inline/margin-collapse-4.txt
similarity index 100%
rename from Tests/LibWeb/Layout/expected/margin-collapse-4.txt
rename to Tests/LibWeb/Layout/expected/block-and-inline/margin-collapse-4.txt
diff --git a/Tests/LibWeb/Layout/expected/single-br-inline-layout.txt b/Tests/LibWeb/Layout/expected/block-and-inline/single-br-inline-layout.txt
similarity index 100%
rename from Tests/LibWeb/Layout/expected/single-br-inline-layout.txt
rename to Tests/LibWeb/Layout/expected/block-and-inline/single-br-inline-layout.txt
diff --git a/Tests/LibWeb/Layout/input/atomic-inline-with-percentage-vertical-align.html b/Tests/LibWeb/Layout/input/block-and-inline/atomic-inline-with-percentage-vertical-align.html
similarity index 100%
rename from Tests/LibWeb/Layout/input/atomic-inline-with-percentage-vertical-align.html
rename to Tests/LibWeb/Layout/input/block-and-inline/atomic-inline-with-percentage-vertical-align.html
diff --git a/Tests/LibWeb/Layout/input/bfc-consider-all-currently-stacked-floats.html b/Tests/LibWeb/Layout/input/block-and-inline/bfc-consider-all-currently-stacked-floats.html
similarity index 100%
rename from Tests/LibWeb/Layout/input/bfc-consider-all-currently-stacked-floats.html
rename to Tests/LibWeb/Layout/input/block-and-inline/bfc-consider-all-currently-stacked-floats.html
diff --git a/Tests/LibWeb/Layout/input/bfc-float-left-break-vertically-2.html b/Tests/LibWeb/Layout/input/block-and-inline/bfc-float-left-break-vertically-2.html
similarity index 100%
rename from Tests/LibWeb/Layout/input/bfc-float-left-break-vertically-2.html
rename to Tests/LibWeb/Layout/input/block-and-inline/bfc-float-left-break-vertically-2.html
diff --git a/Tests/LibWeb/Layout/input/bfc-float-left-break-vertically.html b/Tests/LibWeb/Layout/input/block-and-inline/bfc-float-left-break-vertically.html
similarity index 100%
rename from Tests/LibWeb/Layout/input/bfc-float-left-break-vertically.html
rename to Tests/LibWeb/Layout/input/block-and-inline/bfc-float-left-break-vertically.html
diff --git a/Tests/LibWeb/Layout/input/clearfix.html b/Tests/LibWeb/Layout/input/block-and-inline/clearfix.html
similarity index 100%
rename from Tests/LibWeb/Layout/input/clearfix.html
rename to Tests/LibWeb/Layout/input/block-and-inline/clearfix.html
diff --git a/Tests/LibWeb/Layout/input/float-1.html b/Tests/LibWeb/Layout/input/block-and-inline/float-1.html
similarity index 100%
rename from Tests/LibWeb/Layout/input/float-1.html
rename to Tests/LibWeb/Layout/input/block-and-inline/float-1.html
diff --git a/Tests/LibWeb/Layout/input/float-2.html b/Tests/LibWeb/Layout/input/block-and-inline/float-2.html
similarity index 100%
rename from Tests/LibWeb/Layout/input/float-2.html
rename to Tests/LibWeb/Layout/input/block-and-inline/float-2.html
diff --git a/Tests/LibWeb/Layout/input/float-3.html b/Tests/LibWeb/Layout/input/block-and-inline/float-3.html
similarity index 100%
rename from Tests/LibWeb/Layout/input/float-3.html
rename to Tests/LibWeb/Layout/input/block-and-inline/float-3.html
diff --git a/Tests/LibWeb/Layout/input/float-stress-1.html b/Tests/LibWeb/Layout/input/block-and-inline/float-stress-1.html
similarity index 100%
rename from Tests/LibWeb/Layout/input/float-stress-1.html
rename to Tests/LibWeb/Layout/input/block-and-inline/float-stress-1.html
diff --git a/Tests/LibWeb/Layout/input/float-stress-2.html b/Tests/LibWeb/Layout/input/block-and-inline/float-stress-2.html
similarity index 100%
rename from Tests/LibWeb/Layout/input/float-stress-2.html
rename to Tests/LibWeb/Layout/input/block-and-inline/float-stress-2.html
diff --git a/Tests/LibWeb/Layout/input/float-stress-3.html b/Tests/LibWeb/Layout/input/block-and-inline/float-stress-3.html
similarity index 100%
rename from Tests/LibWeb/Layout/input/float-stress-3.html
rename to Tests/LibWeb/Layout/input/block-and-inline/float-stress-3.html
diff --git a/Tests/LibWeb/Layout/input/ifc-float-left-and-sibling-with-margin-left.html b/Tests/LibWeb/Layout/input/block-and-inline/ifc-float-left-and-sibling-with-margin-left.html
similarity index 100%
rename from Tests/LibWeb/Layout/input/ifc-float-left-and-sibling-with-margin-left.html
rename to Tests/LibWeb/Layout/input/block-and-inline/ifc-float-left-and-sibling-with-margin-left.html
diff --git a/Tests/LibWeb/Layout/input/inline-box-with-vertical-margins-vertical-align-top.html b/Tests/LibWeb/Layout/input/block-and-inline/inline-box-with-vertical-margins-vertical-align-top.html
similarity index 100%
rename from Tests/LibWeb/Layout/input/inline-box-with-vertical-margins-vertical-align-top.html
rename to Tests/LibWeb/Layout/input/block-and-inline/inline-box-with-vertical-margins-vertical-align-top.html
diff --git a/Tests/LibWeb/Layout/input/inline-box-with-vertical-margins.html b/Tests/LibWeb/Layout/input/block-and-inline/inline-box-with-vertical-margins.html
similarity index 100%
rename from Tests/LibWeb/Layout/input/inline-box-with-vertical-margins.html
rename to Tests/LibWeb/Layout/input/block-and-inline/inline-box-with-vertical-margins.html
diff --git a/Tests/LibWeb/Layout/input/join-out-of-flow-box-with-previous-sibling-if-wrapped-in-anonymous-box.html b/Tests/LibWeb/Layout/input/block-and-inline/join-out-of-flow-box-with-previous-sibling-if-wrapped-in-anonymous-box.html
similarity index 100%
rename from Tests/LibWeb/Layout/input/join-out-of-flow-box-with-previous-sibling-if-wrapped-in-anonymous-box.html
rename to Tests/LibWeb/Layout/input/block-and-inline/join-out-of-flow-box-with-previous-sibling-if-wrapped-in-anonymous-box.html
diff --git a/Tests/LibWeb/Layout/input/margin-collapse-1.html b/Tests/LibWeb/Layout/input/block-and-inline/margin-collapse-1.html
similarity index 100%
rename from Tests/LibWeb/Layout/input/margin-collapse-1.html
rename to Tests/LibWeb/Layout/input/block-and-inline/margin-collapse-1.html
diff --git a/Tests/LibWeb/Layout/input/margin-collapse-2.html b/Tests/LibWeb/Layout/input/block-and-inline/margin-collapse-2.html
similarity index 100%
rename from Tests/LibWeb/Layout/input/margin-collapse-2.html
rename to Tests/LibWeb/Layout/input/block-and-inline/margin-collapse-2.html
diff --git a/Tests/LibWeb/Layout/input/margin-collapse-3.html b/Tests/LibWeb/Layout/input/block-and-inline/margin-collapse-3.html
similarity index 100%
rename from Tests/LibWeb/Layout/input/margin-collapse-3.html
rename to Tests/LibWeb/Layout/input/block-and-inline/margin-collapse-3.html
diff --git a/Tests/LibWeb/Layout/input/margin-collapse-4.html b/Tests/LibWeb/Layout/input/block-and-inline/margin-collapse-4.html
similarity index 100%
rename from Tests/LibWeb/Layout/input/margin-collapse-4.html
rename to Tests/LibWeb/Layout/input/block-and-inline/margin-collapse-4.html
diff --git a/Tests/LibWeb/Layout/input/single-br-inline-layout.html b/Tests/LibWeb/Layout/input/block-and-inline/single-br-inline-layout.html
similarity index 100%
rename from Tests/LibWeb/Layout/input/single-br-inline-layout.html
rename to Tests/LibWeb/Layout/input/block-and-inline/single-br-inline-layout.html