diff --git a/src/babel/helpers/parse.js b/src/babel/helpers/parse.js
index e30c77aa94..c3c641316d 100644
--- a/src/babel/helpers/parse.js
+++ b/src/babel/helpers/parse.js
@@ -2,7 +2,7 @@ import normalizeAst from "./normalize-ast";
 import estraverse from "estraverse";
 import * as acorn from "../../acorn";
 
-export default function (opts, code, callback) {
+export default function (code, opts = {}) {
   var comments = [];
   var tokens   = [];
 
diff --git a/src/babel/transformation/file/index.js b/src/babel/transformation/file/index.js
index 53b1280e53..f0b8861ad8 100644
--- a/src/babel/transformation/file/index.js
+++ b/src/babel/transformation/file/index.js
@@ -435,7 +435,7 @@ export default class File {
     parseOpts.sourceType = "module";
 
     this.log.debug("Parse start");
-    var tree = parse(parseOpts, code);
+    var tree = parse(code, parseOpts);
     this.log.debug("Parse stop");
     return tree;
   }
diff --git a/src/babel/util.js b/src/babel/util.js
index 8304d6e17c..61632746a5 100644
--- a/src/babel/util.js
+++ b/src/babel/util.js
@@ -155,7 +155,7 @@ export function template(name: string, nodes?: Array<Object>, keepExpression?: b
 }
 
 export function parseTemplate(loc: string, code: string): Object {
-  var ast = parse({ filename: loc, looseModules: true }, code).program;
+  var ast = parse(code, { filename: loc, looseModules: true }).program;
   ast = traverse.removeProperties(ast);
   return ast;
 }
diff --git a/test/core/generation.js b/test/core/generation.js
index 21bd55094f..61f04a445e 100644
--- a/test/core/generation.js
+++ b/test/core/generation.js
@@ -1,7 +1,7 @@
 var generate = require("../../lib/babel/generation");
 var assert   = require("assert");
 var helper   = require("./_helper");
-var parse    = require("../../lib/babel/helpers/parse");
+var parse    = require("../../lib/babel/helpers/parse").default;
 var chai     = require("chai");
 var t        = require("../../lib/babel/types");
 var _        = require("lodash");
@@ -26,7 +26,7 @@ _.each(helper.get("generation"), function (testSuite) {
         var expect = task.expect;
         var actual = task.actual;
 
-        var actualAst  = parse({
+        var actualAst  = parse(actual.code, {
           filename: actual.loc,
           nonStandard: true,
           strictMode: false,
@@ -36,7 +36,7 @@ _.each(helper.get("generation"), function (testSuite) {
             "es7.asyncFunctions": true,
             "es7.exportExtensions": true
           }
-        }, actual.code);
+        });
         var actualCode = generate(actualAst, task.options, actual.code).code;
 
         chai.expect(actualCode).to.equal(expect.code, actual.loc + " !== " + expect.loc);
diff --git a/test/core/util.js b/test/core/util.js
index d299ef04e6..bc971acde9 100644
--- a/test/core/util.js
+++ b/test/core/util.js
@@ -1,6 +1,6 @@
 var assert = require("assert");
 var util   = require("../../lib/babel/util");
-var parse  = require("../../lib/babel/helpers/parse");
+var parse  = require("../../lib/babel/helpers/parse").default;
 var t      = require("../../lib/babel/types");
 
 suite("util", function () {
@@ -11,19 +11,18 @@ suite("util", function () {
   });
 
   test("templates do not recurse", function () {
-    var key = __filename;
-    var KEY = parse({ loc: key }, "replacedKey").program.body[0].expression;
-    var VALUE = parse({ loc: key }, "+KEY").program.body[0].expression;
+    var key   = __filename;
+    var KEY   = parse("replacedKey").program.body[0].expression;
+    var VALUE = parse("+KEY").program.body[0].expression;
 
     util.templates[key] = util.parseTemplate(key, "KEY = VALUE;");
-    var result = util.template(key, {KEY: KEY, VALUE: VALUE});
+    var result = util.template(key, { KEY: KEY, VALUE: VALUE });
     delete util.templates[key];
 
     assert.strictEqual(
       result.right.argument.name,
       "KEY",
-      "template should not recurse into replaced nodes, " +
-        "replacing KEY inside VALUE"
+      "template should not recurse into replaced nodes, replacing KEY inside VALUE"
     );
   });