diff --git a/test/shaping/data/aots/hb-aots-tester.cpp b/test/shaping/data/aots/hb-aots-tester.cpp
index 430bad3f7..72db93e72 100644
--- a/test/shaping/data/aots/hb-aots-tester.cpp
+++ b/test/shaping/data/aots/hb-aots-tester.cpp
@@ -245,7 +245,7 @@ bool cmap_test(const char *testName,
         fprintf (tests_file, "%s", buf);
     }
     free (gFeatures);
-    fprintf (tests_file, "\" --no-clusters --no-glyph-names --no-positions:");
+    fprintf (tests_file, "\" --no-clusters --no-glyph-names --no-positions --font-funcs=ot:");
 
     for (unsigned int i = 0; i < nbIn; i++)
     {
diff --git a/test/shaping/data/aots/tests/cmap0.tests b/test/shaping/data/aots/tests/cmap0.tests
index 89d2a2195..9b567bb65 100644
--- a/test/shaping/data/aots/tests/cmap0.tests
+++ b/test/shaping/data/aots/tests/cmap0.tests
@@ -1 +1 @@
-../fonts/cmap0_font1.otf:--features="test" --no-clusters --no-glyph-names --no-positions:U+0000,U+0001,U+0033,U+0034,U+0035,U+0036,U+0037,U+FFFF:[0|0|0|17|56|12|0|0]
+../fonts/cmap0_font1.otf:--features="test" --no-clusters --no-glyph-names --no-positions --font-funcs=ot:U+0000,U+0001,U+0033,U+0034,U+0035,U+0036,U+0037,U+FFFF:[0|0|0|17|56|12|0|0]
diff --git a/test/shaping/data/aots/tests/cmap10.tests b/test/shaping/data/aots/tests/cmap10.tests
index be83c27a8..ac21c9379 100644
--- a/test/shaping/data/aots/tests/cmap10.tests
+++ b/test/shaping/data/aots/tests/cmap10.tests
@@ -1,2 +1,2 @@
-../fonts/cmap10_font1.otf:--features="test" --no-clusters --no-glyph-names --no-positions:U+0000,U+0001,U+9232,U+109422,U+109423,U+109424,U+109425,U+FFFF:[0|0|0|0|26|27|32|0]
-../fonts/cmap10_font2.otf:--features="test" --no-clusters --no-glyph-names --no-positions:U+0000,U+0001,U+0021,U+0022,U+0023,U+0024,U+0025,U+FFFF:[0|0|0|0|0|0|0|0]
+../fonts/cmap10_font1.otf:--features="test" --no-clusters --no-glyph-names --no-positions --font-funcs=ot:U+0000,U+0001,U+9232,U+109422,U+109423,U+109424,U+109425,U+FFFF:[0|0|0|0|26|27|32|0]
+../fonts/cmap10_font2.otf:--features="test" --no-clusters --no-glyph-names --no-positions --font-funcs=ot:U+0000,U+0001,U+0021,U+0022,U+0023,U+0024,U+0025,U+FFFF:[0|0|0|0|0|0|0|0]
diff --git a/test/shaping/data/aots/tests/cmap12.tests b/test/shaping/data/aots/tests/cmap12.tests
index 8591976ba..1d625d9ff 100644
--- a/test/shaping/data/aots/tests/cmap12.tests
+++ b/test/shaping/data/aots/tests/cmap12.tests
@@ -1 +1 @@
-../fonts/cmap12_font1.otf:--features="test" --no-clusters --no-glyph-names --no-positions:U+0000,U+0001,U+0010,U+101723,U+101724,U+101727,U+101728,U+102522,U+102523,U+102527,U+102528,U+FFFF:[0|0|0|23|24|27|0|0|53|57|0|0]
+../fonts/cmap12_font1.otf:--features="test" --no-clusters --no-glyph-names --no-positions --font-funcs=ot:U+0000,U+0001,U+0010,U+101723,U+101724,U+101727,U+101728,U+102522,U+102523,U+102527,U+102528,U+FFFF:[0|0|0|23|24|27|0|0|53|57|0|0]
diff --git a/test/shaping/data/aots/tests/cmap2.tests b/test/shaping/data/aots/tests/cmap2.tests
index 250936d5e..e5a462dbc 100644
--- a/test/shaping/data/aots/tests/cmap2.tests
+++ b/test/shaping/data/aots/tests/cmap2.tests
@@ -1 +1 @@
-#../fonts/cmap2_font1.otf:--features="test" --no-clusters --no-glyph-names --no-positions:U+0000,U+0001,U+0033,U+0034,U+0035,U+0036,U+0037,U+8431,U+8432,U+8434,U+9232,U+FFFF:[0|0|0|17|56|12|0|0|20|22|23|0]
+#../fonts/cmap2_font1.otf:--features="test" --no-clusters --no-glyph-names --no-positions --font-funcs=ot:U+0000,U+0001,U+0033,U+0034,U+0035,U+0036,U+0037,U+8431,U+8432,U+8434,U+9232,U+FFFF:[0|0|0|17|56|12|0|0|20|22|23|0]
diff --git a/test/shaping/data/aots/tests/cmap4.tests b/test/shaping/data/aots/tests/cmap4.tests
index 5eaefdd9e..a1232ab48 100644
--- a/test/shaping/data/aots/tests/cmap4.tests
+++ b/test/shaping/data/aots/tests/cmap4.tests
@@ -1,6 +1,6 @@
-#../fonts/cmap4_font1.otf:--features="test" --no-clusters --no-glyph-names --no-positions:U+0000,U+0001,U+0010,U+0011,U+0012,U+001E,U+001F,U+00C7,U+00C8,U+00CD,U+00D2,U+00D3,U+FFFF:[0|0|0|40|41|53|0|0|256|261|266|0|0]
-../fonts/cmap4_font2.otf:--features="test" --no-clusters --no-glyph-names --no-positions:U+0000,U+0001,U+0010,U+0011,U+0012,U+001E,U+001F,U+00C7,U+00C8,U+00CD,U+00D2,U+00D3,U+FFFF:[0|0|0|0|0|0|0|0|0|0|0|0|0]
-#../fonts/cmap4_font3.otf:--features="test" --no-clusters --no-glyph-names --no-positions:U+0000,U+0001,U+0010,U+0011,U+0012,U+001E,U+001F,U+00C7,U+00C8,U+00CD,U+00D2,U+00D3,U+FFFF:[0|0|0|0|0|0|0|0|0|0|0|0|65534]
-#../fonts/cmap4_font4.otf:--features="test" --no-clusters --no-glyph-names --no-positions:U+0000,U+AFC7,U+AFC8,U+AFC9,U+B02B,U+B02C,U+B02D:[0|0|44500|44501|44599|44600|0]
-#../fonts/cmap4_font4.otf:--features="test" --no-clusters --no-glyph-names --no-positions:U+0000,U+FDE7,U+FDE8,U+FDE9,U+FE0B,U+FE0C,U+FE0D,U+FE4C,U+FE4D:[0|0|65500|65501|65535|0]
-#../fonts/cmap4_font4.otf:--features="test" --no-clusters --no-glyph-names --no-positions:U+0000,U+0063,U+0064,U+01F3,U+01F4,U+01F5,U+03E8,U+03E9:[0|0|65136|65535|0|1|500|0]
+../fonts/cmap4_font1.otf:--features="test" --no-clusters --no-glyph-names --no-positions --font-funcs=ot:U+0000,U+0001,U+0010,U+0011,U+0012,U+001E,U+001F,U+00C7,U+00C8,U+00CD,U+00D2,U+00D3,U+FFFF:[0|0|0|40|41|53|0|0|256|261|266|0|0]
+../fonts/cmap4_font2.otf:--features="test" --no-clusters --no-glyph-names --no-positions --font-funcs=ot:U+0000,U+0001,U+0010,U+0011,U+0012,U+001E,U+001F,U+00C7,U+00C8,U+00CD,U+00D2,U+00D3,U+FFFF:[0|0|0|0|0|0|0|0|0|0|0|0|0]
+../fonts/cmap4_font3.otf:--features="test" --no-clusters --no-glyph-names --no-positions --font-funcs=ot:U+0000,U+0001,U+0010,U+0011,U+0012,U+001E,U+001F,U+00C7,U+00C8,U+00CD,U+00D2,U+00D3,U+FFFF:[0|0|0|0|0|0|0|0|0|0|0|0|65534]
+../fonts/cmap4_font4.otf:--features="test" --no-clusters --no-glyph-names --no-positions --font-funcs=ot:U+0000,U+AFC7,U+AFC8,U+AFC9,U+B02B,U+B02C,U+B02D:[0|0|44500|44501|44599|44600|0]
+#../fonts/cmap4_font4.otf:--features="test" --no-clusters --no-glyph-names --no-positions --font-funcs=ot:U+0000,U+FDE7,U+FDE8,U+FDE9,U+FE0B,U+FE0C,U+FE0D,U+FE4C,U+FE4D:[0|0|65500|65501|65535|0]
+../fonts/cmap4_font4.otf:--features="test" --no-clusters --no-glyph-names --no-positions --font-funcs=ot:U+0000,U+0063,U+0064,U+01F3,U+01F4,U+01F5,U+03E8,U+03E9:[0|0|65136|65535|0|1|500|0]
diff --git a/test/shaping/data/aots/tests/cmap6.tests b/test/shaping/data/aots/tests/cmap6.tests
index cb64f55f0..69122f360 100644
--- a/test/shaping/data/aots/tests/cmap6.tests
+++ b/test/shaping/data/aots/tests/cmap6.tests
@@ -1,2 +1,2 @@
-../fonts/cmap6_font1.otf:--features="test" --no-clusters --no-glyph-names --no-positions:U+0000,U+0001,U+0021,U+0022,U+0023,U+0024,U+0025,U+FFFF:[0|0|0|17|56|12|0|0]
-../fonts/cmap6_font2.otf:--features="test" --no-clusters --no-glyph-names --no-positions:U+0000,U+0001,U+0021,U+0022,U+0023,U+0024,U+0025,U+FFFF:[0|0|0|0|0|0|0|0]
+../fonts/cmap6_font1.otf:--features="test" --no-clusters --no-glyph-names --no-positions --font-funcs=ot:U+0000,U+0001,U+0021,U+0022,U+0023,U+0024,U+0025,U+FFFF:[0|0|0|17|56|12|0|0]
+../fonts/cmap6_font2.otf:--features="test" --no-clusters --no-glyph-names --no-positions --font-funcs=ot:U+0000,U+0001,U+0021,U+0022,U+0023,U+0024,U+0025,U+FFFF:[0|0|0|0|0|0|0|0]
diff --git a/test/shaping/data/aots/tests/cmap8.tests b/test/shaping/data/aots/tests/cmap8.tests
index 128e7612e..9a65b2d63 100644
--- a/test/shaping/data/aots/tests/cmap8.tests
+++ b/test/shaping/data/aots/tests/cmap8.tests
@@ -1 +1 @@
-#../fonts/cmap8_font1.otf:--features="test" --no-clusters --no-glyph-names --no-positions:U+0000,U+0001,U+0033,U+0034,U+0035,U+0036,U+0037,U+8431,U+8432,U+8434,U+9232,U+109422,U+109423,U+109424,U+109425,U+FFFF:[0|0|0|17|56|12|0|0|20|22|23|0|26|27|32|0]
+#../fonts/cmap8_font1.otf:--features="test" --no-clusters --no-glyph-names --no-positions --font-funcs=ot:U+0000,U+0001,U+0033,U+0034,U+0035,U+0036,U+0037,U+8431,U+8432,U+8434,U+9232,U+109422,U+109423,U+109424,U+109425,U+FFFF:[0|0|0|17|56|12|0|0|20|22|23|0|26|27|32|0]