diff --git a/src/hb-ot-layout-gdef-table.hh b/src/hb-ot-layout-gdef-table.hh
index 41c5a1e1a..aea644f3e 100644
--- a/src/hb-ot-layout-gdef-table.hh
+++ b/src/hb-ot-layout-gdef-table.hh
@@ -84,7 +84,7 @@ struct AttachList
   bool subset (hb_subset_context_t *c) const
   {
     TRACE_SUBSET (this);
-    const hb_set_t &glyphset = *c->plan->glyphset ();
+    const hb_set_t &glyphset = *c->plan->glyphset_gsub ();
     const hb_map_t &glyph_map = *c->plan->glyph_map;
 
     auto *out = c->serializer->start_embed (*this);
@@ -371,7 +371,7 @@ struct LigCaretList
   bool subset (hb_subset_context_t *c) const
   {
     TRACE_SUBSET (this);
-    const hb_set_t &glyphset = *c->plan->glyphset ();
+    const hb_set_t &glyphset = *c->plan->glyphset_gsub ();
     const hb_map_t &glyph_map = *c->plan->glyph_map;
 
     auto *out = c->serializer->start_embed (*this);
diff --git a/test/subset/data/Makefile.am b/test/subset/data/Makefile.am
index 33ffb9eda..15061ef1c 100644
--- a/test/subset/data/Makefile.am
+++ b/test/subset/data/Makefile.am
@@ -30,6 +30,7 @@ EXTRA_DIST += \
 	expected/layout.gsub8 \
 	expected/layout.khmer \
 	expected/layout.gdef \
+	expected/layout.gdef.glyphset \
 	expected/layout.context \
 	expected/layout.gdef-varstore \
 	expected/layout.gdef-attachlist \
diff --git a/test/subset/data/Makefile.sources b/test/subset/data/Makefile.sources
index 34f2f0708..dedcef03a 100644
--- a/test/subset/data/Makefile.sources
+++ b/test/subset/data/Makefile.sources
@@ -16,6 +16,7 @@ TESTS = \
 	tests/layout.gdef-attachlist.tests \
 	tests/layout.gdef-varstore.tests \
 	tests/layout.gdef.tests \
+	tests/layout.gdef.glyphset.tests \
 	tests/layout.gpos.tests \
 	tests/layout.gpos2.tests \
 	tests/layout.gpos3.tests \
diff --git a/test/subset/data/expected/layout.gdef.glyphset/IndicTestHowrah-Regular.default.9dd.ttf b/test/subset/data/expected/layout.gdef.glyphset/IndicTestHowrah-Regular.default.9dd.ttf
new file mode 100644
index 000000000..3110b2e70
Binary files /dev/null and b/test/subset/data/expected/layout.gdef.glyphset/IndicTestHowrah-Regular.default.9dd.ttf differ
diff --git a/test/subset/data/expected/layout.gdef.glyphset/IndicTestHowrah-Regular.default.retain-all-codepoint.ttf b/test/subset/data/expected/layout.gdef.glyphset/IndicTestHowrah-Regular.default.retain-all-codepoint.ttf
new file mode 100644
index 000000000..19d86e66d
Binary files /dev/null and b/test/subset/data/expected/layout.gdef.glyphset/IndicTestHowrah-Regular.default.retain-all-codepoint.ttf differ
diff --git a/test/subset/data/expected/layout.gdef.glyphset/IndicTestHowrah-Regular.drop-hints.9dd.ttf b/test/subset/data/expected/layout.gdef.glyphset/IndicTestHowrah-Regular.drop-hints.9dd.ttf
new file mode 100644
index 000000000..731dae696
Binary files /dev/null and b/test/subset/data/expected/layout.gdef.glyphset/IndicTestHowrah-Regular.drop-hints.9dd.ttf differ
diff --git a/test/subset/data/expected/layout.gdef.glyphset/IndicTestHowrah-Regular.drop-hints.retain-all-codepoint.ttf b/test/subset/data/expected/layout.gdef.glyphset/IndicTestHowrah-Regular.drop-hints.retain-all-codepoint.ttf
new file mode 100644
index 000000000..59ccc8559
Binary files /dev/null and b/test/subset/data/expected/layout.gdef.glyphset/IndicTestHowrah-Regular.drop-hints.retain-all-codepoint.ttf differ
diff --git a/test/subset/data/expected/layout.gdef.glyphset/IndicTestHowrah-Regular.retain-gids.9dd.ttf b/test/subset/data/expected/layout.gdef.glyphset/IndicTestHowrah-Regular.retain-gids.9dd.ttf
new file mode 100644
index 000000000..16355fe25
Binary files /dev/null and b/test/subset/data/expected/layout.gdef.glyphset/IndicTestHowrah-Regular.retain-gids.9dd.ttf differ
diff --git a/test/subset/data/expected/layout.gdef.glyphset/IndicTestHowrah-Regular.retain-gids.retain-all-codepoint.ttf b/test/subset/data/expected/layout.gdef.glyphset/IndicTestHowrah-Regular.retain-gids.retain-all-codepoint.ttf
new file mode 100644
index 000000000..58312ad77
Binary files /dev/null and b/test/subset/data/expected/layout.gdef.glyphset/IndicTestHowrah-Regular.retain-gids.retain-all-codepoint.ttf differ
diff --git a/test/subset/data/fonts/IndicTestHowrah-Regular.ttf b/test/subset/data/fonts/IndicTestHowrah-Regular.ttf
new file mode 100644
index 000000000..f761b7fb6
Binary files /dev/null and b/test/subset/data/fonts/IndicTestHowrah-Regular.ttf differ
diff --git a/test/subset/data/tests/layout.gdef.glyphset.tests b/test/subset/data/tests/layout.gdef.glyphset.tests
new file mode 100644
index 000000000..b5591efbb
--- /dev/null
+++ b/test/subset/data/tests/layout.gdef.glyphset.tests
@@ -0,0 +1,11 @@
+FONTS:
+IndicTestHowrah-Regular.ttf
+
+PROFILES:
+default.txt
+drop-hints.txt
+retain-gids.txt
+
+SUBSETS:
+U+9dd
+*
diff --git a/test/subset/meson.build b/test/subset/meson.build
index a287136a9..8f7ed8158 100644
--- a/test/subset/meson.build
+++ b/test/subset/meson.build
@@ -21,6 +21,7 @@ tests = [
   'layout.gsub6',
   'layout.gsub8',
   'layout.gdef',
+  'layout.gdef.glyphset',
   'layout.khmer',
   'layout.context',
   'layout.gdef-varstore',