diff --git a/tests/curve2.c b/tests/curve2.c
index 5a9f99cc52..82bc0fd50e 100644
--- a/tests/curve2.c
+++ b/tests/curve2.c
@@ -18,6 +18,7 @@ struct _DemoWidget
 
   gboolean track;
   gboolean show_bounding_box;
+  gboolean show_points;
   GtkWidget *label;
 
   gboolean do_stroke;
@@ -105,6 +106,56 @@ demo_widget_init (DemoWidget *self)
   gtk_widget_add_controller (GTK_WIDGET (self), controller);
 }
 
+static void
+draw_point (GtkSnapshot            *snapshot,
+            const graphene_point_t *pt)
+{
+  graphene_rect_t bounds;
+  GdkRGBA color = { 1, 0, 0, 1 };
+
+  bounds.origin.x = pt->x - 2;
+  bounds.origin.y = pt->y - 2;
+  bounds.size.width = 4;
+  bounds.size.height = 4;
+
+  gtk_snapshot_append_color (snapshot, &color, &bounds);
+}
+
+static gboolean
+point_cb (GskPathOperation        op,
+          const graphene_point_t *pts,
+          gsize                   n_ts,
+          float                   weight,
+          gpointer                user_data)
+{
+  GtkSnapshot *snapshot = user_data;
+
+  switch (op)
+    {
+    case GSK_PATH_MOVE:
+      draw_point (snapshot, &pts[0]);
+      break;
+
+    case GSK_PATH_CLOSE:
+      draw_point (snapshot, &pts[0]);
+      break;
+
+    case GSK_PATH_LINE:
+      draw_point (snapshot, &pts[1]);
+      break;
+
+    case GSK_PATH_CURVE:
+      draw_point (snapshot, &pts[3]);
+      break;
+
+    case GSK_PATH_CONIC:
+    default:
+      g_assert_not_reached ();
+    }
+
+  return TRUE;
+}
+
 static void
 demo_widget_snapshot (GtkWidget   *widget,
                       GtkSnapshot *snapshot)
@@ -200,6 +251,11 @@ demo_widget_snapshot (GtkWidget   *widget,
       gtk_snapshot_pop (snapshot);
     }
 
+  if (self->show_points)
+    {
+      gsk_path_foreach (self->path, GSK_PATH_FOREACH_ALLOW_CURVE, point_cb, snapshot);
+    }
+
   if (self->show_bounding_box)
     {
       if (gsk_path_get_bounds (self->do_stroke ? self->outline_path : self->path, &bounds))
@@ -499,6 +555,14 @@ zoom_changed (GtkRange   *range,
   gtk_widget_queue_resize (GTK_WIDGET (self));
 }
 
+static void
+points_toggled (GtkCheckButton *button,
+                DemoWidget      *self)
+{
+  self->show_points = gtk_check_button_get_active (button);
+  gtk_widget_queue_draw (GTK_WIDGET (self));
+}
+
 static void
 track_toggled (GtkCheckButton *button,
                DemoWidget      *self)
@@ -775,6 +839,10 @@ main (int argc, char *argv[])
   g_signal_connect (spin, "value-changed", G_CALLBACK (dash_offset_changed), demo);
   gtk_grid_attach (GTK_GRID (grid), spin, 1, row++, 1, 1);
 
+  toggle = gtk_check_button_new_with_label ("Show points");
+  g_signal_connect (toggle, "toggled", G_CALLBACK (points_toggled), demo);
+  gtk_grid_attach (GTK_GRID (grid), toggle, 1, row++, 1, 1);
+
   toggle = gtk_check_button_new_with_label ("Show closest point");
   g_signal_connect (toggle, "toggled", G_CALLBACK (track_toggled), demo);
   gtk_grid_attach (GTK_GRID (grid), toggle, 1, row++, 1, 1);