diff --git a/test/api/fonts/SourceHanSans-Regular.41,3041,4C2E.otf b/test/api/fonts/SourceHanSans-Regular.41,3041,4C2E.otf
new file mode 100644
index 000000000..08bc0e03a
Binary files /dev/null and b/test/api/fonts/SourceHanSans-Regular.41,3041,4C2E.otf differ
diff --git a/test/api/fonts/SourceHanSans-Regular.41,3041,4E9D.otf b/test/api/fonts/SourceHanSans-Regular.41,3041,4E9D.otf
deleted file mode 100644
index f433cedab..000000000
Binary files a/test/api/fonts/SourceHanSans-Regular.41,3041,4E9D.otf and /dev/null differ
diff --git a/test/api/fonts/SourceHanSans-Regular.41,4C2E.otf b/test/api/fonts/SourceHanSans-Regular.41,4C2E.otf
new file mode 100644
index 000000000..113c1d713
Binary files /dev/null and b/test/api/fonts/SourceHanSans-Regular.41,4C2E.otf differ
diff --git a/test/api/fonts/SourceHanSans-Regular.41,4E9D.otf b/test/api/fonts/SourceHanSans-Regular.41,4E9D.otf
deleted file mode 100644
index 3fe907ea0..000000000
Binary files a/test/api/fonts/SourceHanSans-Regular.41,4E9D.otf and /dev/null differ
diff --git a/test/api/test-ot-extents-cff.c b/test/api/test-ot-extents-cff.c
index 909946586..66461eab2 100644
--- a/test/api/test-ot-extents-cff.c
+++ b/test/api/test-ot-extents-cff.c
@@ -49,6 +49,21 @@ test_extents_cff1 (void)
   g_assert_cmpint (extents.width, ==, 381);
   g_assert_cmpint (extents.height, ==, -510);
 
+  hb_face_t *face_j = hb_subset_test_open_font ("fonts/SourceHanSans-Regular.41,3041,4C2E.otf");
+  g_assert (face_j);
+  hb_font_t *font_j = hb_font_create (face_j);
+  hb_face_destroy (face_j);
+  g_assert (font_j);
+  hb_ot_font_set_funcs (font_j);
+
+  hb_bool_t result_j = hb_font_get_glyph_extents (font_j, 3, &extents);
+  g_assert (result_j);
+
+  g_assert_cmpint (extents.x_bearing, ==, 34);
+  g_assert_cmpint (extents.y_bearing, ==, 840);
+  g_assert_cmpint (extents.width, ==, 920);
+  g_assert_cmpint (extents.height, ==, -907);
+
   hb_font_destroy (font);
 }
 
diff --git a/test/api/test-subset-cff1.c b/test/api/test-subset-cff1.c
index ae32c435d..4d9190ff9 100644
--- a/test/api/test-subset-cff1.c
+++ b/test/api/test-subset-cff1.c
@@ -94,21 +94,21 @@ test_subset_cff1_strip_hints (void)
 static void
 test_subset_cff1_j (void)
 {
-  hb_face_t *face_41_3041_4e9d = hb_subset_test_open_font ("fonts/SourceHanSans-Regular.41,3041,4E9D.otf");
-  hb_face_t *face_41_4e9d = hb_subset_test_open_font ("fonts/SourceHanSans-Regular.41,4E9D.otf");
+  hb_face_t *face_41_3041_4c2e = hb_subset_test_open_font ("fonts/SourceHanSans-Regular.41,3041,4C2E.otf");
+  hb_face_t *face_41_4c2e = hb_subset_test_open_font ("fonts/SourceHanSans-Regular.41,4C2E.otf");
 
   hb_set_t *codepoints = hb_set_create ();
-  hb_face_t *face_41_3041_4e9d_subset;
+  hb_face_t *face_41_3041_4c2e_subset;
   hb_set_add (codepoints, 0x41);
-  hb_set_add (codepoints, 0x4E9D);
-  face_41_3041_4e9d_subset = hb_subset_test_create_subset (face_41_3041_4e9d, hb_subset_test_create_input (codepoints));
+  hb_set_add (codepoints, 0x4C2E);
+  face_41_3041_4c2e_subset = hb_subset_test_create_subset (face_41_3041_4c2e, hb_subset_test_create_input (codepoints));
   hb_set_destroy (codepoints);
 
-  hb_subset_test_check (face_41_4e9d, face_41_3041_4e9d_subset, HB_TAG ('C','F','F',' '));
+  hb_subset_test_check (face_41_4c2e, face_41_3041_4c2e_subset, HB_TAG ('C','F','F',' '));
 
-  hb_face_destroy (face_41_3041_4e9d_subset);
-  hb_face_destroy (face_41_3041_4e9d);
-  hb_face_destroy (face_41_4e9d);
+  hb_face_destroy (face_41_3041_4c2e_subset);
+  hb_face_destroy (face_41_3041_4c2e);
+  hb_face_destroy (face_41_4c2e);
 }
 
 int