diff --git a/.babelrc b/.babelrc
index e4491c2..48f1c3a 100644
--- a/.babelrc
+++ b/.babelrc
@@ -1,20 +1,3 @@
 {
-	"whitelist": [
-		"es6.arrowFunctions",
-		"es6.blockScoping",
-		"es6.classes",
-		"es6.constants",
-		"es6.destructuring",
-		"es6.modules",
-		"es6.parameters",
-		"es6.properties.shorthand",
-		"es6.spread",
-		"es6.templateLiterals"
-	],
-	"loose": [
-		"es6.classes",
-		"es6.destructuring"
-	],
-	"compact": false,
-	"sourceMap": true
+	"presets": [ "es2015-rollup" ]
 }
diff --git a/package.json b/package.json
index db12e6c..50f8f5b 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,10 @@
   "homepage": "https://github.com/rollup/rollup",
   "devDependencies": {
     "acorn": "^2.6.4",
-    "babel-core": "^5.8.32",
+    "babel-core": "^6.3.26",
+    "babel-preset-es2015": "^6.3.13",
+    "babel-preset-es2015-rollup": "^1.0.0",
+    "babel-runtime": "^6.3.19",
     "codecov.io": "^0.1.6",
     "console-group": "^0.1.2",
     "es6-promise": "^3.0.2",
@@ -50,9 +53,9 @@
     "istanbul": "^0.4.0",
     "magic-string": "^0.10.0",
     "mocha": "^2.3.3",
-    "remap-istanbul": "^0.4.0",
-    "rollup": "^0.20.2",
-    "rollup-plugin-babel": "^1.0.0",
+    "remap-istanbul": "^0.5.1",
+    "rollup": "^0.22.0",
+    "rollup-plugin-babel": "^2.2.0",
     "rollup-plugin-npm": "^1.0.0",
     "rollup-plugin-replace": "^1.0.1",
     "sander": "^0.4.0",
@@ -62,7 +65,7 @@
   "dependencies": {
     "chalk": "^1.1.1",
     "minimist": "^1.2.0",
-    "source-map-support": "^0.3.2"
+    "source-map-support": "^0.4.0"
   },
   "files": [
     "src",
diff --git a/test/sourcemaps/transforms/_config.js b/test/sourcemaps/transforms/_config.js
index b76a885..764f4c3 100644
--- a/test/sourcemaps/transforms/_config.js
+++ b/test/sourcemaps/transforms/_config.js
@@ -11,7 +11,7 @@ module.exports = {
 			{
 				transform: function ( source, id ) {
 					return babel.transform( source, {
-						blacklist: [ 'es6.modules' ],
+						presets: [ 'es2015-rollup' ],
 						sourceMap: true
 					});
 				}
diff --git a/test/test.js b/test/test.js
index b726ec5..5a0b4d4 100644
--- a/test/test.js
+++ b/test/test.js
@@ -169,8 +169,7 @@ describe( 'rollup', function () {
 
 						if ( config.babel ) {
 							code = babel.transform( result.code, {
-								blacklist: [ 'es6.modules' ],
-								loose: [ 'es6.classes' ]
+								presets: [ 'es2015' ]
 							}).code;
 						} else {
 							code = result.code;
@@ -350,8 +349,7 @@ describe( 'rollup', function () {
 							try {
 								if ( config.babel ) {
 									code = babel.transform( code, {
-										blacklist: [ 'es6.modules' ],
-										loose: [ 'es6.classes' ]
+										presets: [ 'es2015' ]
 									}).code;
 								}