diff --git a/testsuite/gsk/compare/glyph-cache-overflow-slices.node b/testsuite/gsk/compare/glyph-cache-overflow-slices.node
index 03b807a6f3..920082c9cd 100644
--- a/testsuite/gsk/compare/glyph-cache-overflow-slices.node
+++ b/testsuite/gsk/compare/glyph-cache-overflow-slices.node
@@ -1,11 +1,15 @@
-color {
-  color: black;
-  bounds: 0 -15 1024 1024;
-}
+clip {
+  clip: 0 -15 1024 1024;
+  child: container {
 
-text {
-  color: red;
-  font: "Font 13px" url("data://;base64,\
+    color {
+      color: black;
+      bounds: 0 -15 1024 1024;
+    }
+
+    text {
+      color: red;
+      font: "Font 13px" url("data://;base64,\
 AAEAAAAIAIAAAwAAY21hcAAIAKUAAAIMAAAALGdseWZFxbN2AAACvAAABhZoZWFkvj7BOAAAAIwA\
 AAA2aGhlYQFBAXIAAADEAAAAJGhtdHhMoAAAAAABCAAAAQRsb2NhMYAzCwAAAjgAAACEbWF4cABD\
 AAUAAADoAAAAIG5hbWVuh0Z1AAAI1AAAABYAAQAAAAEZmoDtU+9fDzz1AAIAEAAAAAB8JbCAAAAA\
@@ -47,48 +51,48 @@ IQEw/tAQAAABAAAAAAEwABAAAwAAMSE1IQEw/tAQAAABAAAAAAEwABAAAwAAMSE1IQEw/tAQAAAB\
 AAAAAAEwABAAAwAAMSE1IQEw/tAQAAABAAAAAAEwABAAAwAAMSE1IQEw/tAQAAABAAAAAAEwABAA\
 AwAAMSE1IQEw/tAQAAABAAAAAACgABAAAwAAMTM1I6CgEAAAAAAAAAEAEgABAAAAAAABAAQAAEZv\
 bnQAAA==");
-  glyphs: 0 0 1 1, 1 0 257 1, 2 0 513 1, 3 0 769 1,
-4 0 1 17, 5 0 257 17, 6 0 513 17, 7 0 769 17,
-8 0 1 33, 9 0 257 33, 10 0 513 33, 11 0 769 33,
-12 0 1 49, 13 0 257 49, 14 0 513 49, 15 0 769 49,
-16 0 1 65, 17 0 257 65, 18 0 513 65, 19 0 769 65,
-20 0 1 81, 21 0 257 81, 22 0 513 81, 23 0 769 81,
-24 0 1 97, 25 0 257 97, 26 0 513 97, 27 0 769 97,
-28 0 1 113, 29 0 257 113, 30 0 513 113, 31 0 769 113,
-32 0 1 129, 33 0 257 129, 34 0 513 129, 35 0 769 129,
-36 0 1 145, 37 0 257 145, 38 0 513 145, 39 0 769 145,
-40 0 1 161, 41 0 257 161, 42 0 513 161, 43 0 769 161,
-44 0 1 177, 45 0 257 177, 46 0 513 177, 47 0 769 177,
-48 0 1 193, 49 0 257 193, 50 0 513 193, 51 0 769 193,
-52 0 1 209, 53 0 257 209, 54 0 513 209, 55 0 769 209,
-56 0 1 225, 57 0 257 225, 58 0 513 225, 59 0 769 225,
-60 0 1 241, 61 0 257 241, 62 0 513 241, 63 0 769 241;
-}
+      glyphs: 0 0 1 1, 1 0 257 1, 2 0 513 1, 3 0 769 1,
+    4 0 1 17, 5 0 257 17, 6 0 513 17, 7 0 769 17,
+    8 0 1 33, 9 0 257 33, 10 0 513 33, 11 0 769 33,
+    12 0 1 49, 13 0 257 49, 14 0 513 49, 15 0 769 49,
+    16 0 1 65, 17 0 257 65, 18 0 513 65, 19 0 769 65,
+    20 0 1 81, 21 0 257 81, 22 0 513 81, 23 0 769 81,
+    24 0 1 97, 25 0 257 97, 26 0 513 97, 27 0 769 97,
+    28 0 1 113, 29 0 257 113, 30 0 513 113, 31 0 769 113,
+    32 0 1 129, 33 0 257 129, 34 0 513 129, 35 0 769 129,
+    36 0 1 145, 37 0 257 145, 38 0 513 145, 39 0 769 145,
+    40 0 1 161, 41 0 257 161, 42 0 513 161, 43 0 769 161,
+    44 0 1 177, 45 0 257 177, 46 0 513 177, 47 0 769 177,
+    48 0 1 193, 49 0 257 193, 50 0 513 193, 51 0 769 193,
+    52 0 1 209, 53 0 257 209, 54 0 513 209, 55 0 769 209,
+    56 0 1 225, 57 0 257 225, 58 0 513 225, 59 0 769 225,
+    60 0 1 241, 61 0 257 241, 62 0 513 241, 63 0 769 241;
+    }
 
-text {
-  color: red;
-  font: "Font 12px";
-  glyphs: 0 0 1 257, 1 0 257 257, 2 0 513 257, 3 0 769 257,
-4 0 1 273, 5 0 257 273, 6 0 513 273, 7 0 769 273,
-8 0 1 289, 9 0 257 289, 10 0 513 289, 11 0 769 289,
-12 0 1 305, 13 0 257 305, 14 0 513 305, 15 0 769 305,
-16 0 1 321, 17 0 257 321, 18 0 513 321, 19 0 769 321,
-20 0 1 337, 21 0 257 337, 22 0 513 337, 23 0 769 337,
-24 0 1 353, 25 0 257 353, 26 0 513 353, 27 0 769 353,
-28 0 1 369, 29 0 257 369, 30 0 513 369, 31 0 769 369,
-32 0 1 385, 33 0 257 385, 34 0 513 385, 35 0 769 385,
-36 0 1 401, 37 0 257 401, 38 0 513 401, 39 0 769 401,
-40 0 1 417, 41 0 257 417, 42 0 513 417, 43 0 769 417,
-44 0 1 433, 45 0 257 433, 46 0 513 433, 47 0 769 433,
-48 0 1 449, 49 0 257 449, 50 0 513 449, 51 0 769 449,
-52 0 1 465, 53 0 257 465, 54 0 513 465, 55 0 769 465,
-56 0 1 481, 57 0 257 481, 58 0 513 481, 59 0 769 481,
-60 0 1 497, 61 0 257 497, 62 0 513 497, 63 0 769 497;
-}
+    text {
+      color: red;
+      font: "Font 12px";
+      glyphs: 0 0 1 257, 1 0 257 257, 2 0 513 257, 3 0 769 257,
+    4 0 1 273, 5 0 257 273, 6 0 513 273, 7 0 769 273,
+    8 0 1 289, 9 0 257 289, 10 0 513 289, 11 0 769 289,
+    12 0 1 305, 13 0 257 305, 14 0 513 305, 15 0 769 305,
+    16 0 1 321, 17 0 257 321, 18 0 513 321, 19 0 769 321,
+    20 0 1 337, 21 0 257 337, 22 0 513 337, 23 0 769 337,
+    24 0 1 353, 25 0 257 353, 26 0 513 353, 27 0 769 353,
+    28 0 1 369, 29 0 257 369, 30 0 513 369, 31 0 769 369,
+    32 0 1 385, 33 0 257 385, 34 0 513 385, 35 0 769 385,
+    36 0 1 401, 37 0 257 401, 38 0 513 401, 39 0 769 401,
+    40 0 1 417, 41 0 257 417, 42 0 513 417, 43 0 769 417,
+    44 0 1 433, 45 0 257 433, 46 0 513 433, 47 0 769 433,
+    48 0 1 449, 49 0 257 449, 50 0 513 449, 51 0 769 449,
+    52 0 1 465, 53 0 257 465, 54 0 513 465, 55 0 769 465,
+    56 0 1 481, 57 0 257 481, 58 0 513 481, 59 0 769 481,
+    60 0 1 497, 61 0 257 497, 62 0 513 497, 63 0 769 497;
+    }
 
-text {
-  color: red;
-  font: "Font 2 13px" url("data://;base64,\
+    text {
+      color: red;
+      font: "Font 2 13px" url("data://;base64,\
 AAEAAAAIAIAAAwAAY21hcAAIAKUAAAIMAAAALGdseWZFxbN2AAACvAAABhZoZWFkvj7C5QAAAIwA\
 AAA2aGhlYQFBAXIAAADEAAAAJGhtdHhMoAAAAAABCAAAAQRsb2NhMYAzCwAAAjgAAACEbWF4cABD\
 AAUAAADoAAAAIG5hbWVuh2apAAAI1AAAABgAAQAAAAEZmoDtECtfDzz1AAIAEAAAAAB8JbCAAAAA\
@@ -130,46 +134,48 @@ IQEw/tAQAAABAAAAAAEwABAAAwAAMSE1IQEw/tAQAAABAAAAAAEwABAAAwAAMSE1IQEw/tAQAAAB\
 AAAAAAEwABAAAwAAMSE1IQEw/tAQAAABAAAAAAEwABAAAwAAMSE1IQEw/tAQAAABAAAAAAEwABAA\
 AwAAMSE1IQEw/tAQAAABAAAAAACgABAAAwAAMTM1I6CgEAAAAAAAAAEAEgABAAAAAAABAAYAAEZv\
 bnQgMg==");
-  glyphs: 0 0 1 513, 1 0 257 513, 2 0 513 513, 3 0 769 513,
-4 0 1 529, 5 0 257 529, 6 0 513 529, 7 0 769 529,
-8 0 1 545, 9 0 257 545, 10 0 513 545, 11 0 769 545,
-12 0 1 561, 13 0 257 561, 14 0 513 561, 15 0 769 561,
-16 0 1 577, 17 0 257 577, 18 0 513 577, 19 0 769 577,
-20 0 1 593, 21 0 257 593, 22 0 513 593, 23 0 769 593,
-24 0 1 609, 25 0 257 609, 26 0 513 609, 27 0 769 609,
-28 0 1 625, 29 0 257 625, 30 0 513 625, 31 0 769 625,
-32 0 1 641, 33 0 257 641, 34 0 513 641, 35 0 769 641,
-36 0 1 657, 37 0 257 657, 38 0 513 657, 39 0 769 657,
-40 0 1 673, 41 0 257 673, 42 0 513 673, 43 0 769 673,
-44 0 1 689, 45 0 257 689, 46 0 513 689, 47 0 769 689,
-48 0 1 705, 49 0 257 705, 50 0 513 705, 51 0 769 705,
-52 0 1 721, 53 0 257 721, 54 0 513 721, 55 0 769 721,
-56 0 1 737, 57 0 257 737, 58 0 513 737, 59 0 769 737,
-60 0 1 753, 61 0 257 753, 62 0 513 753, 63 0 769 753;
-}
+      glyphs: 0 0 1 513, 1 0 257 513, 2 0 513 513, 3 0 769 513,
+    4 0 1 529, 5 0 257 529, 6 0 513 529, 7 0 769 529,
+    8 0 1 545, 9 0 257 545, 10 0 513 545, 11 0 769 545,
+    12 0 1 561, 13 0 257 561, 14 0 513 561, 15 0 769 561,
+    16 0 1 577, 17 0 257 577, 18 0 513 577, 19 0 769 577,
+    20 0 1 593, 21 0 257 593, 22 0 513 593, 23 0 769 593,
+    24 0 1 609, 25 0 257 609, 26 0 513 609, 27 0 769 609,
+    28 0 1 625, 29 0 257 625, 30 0 513 625, 31 0 769 625,
+    32 0 1 641, 33 0 257 641, 34 0 513 641, 35 0 769 641,
+    36 0 1 657, 37 0 257 657, 38 0 513 657, 39 0 769 657,
+    40 0 1 673, 41 0 257 673, 42 0 513 673, 43 0 769 673,
+    44 0 1 689, 45 0 257 689, 46 0 513 689, 47 0 769 689,
+    48 0 1 705, 49 0 257 705, 50 0 513 705, 51 0 769 705,
+    52 0 1 721, 53 0 257 721, 54 0 513 721, 55 0 769 721,
+    56 0 1 737, 57 0 257 737, 58 0 513 737, 59 0 769 737,
+    60 0 1 753, 61 0 257 753, 62 0 513 753, 63 0 769 753;
+    }
 
-text {
-  color: red;
-  font: "Font 2 12px";
-  glyphs: 0 0 1 769, 1 0 257 769, 2 0 513 769, 3 0 769 769,
-4 0 1 785, 5 0 257 785, 6 0 513 785, 7 0 769 785,
-8 0 1 801, 9 0 257 801, 10 0 513 801, 11 0 769 801,
-12 0 1 817, 13 0 257 817, 14 0 513 817, 15 0 769 817,
-16 0 1 833, 17 0 257 833, 18 0 513 833, 19 0 769 833,
-20 0 1 849, 21 0 257 849, 22 0 513 849, 23 0 769 849,
-24 0 1 865, 25 0 257 865, 26 0 513 865, 27 0 769 865,
-28 0 1 881, 29 0 257 881, 30 0 513 881, 31 0 769 881,
-32 0 1 897, 33 0 257 897, 34 0 513 897, 35 0 769 897,
-36 0 1 913, 37 0 257 913, 38 0 513 913, 39 0 769 913,
-40 0 1 929, 41 0 257 929, 42 0 513 929, 43 0 769 929,
-44 0 1 945, 45 0 257 945, 46 0 513 945, 47 0 769 945,
-48 0 1 961, 49 0 257 961, 50 0 513 961, 51 0 769 961,
-52 0 1 977, 53 0 257 977, 54 0 513 977, 55 0 769 977,
-56 0 1 993, 57 0 257 993, 58 0 513 993, 59 0 769 993;
-}
+    text {
+      color: red;
+      font: "Font 2 12px";
+      glyphs: 0 0 1 769, 1 0 257 769, 2 0 513 769, 3 0 769 769,
+    4 0 1 785, 5 0 257 785, 6 0 513 785, 7 0 769 785,
+    8 0 1 801, 9 0 257 801, 10 0 513 801, 11 0 769 801,
+    12 0 1 817, 13 0 257 817, 14 0 513 817, 15 0 769 817,
+    16 0 1 833, 17 0 257 833, 18 0 513 833, 19 0 769 833,
+    20 0 1 849, 21 0 257 849, 22 0 513 849, 23 0 769 849,
+    24 0 1 865, 25 0 257 865, 26 0 513 865, 27 0 769 865,
+    28 0 1 881, 29 0 257 881, 30 0 513 881, 31 0 769 881,
+    32 0 1 897, 33 0 257 897, 34 0 513 897, 35 0 769 897,
+    36 0 1 913, 37 0 257 913, 38 0 513 913, 39 0 769 913,
+    40 0 1 929, 41 0 257 929, 42 0 513 929, 43 0 769 929,
+    44 0 1 945, 45 0 257 945, 46 0 513 945, 47 0 769 945,
+    48 0 1 961, 49 0 257 961, 50 0 513 961, 51 0 769 961,
+    52 0 1 977, 53 0 257 977, 54 0 513 977, 55 0 769 977,
+    56 0 1 993, 57 0 257 993, 58 0 513 993, 59 0 769 993;
+    }
 
-text {
-  color: red;
-  font: "Font 15px";
-  glyphs: 64 0 0 1009;
+    text {
+      color: red;
+      font: "Font 15px";
+      glyphs: 64 0 0 1009;
+    }
+  }
 }
diff --git a/testsuite/gsk/compare/glyph-cache-overflow-slices.png b/testsuite/gsk/compare/glyph-cache-overflow-slices.png
index f3ecee146d..4718ac8e97 100644
Binary files a/testsuite/gsk/compare/glyph-cache-overflow-slices.png and b/testsuite/gsk/compare/glyph-cache-overflow-slices.png differ