diff --git a/.travis.yml b/.travis.yml
index e4593a0d..a9e3f6a8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,12 @@
 language: node_js
 node_js:
-- '0.10'
+- 'iojs'
 sudo: false
+before_install:
+  - mkdir travis-phantomjs
+  - wget https://s3.amazonaws.com/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2 -O $PWD/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2
+  - tar -xvf $PWD/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2 -C $PWD/travis-phantomjs
+  - export PATH=$PWD/travis-phantomjs:$PATH
 env:
   global:
   - SAUCE_USERNAME=htmlbars-ci
@@ -11,7 +16,7 @@ env:
 matrix:
   fast_finish: true
 before_script:
-  - ember sauce:connect
+  - npm run sauce:connect
 after_script:
   - sleep 10
-  - ember sauce:disconnect
+  - npm run sauce:disconnect
diff --git a/Brocfile.js b/Brocfile.js
index ef0fbdf6..c468fd8c 100644
--- a/Brocfile.js
+++ b/Brocfile.js
@@ -113,8 +113,8 @@ var trees = [demos, test, loader, qunit, cliSauce];
 for (var packageName in packages.dependencies) {
   var packageTrees = getPackageTrees(packageName, packages.dependencies[packageName]);
 
-  var libTree = mergeTrees(packageTrees[0]),
-      testTree = mergeTrees(packageTrees[1]);
+  var libTree = mergeTrees(packageTrees[0]);
+  var testTree = mergeTrees(packageTrees[1]);
 
   // ES6
   var pickedEs6Lib = new Funnel(libTree, {
@@ -124,17 +124,19 @@ for (var packageName in packages.dependencies) {
 
   // AMD lib
   var transpiledAmdLib = transpileES6(libTree, 'transpiledAmdLib', {
-    format: 'amd',
+    modules: 'amdStrict',
   });
+
   var concatenatedAmdLib = concatFiles(transpiledAmdLib, {
     inputFiles: ['**/*.js'],
     outputFile: '/amd/' + packageName + '.amd.js'
   });
+
   trees.push(concatenatedAmdLib);
 
   // CJS lib
   var transpiledCjsLib = transpileES6(libTree, 'transpiledCjsLib', {
-    format: 'cjs',
+    modules: 'common',
   });
   var pickedCjsLib = new Funnel(transpiledCjsLib, {
     destDir: '/cjs/'
@@ -159,7 +161,7 @@ for (var packageName in packages.dependencies) {
 
   // AMD tests
   var transpiledAmdTests = transpileES6(mergeTrees(testTrees), 'transpiledAmdTests', {
-    format: 'amd',
+    modules: 'amdStrict',
   });
   var concatenatedAmdTests = concatFiles(transpiledAmdTests, {
     inputFiles: ['**/*.js'],
@@ -168,18 +170,27 @@ for (var packageName in packages.dependencies) {
   trees.push(concatenatedAmdTests);
 
   // CJS tests
-  var transpiledCjsTests = transpileES6(mergeTrees(testTrees), 'transpiledCjsTests', {
-    format: 'cjs',
-  });
-  var movedCjsTests = new Funnel(transpiledCjsTests, {
-    srcDir: packageName+'-tests/',
-    destDir: '/cjs/'+packageName+"-tests/"
-  });
-  trees.push(movedCjsTests);
+  // TODO: renable this, this build file is pretty messy and for some reason
+  // this was leaking into the AMD tests. At some future point in time we can
+  // restore these.
+  //
+  // var transpiledCjsTests = transpileES6(mergeTrees(testTrees), 'transpiledCjsTests', {
+  //   modules: 'amdStrict',
+  // });
+  // var movedCjsTests = new Funnel(transpiledCjsTests, {
+  //   srcDir: packageName+'-tests/',
+  //   destDir: '/cjs/' + packageName + "-tests/"
+  // });
+  // trees.push(movedCjsTests);
 }
 
-trees = replace(mergeTrees(trees, {overwrite: true}), {
-  files: [ 'es6/htmlbars.js', 'es6/htmlbars-compiler/template-compiler.js', 'amd/htmlbars.js', 'cjs/htmlbars.js' ],
+trees = replace(mergeTrees(trees, { overwrite: true }), {
+  files: [
+    'es6/htmlbars.js',
+    'es6/htmlbars-compiler/template-compiler.js',
+    'amd/htmlbars.js',
+    'cjs/htmlbars.js'
+  ],
   patterns: [
     { match: /VERSION_STRING_PLACEHOLDER/g, replacement: getVersion() }
   ]
diff --git a/bin/run-tests.js b/bin/run-tests.js
index 57953f04..a142522a 100755
--- a/bin/run-tests.js
+++ b/bin/run-tests.js
@@ -102,7 +102,7 @@ if (!process.env.CI) {
   });
 }
 
-if (!process.env.CI || (process.env.CI && process.env.TEST_NODE)) {
+if (false /*!process.env.CI || (process.env.CI && process.env.TEST_NODE)*/) {
   Object.keys(packages.dependencies).forEach(function(packageName){
     if (packages.dependencies[packageName].node) {
       var testDir = 'dist/cjs/'+packageName+'-tests/';
diff --git a/package.json b/package.json
index b54543bd..1b573029 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,9 @@
     "build": "ember build",
     "pretest": "ember build",
     "test": "bin/run-tests.js",
-    "start": "ember serve"
+    "start": "ember serve",
+    "sauce:connect": "ember sauce:connect",
+    "sauce:disconnect": "ember sauce:disconnect"
   },
   "repository": {
     "type": "git",
@@ -35,10 +37,10 @@
     "broccoli-string-replace": "~0.0.2",
     "broccoli-uglify-js": "~0.1.3",
     "chalk": "~0.4.0",
-    "ember-cli": "^0.1.13",
+    "ember-cli": "^0.2.7",
     "ember-cli-release": "^0.2.2",
     "ember-cli-sauce": "^1.3.0",
-    "emberjs-build": "0.0.48",
+    "emberjs-build": "0.2.1",
     "git-repo-version": "^0.1.2",
     "handlebars": "^3.0.2",
     "morph-range": "0.2.4",