diff --git a/Tests/LibWeb/Layout/expected/grid/gap.txt b/Tests/LibWeb/Layout/expected/grid/gap.txt
deleted file mode 100644
index 77336df1df..0000000000
--- a/Tests/LibWeb/Layout/expected/grid/gap.txt
+++ /dev/null
@@ -1,102 +0,0 @@
-Viewport <#document> at (0,0) content-size 800x600 children: not-inline
- BlockContainer at (0,0) content-size 800x600 [BFC] children: not-inline
- BlockContainer
at (8,8) content-size 784x150.8125 children: not-inline
- Box at (8,8) content-size 784x44.9375 [GFC] children: not-inline
- BlockContainer <(anonymous)> at (8,8) content-size 0x0 [BFC] children: inline
- TextNode <#text>
- BlockContainer at (8,8) content-size 367.140625x17.46875 [BFC] children: inline
- line 0 width: 6.34375, height: 17.46875, bottom: 17.46875, baseline: 13.53125
- frag 0 from TextNode start: 0, length: 1, rect: [8,8 6.34375x17.46875]
- "1"
- TextNode <#text>
- BlockContainer <(anonymous)> at (8,8) content-size 0x0 [BFC] children: inline
- TextNode <#text>
- BlockContainer at (425.140625,8) content-size 367x17.46875 [BFC] children: inline
- line 0 width: 8.8125, height: 17.46875, bottom: 17.46875, baseline: 13.53125
- frag 0 from TextNode start: 0, length: 1, rect: [425.140625,8 8.8125x17.46875]
- "2"
- TextNode <#text>
- BlockContainer <(anonymous)> at (8,8) content-size 0x0 [BFC] children: inline
- TextNode <#text>
- BlockContainer at (8,35.46875) content-size 367.140625x17.46875 [BFC] children: inline
- line 0 width: 9.09375, height: 17.46875, bottom: 17.46875, baseline: 13.53125
- frag 0 from TextNode start: 0, length: 1, rect: [8,35.46875 9.09375x17.46875]
- "3"
- TextNode <#text>
- BlockContainer <(anonymous)> at (8,8) content-size 0x0 [BFC] children: inline
- TextNode <#text>
- BlockContainer at (425.140625,35.46875) content-size 367x17.46875 [BFC] children: inline
- line 0 width: 7.75, height: 17.46875, bottom: 17.46875, baseline: 13.53125
- frag 0 from TextNode start: 0, length: 1, rect: [425.140625,35.46875 7.75x17.46875]
- "4"
- TextNode <#text>
- BlockContainer <(anonymous)> at (8,8) content-size 0x0 [BFC] children: inline
- TextNode <#text>
- BlockContainer <(anonymous)> at (8,52.9375) content-size 784x0 children: inline
- TextNode <#text>
- TextNode <#text>
- Box at (8,52.9375) content-size 784x50.9375 [GFC] children: not-inline
- BlockContainer <(anonymous)> at (8,52.9375) content-size 0x0 [BFC] children: inline
- TextNode <#text>
- BlockContainer at (435.934356,52.9375) content-size 357.300018x17.46875 [BFC] children: inline
- line 0 width: 6.34375, height: 17.46875, bottom: 17.46875, baseline: 13.53125
- frag 0 from TextNode start: 0, length: 1, rect: [435.934356,52.9375 6.34375x17.46875]
- "1"
- TextNode <#text>
- BlockContainer <(anonymous)> at (8,52.9375) content-size 0x0 [BFC] children: inline
- TextNode <#text>
- BlockContainer at (8,86.40625) content-size 358.534362x17.46875 [BFC] children: inline
- line 0 width: 8.8125, height: 17.46875, bottom: 17.46875, baseline: 13.53125
- frag 0 from TextNode start: 0, length: 1, rect: [8,86.40625 8.8125x17.46875]
- "2"
- TextNode <#text>
- BlockContainer <(anonymous)> at (8,52.9375) content-size 0x0 [BFC] children: inline
- TextNode <#text>
- BlockContainer <(anonymous)> at (8,103.875) content-size 784x0 children: inline
- TextNode <#text>
- TextNode <#text>
- TextNode <#text>
- Box at (8,103.875) content-size 784x17.46875 [GFC] children: not-inline
- BlockContainer <(anonymous)> at (8,103.875) content-size 0x0 [BFC] children: inline
- TextNode <#text>
- BlockContainer at (408,103.875) content-size 384x17.46875 [BFC] children: inline
- line 0 width: 6.34375, height: 17.46875, bottom: 17.46875, baseline: 13.53125
- frag 0 from TextNode start: 0, length: 1, rect: [408,103.875 6.34375x17.46875]
- "1"
- TextNode <#text>
- BlockContainer <(anonymous)> at (8,103.875) content-size 0x0 [BFC] children: inline
- TextNode <#text>
- BlockContainer <(anonymous)> at (8,121.34375) content-size 784x0 children: inline
- TextNode <#text>
- TextNode <#text>
- TextNode <#text>
- Box at (8,121.34375) content-size 784x20 [GFC] children: not-inline
- BlockContainer <(anonymous)> at (8,121.34375) content-size 0x0 [BFC] children: inline
- TextNode <#text>
- BlockContainer at (408,121.34375) content-size 384x20 [BFC] children: inline
- line 0 width: 6.34375, height: 17.46875, bottom: 17.46875, baseline: 13.53125
- frag 0 from TextNode start: 0, length: 1, rect: [408,121.34375 6.34375x17.46875]
- "1"
- TextNode <#text>
- BlockContainer <(anonymous)> at (8,121.34375) content-size 0x0 [BFC] children: inline
- TextNode <#text>
- BlockContainer <(anonymous)> at (8,141.34375) content-size 784x0 children: inline
- TextNode <#text>
- TextNode <#text>
- Box at (8,141.34375) content-size 784x17.46875 [GFC] children: not-inline
- BlockContainer <(anonymous)> at (8,141.34375) content-size 0x0 [BFC] children: inline
- TextNode <#text>
- BlockContainer at (8,141.34375) content-size 387x17.46875 [BFC] children: inline
- line 0 width: 104.875, height: 17.46875, bottom: 17.46875, baseline: 13.53125
- frag 0 from TextNode start: 0, length: 14, rect: [8,141.34375 104.875x17.46875]
- "left side text"
- TextNode <#text>
- BlockContainer <(anonymous)> at (8,141.34375) content-size 0x0 [BFC] children: inline
- TextNode <#text>
- BlockContainer at (405,141.34375) content-size 387x17.46875 [BFC] children: inline
- line 0 width: 363.203125, height: 17.46875, bottom: 17.46875, baseline: 13.53125
- frag 0 from TextNode start: 0, length: 47, rect: [405,141.34375 363.203125x17.46875]
- "right side text right side text right side text"
- TextNode <#text>
- BlockContainer <(anonymous)> at (8,141.34375) content-size 0x0 [BFC] children: inline
- TextNode <#text>
diff --git a/Tests/LibWeb/Layout/expected/grid/grid-gap-1.txt b/Tests/LibWeb/Layout/expected/grid/grid-gap-1.txt
new file mode 100644
index 0000000000..0f271c9117
--- /dev/null
+++ b/Tests/LibWeb/Layout/expected/grid/grid-gap-1.txt
@@ -0,0 +1,24 @@
+Viewport <#document> at (0,0) content-size 800x600 children: not-inline
+ BlockContainer at (0,0) content-size 800x600 [BFC] children: not-inline
+ BlockContainer at (8,8) content-size 784x84.9375 children: not-inline
+ Box at (8,8) content-size 784x84.9375 [GFC] children: not-inline
+ BlockContainer at (8,8) content-size 342.140625x17.46875 [BFC] children: inline
+ line 0 width: 6.34375, height: 17.46875, bottom: 17.46875, baseline: 13.53125
+ frag 0 from TextNode start: 0, length: 1, rect: [8,8 6.34375x17.46875]
+ "1"
+ TextNode <#text>
+ BlockContainer at (450.140625,8) content-size 342x17.46875 [BFC] children: inline
+ line 0 width: 8.8125, height: 17.46875, bottom: 17.46875, baseline: 13.53125
+ frag 0 from TextNode start: 0, length: 1, rect: [450.140625,8 8.8125x17.46875]
+ "2"
+ TextNode <#text>
+ BlockContainer at (8,75.46875) content-size 342.140625x17.46875 [BFC] children: inline
+ line 0 width: 9.09375, height: 17.46875, bottom: 17.46875, baseline: 13.53125
+ frag 0 from TextNode start: 0, length: 1, rect: [8,75.46875 9.09375x17.46875]
+ "3"
+ TextNode <#text>
+ BlockContainer at (450.140625,75.46875) content-size 342x17.46875 [BFC] children: inline
+ line 0 width: 7.75, height: 17.46875, bottom: 17.46875, baseline: 13.53125
+ frag 0 from TextNode start: 0, length: 1, rect: [450.140625,75.46875 7.75x17.46875]
+ "4"
+ TextNode <#text>
diff --git a/Tests/LibWeb/Layout/expected/grid/grid-gap-2.txt b/Tests/LibWeb/Layout/expected/grid/grid-gap-2.txt
new file mode 100644
index 0000000000..55959efe94
--- /dev/null
+++ b/Tests/LibWeb/Layout/expected/grid/grid-gap-2.txt
@@ -0,0 +1,14 @@
+Viewport <#document> at (0,0) content-size 800x600 children: not-inline
+ BlockContainer at (0,0) content-size 800x600 [BFC] children: not-inline
+ BlockContainer at (8,8) content-size 784x50.9375 children: not-inline
+ Box at (8,8) content-size 784x50.9375 [GFC] children: not-inline
+ BlockContainer at (435.934356,8) content-size 357.300018x17.46875 [BFC] children: inline
+ line 0 width: 6.34375, height: 17.46875, bottom: 17.46875, baseline: 13.53125
+ frag 0 from TextNode start: 0, length: 1, rect: [435.934356,8 6.34375x17.46875]
+ "1"
+ TextNode <#text>
+ BlockContainer at (8,41.46875) content-size 358.534362x17.46875 [BFC] children: inline
+ line 0 width: 8.8125, height: 17.46875, bottom: 17.46875, baseline: 13.53125
+ frag 0 from TextNode start: 0, length: 1, rect: [8,41.46875 8.8125x17.46875]
+ "2"
+ TextNode <#text>
diff --git a/Tests/LibWeb/Layout/expected/grid/grid-gap-3.txt b/Tests/LibWeb/Layout/expected/grid/grid-gap-3.txt
new file mode 100644
index 0000000000..ab5091cc7e
--- /dev/null
+++ b/Tests/LibWeb/Layout/expected/grid/grid-gap-3.txt
@@ -0,0 +1,9 @@
+Viewport <#document> at (0,0) content-size 800x600 children: not-inline
+ BlockContainer at (0,0) content-size 800x600 [BFC] children: not-inline
+ BlockContainer at (8,8) content-size 784x17.46875 children: not-inline
+ Box at (8,8) content-size 784x17.46875 [GFC] children: not-inline
+ BlockContainer at (410,8) content-size 382x17.46875 [BFC] children: inline
+ line 0 width: 6.34375, height: 17.46875, bottom: 17.46875, baseline: 13.53125
+ frag 0 from TextNode start: 0, length: 1, rect: [410,8 6.34375x17.46875]
+ "1"
+ TextNode <#text>
diff --git a/Tests/LibWeb/Layout/input/grid/gap.html b/Tests/LibWeb/Layout/input/grid/gap.html
deleted file mode 100644
index 2fc70eeb68..0000000000
--- a/Tests/LibWeb/Layout/input/grid/gap.html
+++ /dev/null
@@ -1,58 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
left side text
-
right side text right side text right side text
-
\ No newline at end of file
diff --git a/Tests/LibWeb/Layout/input/grid/grid-gap-1.html b/Tests/LibWeb/Layout/input/grid/grid-gap-1.html
new file mode 100644
index 0000000000..a6cb14abdb
--- /dev/null
+++ b/Tests/LibWeb/Layout/input/grid/grid-gap-1.html
@@ -0,0 +1,24 @@
+
\ No newline at end of file
diff --git a/Tests/LibWeb/Layout/input/grid/grid-gap-2.html b/Tests/LibWeb/Layout/input/grid/grid-gap-2.html
new file mode 100644
index 0000000000..201957d45e
--- /dev/null
+++ b/Tests/LibWeb/Layout/input/grid/grid-gap-2.html
@@ -0,0 +1,13 @@
+
+
\ No newline at end of file
diff --git a/Tests/LibWeb/Layout/input/grid/grid-gap-3.html b/Tests/LibWeb/Layout/input/grid/grid-gap-3.html
new file mode 100644
index 0000000000..9bdfcf95cc
--- /dev/null
+++ b/Tests/LibWeb/Layout/input/grid/grid-gap-3.html
@@ -0,0 +1,13 @@
+
\ No newline at end of file