diff --git a/src/cairo-gstate.c b/src/cairo-gstate.c
index 8a253468d..e9019e8e6 100644
--- a/src/cairo-gstate.c
+++ b/src/cairo-gstate.c
@@ -193,6 +193,7 @@ void
 _cairo_gstate_fini (cairo_gstate_t *gstate)
 {
     _cairo_stroke_style_fini (&gstate->stroke_style);
+    _cairo_font_options_fini (&gstate->font_options);
 
     cairo_font_face_destroy (gstate->font_face);
     gstate->font_face = NULL;
diff --git a/test/leaks.c b/test/leaks.c
new file mode 100644
index 000000000..612d4a1e6
--- /dev/null
+++ b/test/leaks.c
@@ -0,0 +1,61 @@
+/*
+ * Copyright © 2023 Uli Schlachter
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy,
+ * modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Author: Uli Schlachter <psychon@znc.in>
+ */
+
+#include "cairo-test.h"
+
+
+// Once upon a time, _cairo_gstate_fini leaked font options
+static cairo_test_status_t
+leaks_set_scaled_font (cairo_t *cr, int width, int height)
+{
+    cairo_font_options_t *opt;
+    cairo_matrix_t matrix;
+    cairo_scaled_font_t *font;
+
+    cairo_matrix_init_identity (&matrix);
+
+    opt = cairo_font_options_create ();
+    cairo_font_options_set_custom_palette_color (opt, 0, 1, 1, 1, 1);
+
+    font = cairo_scaled_font_create (cairo_get_font_face (cr), &matrix, &matrix, opt);
+
+    cairo_set_scaled_font (cr, font);
+
+    cairo_font_options_destroy (opt);
+    cairo_scaled_font_destroy (font);
+
+    // Fill the output so that the same ref image works for everying
+    cairo_paint (cr);
+
+    return CAIRO_TEST_SUCCESS;
+}
+
+CAIRO_TEST (leaks_set_scaled_font,
+	    "Regression test for font options memory leak in cairo_set_scaled_font",
+	    "leak", /* keywords */
+	    NULL, /* requirements */
+	    1, 1,
+	    NULL, leaks_set_scaled_font)
diff --git a/test/meson.build b/test/meson.build
index 1d76d5daa..70f517f3c 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -190,6 +190,7 @@ test_sources = [
   'large-source.c',
   'large-source-roi.c',
   'large-twin-antialias-mixed.c',
+  'leaks.c',
   'leaky-dash.c',
   'leaky-dashed-rectangle.c',
   'leaky-dashed-stroke.c',
diff --git a/test/reference/leaks-set-scaled-font.ref.png b/test/reference/leaks-set-scaled-font.ref.png
new file mode 100644
index 000000000..7d5589c1d
Binary files /dev/null and b/test/reference/leaks-set-scaled-font.ref.png differ