diff --git a/src/hb-subset-cff-common.hh b/src/hb-subset-cff-common.hh
index 55b33b1bb..d5f7ec108 100644
--- a/src/hb-subset-cff-common.hh
+++ b/src/hb-subset-cff-common.hh
@@ -258,7 +258,7 @@ struct CFFPrivateDict_OpSerializer : OpSerializer
       if (desubroutinize || (subrsOffset == 0))
         return_trace (true);
       else
-        return_trace (FontDict::serialize_offset4_op (c, opstr.op, subrsOffset));
+        return_trace (FontDict::serialize_offset2_op (c, opstr.op, subrsOffset));
     }
     else
       return_trace (copy_opstr (c, opstr));
@@ -274,7 +274,7 @@ struct CFFPrivateDict_OpSerializer : OpSerializer
       if (desubroutinize || !has_localsubr)
         return 0;
       else
-        return OpCode_Size (OpCode_longintdict) + 4 + OpCode_Size (opstr.op);
+        return OpCode_Size (OpCode_shortint) + 2 + OpCode_Size (opstr.op);
     }
     else
       return opstr.str.len;
diff --git a/test/api/fonts/AdobeVFPrototype.abc.otf b/test/api/fonts/AdobeVFPrototype.abc.otf
index e21d87f7d..cc477088e 100644
Binary files a/test/api/fonts/AdobeVFPrototype.abc.otf and b/test/api/fonts/AdobeVFPrototype.abc.otf differ
diff --git a/test/api/fonts/AdobeVFPrototype.ac.nohints.otf b/test/api/fonts/AdobeVFPrototype.ac.nohints.otf
index c0d034ad0..935bdbfb1 100644
Binary files a/test/api/fonts/AdobeVFPrototype.ac.nohints.otf and b/test/api/fonts/AdobeVFPrototype.ac.nohints.otf differ
diff --git a/test/api/fonts/AdobeVFPrototype.ac.otf b/test/api/fonts/AdobeVFPrototype.ac.otf
index c5080fcb3..beab7d585 100644
Binary files a/test/api/fonts/AdobeVFPrototype.ac.otf and b/test/api/fonts/AdobeVFPrototype.ac.otf differ
diff --git a/test/api/fonts/SourceHanSans-Regular.41,4C2E.nohints.otf b/test/api/fonts/SourceHanSans-Regular.41,4C2E.nohints.otf
index e0548264f..ec39590a0 100644
Binary files a/test/api/fonts/SourceHanSans-Regular.41,4C2E.nohints.otf and b/test/api/fonts/SourceHanSans-Regular.41,4C2E.nohints.otf differ
diff --git a/test/api/fonts/SourceHanSans-Regular.41,4C2E.otf b/test/api/fonts/SourceHanSans-Regular.41,4C2E.otf
index 7b88702f7..2c6cd9aae 100644
Binary files a/test/api/fonts/SourceHanSans-Regular.41,4C2E.otf and b/test/api/fonts/SourceHanSans-Regular.41,4C2E.otf differ
diff --git a/test/api/fonts/SourceSansPro-Regular.abc.otf b/test/api/fonts/SourceSansPro-Regular.abc.otf
index 4db5c796b..7f51bd384 100644
Binary files a/test/api/fonts/SourceSansPro-Regular.abc.otf and b/test/api/fonts/SourceSansPro-Regular.abc.otf differ
diff --git a/test/api/fonts/SourceSansPro-Regular.ac.nohints.otf b/test/api/fonts/SourceSansPro-Regular.ac.nohints.otf
index 3ad2bb4b0..14a3a5fef 100644
Binary files a/test/api/fonts/SourceSansPro-Regular.ac.nohints.otf and b/test/api/fonts/SourceSansPro-Regular.ac.nohints.otf differ
diff --git a/test/api/fonts/SourceSansPro-Regular.ac.otf b/test/api/fonts/SourceSansPro-Regular.ac.otf
index a22b1571b..12d6d0fd8 100644
Binary files a/test/api/fonts/SourceSansPro-Regular.ac.otf and b/test/api/fonts/SourceSansPro-Regular.ac.otf differ
diff --git a/test/api/fonts/cff1_seac.C0.otf b/test/api/fonts/cff1_seac.C0.otf
index 0b695135f..aed2fdd38 100644
Binary files a/test/api/fonts/cff1_seac.C0.otf and b/test/api/fonts/cff1_seac.C0.otf differ