diff --git a/gtk/gskpango.c b/gtk/gskpango.c
index a73f25cae0..5263e1c950 100644
--- a/gtk/gskpango.c
+++ b/gtk/gskpango.c
@@ -21,6 +21,7 @@
 
 #include "gsk/gsk.h"
 #include "gskpango.h"
+#include "gtksnapshotprivate.h"
 
 #include <math.h>
 
@@ -116,7 +117,6 @@ gsk_pango_renderer_show_text_glyphs (PangoRenderer        *renderer,
   int x_offset, y_offset;
   GskRenderNode *node;
   GdkRGBA color;
-  char name[64];
 
   gtk_snapshot_get_offset (crenderer->snapshot, &x_offset, &y_offset);
 
@@ -125,8 +125,12 @@ gsk_pango_renderer_show_text_glyphs (PangoRenderer        *renderer,
   get_color (crenderer, PANGO_RENDER_PART_FOREGROUND, &color);
 
   node = gsk_text_node_new (font, glyphs, &color, x_offset, y_offset, base_x, base_y);
-  snprintf (name, sizeof (name), "Glyphs<%d>", glyphs->num_glyphs);
-  gsk_render_node_set_name (node, name);
+  if (crenderer->snapshot->record_names)
+    {
+      char name[64];
+      snprintf (name, sizeof (name), "Glyphs<%d>", glyphs->num_glyphs);
+      gsk_render_node_set_name (node, name);
+    }
   gtk_snapshot_append_node (crenderer->snapshot, node);
   gsk_render_node_unref (node);