diff --git a/docs/dgeni-package/index.js b/docs/dgeni-package/index.js
index 7f140f9332..27acfdefcd 100644
--- a/docs/dgeni-package/index.js
+++ b/docs/dgeni-package/index.js
@@ -1,3 +1,5 @@
+require('../../tools/transpiler/index.js').init();
+
 var Package = require('dgeni').Package;
 var jsdocPackage = require('dgeni-packages/jsdoc');
 var nunjucksPackage = require('dgeni-packages/nunjucks');
diff --git a/docs/dgeni-package/services/TraceurParser.js b/docs/dgeni-package/services/TraceurParser.js
index 64b9394959..76b2068858 100644
--- a/docs/dgeni-package/services/TraceurParser.js
+++ b/docs/dgeni-package/services/TraceurParser.js
@@ -1,5 +1,3 @@
-var traceur = require('traceur/src/node/traceur.js');
-
 module.exports = function TraceurParser() {
-  return System.get(System.map.traceur + '/src/syntax/Parser.js').Parser;
+  return System.get('transpiler/src/parser').Parser;
 };
\ No newline at end of file
diff --git a/docs/dgeni-package/services/atParser.spec.js b/docs/dgeni-package/services/atParser.spec.js
index 7c4e1ad265..06533341af 100644
--- a/docs/dgeni-package/services/atParser.spec.js
+++ b/docs/dgeni-package/services/atParser.spec.js
@@ -19,8 +19,8 @@ describe('atParser service', function() {
     'export class Inject {\n' +
       'token;\n' +
       '@CONST()\n' +
-      'constructor(token) {\n' +
-        'this.token = token;\n' +
+      'constructor({a,b}:{a:string, b:string}) {\n' +
+        'this.token = a;\n' +
       '}\n' +
     '}';
 
@@ -54,7 +54,7 @@ describe('atParser service', function() {
       relativePath: 'di/src/annotations.js'
     });
 
-    expect(result.moduleTree.moduleName).toEqual('di/annotations');
+    expect(result.moduleTree.moduleName).toEqual('di/src/annotations');
     expect(result.moduleTree.scriptItemList[0].type).toEqual('IMPORT_DECLARATION');
 
     expect(result.moduleTree.scriptItemList[1].type).toEqual('EXPORT_DECLARATION');
diff --git a/docs/dgeni-package/services/traceurOptions.js b/docs/dgeni-package/services/traceurOptions.js
index 6991a7e96b..681038c5e9 100644
--- a/docs/dgeni-package/services/traceurOptions.js
+++ b/docs/dgeni-package/services/traceurOptions.js
@@ -1,5 +1,3 @@
-var traceur = require('traceur/src/node/traceur.js');
-
 module.exports = function traceurOptions() {
-  return traceur.options;
+  return System.get(System.map.traceur + '/src/Options.js').options;
 };
\ No newline at end of file
diff --git a/scripts/ci/build_js.sh b/scripts/ci/build_js.sh
index d64280c6e3..5198cc870d 100755
--- a/scripts/ci/build_js.sh
+++ b/scripts/ci/build_js.sh
@@ -8,4 +8,4 @@ SCRIPT_DIR=$(dirname $0)
 source $SCRIPT_DIR/env_dart.sh
 cd $SCRIPT_DIR/../..
 
-./node_modules/.bin/gulp build.js
+./node_modules/.bin/gulp build.js docs
diff --git a/scripts/ci/test_unit_js.sh b/scripts/ci/test_unit_js.sh
index 13c245f3cb..863e8c0423 100755
--- a/scripts/ci/test_unit_js.sh
+++ b/scripts/ci/test_unit_js.sh
@@ -8,4 +8,5 @@ source $SCRIPT_DIR/env_dart.sh
 cd $SCRIPT_DIR/../..
 
 ./node_modules/.bin/gulp test.transpiler.unittest
+./node_modules/.bin/gulp docs/test
 ./node_modules/.bin/gulp test.unit.js/ci --browsers=$KARMA_BROWSERS
diff --git a/tools/transpiler/index.js b/tools/transpiler/index.js
index 59dde3981c..f3471ee8af 100644
--- a/tools/transpiler/index.js
+++ b/tools/transpiler/index.js
@@ -64,6 +64,13 @@ exports.compile = function compile(options, paths, source) {
   return result;
 };
 
+exports.init = function() {
+  if (needsReload) {
+    reloadCompiler();
+    needsReload = false;
+  }
+}
+
 // Transpile and evaluate the code in `src`.
 // Use existing traceur to compile our sources.
 function reloadCompiler() {