diff --git a/fonts.js b/fonts.js
index 7cd27f8b0..60ad67a52 100644
--- a/fonts.js
+++ b/fonts.js
@@ -2571,9 +2571,9 @@ var Type2CFF = (function() {
       if (pos == 0) {
         return ISOAdobeCharset;
       } else if (pos == 1) {
-        return CFFExpertCharset;
+        return ExpertCharset;
       } else if (pos == 2) {
-        return CFFExpertSubsetCharset;
+        return ExpertSubsetCharset;
       }
 
       var bytes = this.bytes;
diff --git a/test/test_slave.html b/test/test_slave.html
index 91b8a6850..b46e29d6b 100644
--- a/test/test_slave.html
+++ b/test/test_slave.html
@@ -7,6 +7,7 @@
   <script type="text/javascript" src="/crypto.js"></script>
   <script type="text/javascript" src="/glyphlist.js"></script>
   <script type="text/javascript" src="/metrics.js"></script>
+  <script type="text/javascript" src="/charsets.js"></script>
   <script type="text/javascript" src="driver.js"></script>
 </head>