diff --git a/lib/jsdoc/src/astbuilder.js b/lib/jsdoc/src/astbuilder.js
index 0d763e695..7cb7dd043 100644
--- a/lib/jsdoc/src/astbuilder.js
+++ b/lib/jsdoc/src/astbuilder.js
@@ -75,36 +75,17 @@ var acceptsLeadingComments = (function() {
 // exported so we can use them in tests
 var parserOptions = exports.parserOptions = {
     comment: true,
-    loc: true,
-    range: true,
-    tokens: true,
     ecmaFeatures: {
-        arrowFunctions: true,
-        binaryLiterals: true,
-        blockBindings: true,
-        classes: true,
-        defaultParams: true,
-        destructuring: true,
         experimentalObjectRestSpread: true,
-        forOf: true,
-        generators: true,
         globalReturn: true,
-        jsx: true,
-        modules: true,
-        newTarget: true,
-        objectLiteralComputedProperties: true,
-        objectLiteralDuplicateProperties: true,
-        objectLiteralShorthandMethods: true,
-        objectLiteralShorthandProperties: true,
-        octalLiterals: true,
-        regexUFlag: true,
-        regexYFlag: true,
-        restParams: true,
-        spread: true,
-        superInFunctions: true,
-        templateStrings: true,
-        unicodeCodePointEscapes: true
-    }
+        impliedStrict: true,
+        jsx: true
+    },
+    ecmaVersion: 7,
+    loc: true,
+    range: true,
+    sourceType: 'module',
+    tokens: true
 };
 
 // TODO: docs
diff --git a/package.json b/package.json
index 1b56996ea..68916d162 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
     "bluebird": "~3.4.6",
     "catharsis": "~0.8.8",
     "escape-string-regexp": "~1.0.5",
-    "espree": "~2.2.5",
+    "espree": "~3.1.7",
     "fs-extra": "~0.30.0",
     "js2xmlparser": "~1.0.0",
     "marked": "~0.3.6",