diff --git a/test/font/font_test.html b/test/font/font_test.html
index d0575fffa..ba53249b6 100644
--- a/test/font/font_test.html
+++ b/test/font/font_test.html
@@ -24,7 +24,6 @@
   <script src="../../src/core/annotation.js"></script>
   <script src="../../src/core/function.js"></script>
   <script src="../../src/core/charsets.js"></script>
-  <script src="../../src/core/cidmaps.js"></script>
   <script src="../../src/core/colorspace.js"></script>
   <script src="../../src/core/crypto.js"></script>
   <script src="../../src/core/pattern.js"></script>
diff --git a/test/unit/cmap_spec.js b/test/unit/cmap_spec.js
index e3c2a0bfa..e7ad60acc 100644
--- a/test/unit/cmap_spec.js
+++ b/test/unit/cmap_spec.js
@@ -4,6 +4,9 @@
 
 'use strict';
 
+var cMapUrl = '../../external/bcmaps/';
+var cMapPacked = true;
+
 describe('cmap', function() {
   it('parses beginbfchar', function() {
     var str = '2 beginbfchar\n' +
@@ -87,8 +90,10 @@ describe('cmap', function() {
   it('read usecmap', function() {
     var str = '/Adobe-Japan1-1 usecmap\n';
     var stream = new StringStream(str);
-    var cmap = CMapFactory.create(stream, null, '../../external/cmaps/');
-    expect(cmap.useCMap).toBeDefined();
+    var cmap = CMapFactory.create(stream,
+                                  { url: cMapUrl, packed: cMapPacked }, null);
+    expect(cmap.useCMap).not.toBeNull();
+    expect(cmap.builtInCMap).toBeUndefined();
   });
   it('parses wmode', function() {
     var str = '/WMode 1 def\n';
@@ -97,8 +102,10 @@ describe('cmap', function() {
     expect(cmap.vertical).toEqual(true);
   });
   it('loads built in cmap', function() {
-    CMapFactory.create(new Name('Adobe-Japan1-1'), '../../external/cmaps/',
-                       null);
+    var cmap = CMapFactory.create(new Name('Adobe-Japan1-1'),
+                                  { url: cMapUrl, packed: cMapPacked }, null);
+    expect(cmap.useCMap).toBeNull();
+    expect(cmap.builtInCMap).toBeTruthy();
   });
 });
 
diff --git a/test/unit/unit_test.html b/test/unit/unit_test.html
index 0b04ff704..94d27eb90 100644
--- a/test/unit/unit_test.html
+++ b/test/unit/unit_test.html
@@ -23,7 +23,6 @@
   <script src="../../src/core/annotation.js"></script>
   <script src="../../src/core/function.js"></script>
   <script src="../../src/core/charsets.js"></script>
-  <script src="../../src/core/cidmaps.js"></script>
   <script src="../../src/core/colorspace.js"></script>
   <script src="../../src/core/crypto.js"></script>
   <script src="../../src/core/pattern.js"></script>