diff --git a/testsuite/gsk/compare/borders-scaled.node b/testsuite/gsk/compare/borders-scaled-nogl.node
similarity index 100%
rename from testsuite/gsk/compare/borders-scaled.node
rename to testsuite/gsk/compare/borders-scaled-nogl.node
diff --git a/testsuite/gsk/compare/borders-scaled.png b/testsuite/gsk/compare/borders-scaled-nogl.png
similarity index 100%
rename from testsuite/gsk/compare/borders-scaled.png
rename to testsuite/gsk/compare/borders-scaled-nogl.png
diff --git a/testsuite/gsk/compare/clip-nested1.node b/testsuite/gsk/compare/clip-nested1-nogl.node
similarity index 100%
rename from testsuite/gsk/compare/clip-nested1.node
rename to testsuite/gsk/compare/clip-nested1-nogl.node
diff --git a/testsuite/gsk/compare/clip-nested1.png b/testsuite/gsk/compare/clip-nested1-nogl.png
similarity index 100%
rename from testsuite/gsk/compare/clip-nested1.png
rename to testsuite/gsk/compare/clip-nested1-nogl.png
diff --git a/testsuite/gsk/compare/clipped-repeat.node b/testsuite/gsk/compare/clipped-repeat-nogl.node
similarity index 100%
rename from testsuite/gsk/compare/clipped-repeat.node
rename to testsuite/gsk/compare/clipped-repeat-nogl.node
diff --git a/testsuite/gsk/compare/clipped-repeat.png b/testsuite/gsk/compare/clipped-repeat-nogl.png
similarity index 100%
rename from testsuite/gsk/compare/clipped-repeat.png
rename to testsuite/gsk/compare/clipped-repeat-nogl.png
diff --git a/testsuite/gsk/compare/css-background.node b/testsuite/gsk/compare/css-background-nogl.node
similarity index 100%
rename from testsuite/gsk/compare/css-background.node
rename to testsuite/gsk/compare/css-background-nogl.node
diff --git a/testsuite/gsk/compare/css-background.png b/testsuite/gsk/compare/css-background-nogl.png
similarity index 100%
rename from testsuite/gsk/compare/css-background.png
rename to testsuite/gsk/compare/css-background-nogl.png
diff --git a/testsuite/gsk/compare/glyph-cache-overflow.node b/testsuite/gsk/compare/glyph-cache-overflow-nogl.node
similarity index 100%
rename from testsuite/gsk/compare/glyph-cache-overflow.node
rename to testsuite/gsk/compare/glyph-cache-overflow-nogl.node
diff --git a/testsuite/gsk/compare/glyph-cache-overflow.png b/testsuite/gsk/compare/glyph-cache-overflow-nogl.png
similarity index 100%
rename from testsuite/gsk/compare/glyph-cache-overflow.png
rename to testsuite/gsk/compare/glyph-cache-overflow-nogl.png
diff --git a/testsuite/gsk/compare/huge-height.node b/testsuite/gsk/compare/huge-height-nogl.node
similarity index 100%
rename from testsuite/gsk/compare/huge-height.node
rename to testsuite/gsk/compare/huge-height-nogl.node
diff --git a/testsuite/gsk/compare/huge-height.png b/testsuite/gsk/compare/huge-height-nogl.png
similarity index 100%
rename from testsuite/gsk/compare/huge-height.png
rename to testsuite/gsk/compare/huge-height-nogl.png
diff --git a/testsuite/gsk/compare/huge-width.node b/testsuite/gsk/compare/huge-width-nogl.node
similarity index 100%
rename from testsuite/gsk/compare/huge-width.node
rename to testsuite/gsk/compare/huge-width-nogl.node
diff --git a/testsuite/gsk/compare/huge-width.png b/testsuite/gsk/compare/huge-width-nogl.png
similarity index 100%
rename from testsuite/gsk/compare/huge-width.png
rename to testsuite/gsk/compare/huge-width-nogl.png
diff --git a/testsuite/gsk/meson.build b/testsuite/gsk/meson.build
index 99e61c27d5..fe9d41497d 100644
--- a/testsuite/gsk/meson.build
+++ b/testsuite/gsk/meson.build
@@ -30,7 +30,7 @@ compare_render_tests = [
   'border-opacity',
   'border-zero-width-color',
   'borders-rotated',
-  'borders-scaled',
+  'borders-scaled-nogl',
   'clip-contained',
   'clip-coordinates-2d',
   'clip-coordinates-nocairo',
@@ -39,9 +39,9 @@ compare_render_tests = [
   'clip-in-rounded-clip3',
   'clip-in-smaller-rounded-clip',
   'clip-intersection-fail-opacity-nogl',
-  'clipped-repeat',
+  'clipped-repeat-nogl',
   'clipped_rounded_clip',
-  'clip-nested1',
+  'clip-nested1-nogl',
   'clip-translate-offscreen',
   'color-blur0',
   'color-matrix-identity',
@@ -55,7 +55,7 @@ compare_render_tests = [
   'cross-fade-clipped-with-huge-children-nogl',
   'cross-fade-in-opacity',
   'cross-fade-in-rotate',
-  'css-background',
+  'css-background-nogl',
   'dihedral',
   'empty-blend',
   'empty-blur',
@@ -86,7 +86,7 @@ compare_render_tests = [
   'fill-opacity',
   'fill-scaled-up',
   'fill-with-3d-contents-nogl-nocairo',
-  'glyph-cache-overflow',
+  'glyph-cache-overflow-nogl',
   'glyph-cache-overflow-slices',
   'glyph-hinting-none',
   'glyph-hinting-slight',
@@ -94,8 +94,8 @@ compare_render_tests = [
   'glyph-subpixel-position',
   'glyph-scaling',
   'glyph-antialias',
-  'huge-height',
-  'huge-width',
+  'huge-height-nogl',
+  'huge-width-nogl',
   'inset-shadow-multiple',
   'invalid-transform',
   'issue-3615',