diff --git a/.babelrc b/.babelrc
new file mode 100644
index 00000000..c13c5f62
--- /dev/null
+++ b/.babelrc
@@ -0,0 +1,3 @@
+{
+  "presets": ["es2015"]
+}
diff --git a/package.json b/package.json
index 0bcce85e..703ed7c6 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "widgetizer-widgetizer",
+  "name": "apollo-server",
   "version": "0.3.6",
   "description": "Production-ready Node.js GraphQL server for Express, HAPI, Koa",
   "main": "dist/index.js",
@@ -16,7 +16,7 @@
     "lint": "tslint ./src/**/*.ts",
     "watch": "tsc -w",
     "testonly": "mocha --harmony --harmony-destructuring --reporter spec --full-trace ./dist/test/tests.js",
-    "coverage": "istanbul cover ./node_modules/mocha/bin/_mocha -- --reporter spec --full-trace --recursive ./dist/test",
+    "coverage": "babel-node ./node_modules/istanbul/lib/cli.js cover _mocha -- --harmony --harmony-destructuring --full-trace ./dist/test/tests.js",
     "postcoverage": "remap-istanbul --input coverage/coverage.raw.json --type lcovonly --output coverage/lcov.info"
   },
   "repository": {
@@ -38,7 +38,6 @@
   },
   "homepage": "https://github.com/apollostack/apollo-proxy#readme",
   "dependencies": {
-    "es6-promise": "^3.2.1",
     "express": "^4.13.4",
     "graphql": "^0.6.0",
     "hapi": "^13.4.1",
@@ -46,9 +45,11 @@
     "source-map-support": "^0.4.0"
   },
   "devDependencies": {
+    "babel-cli": "^6.10.1",
+    "babel-core": "^6.10.4",
+    "babel-preset-es2015": "^6.9.0",
     "body-parser": "^1.15.2",
     "chai": "^3.5.0",
-    "es6-promise": "^3.2.1",
     "graphql": "^0.6.0",
     "istanbul": "1.0.0-alpha.2",
     "mocha": "^2.3.3",