diff --git a/src/parser/expression.js b/src/parser/expression.js
index c451cb6a50..ed312d9d5c 100644
--- a/src/parser/expression.js
+++ b/src/parser/expression.js
@@ -827,13 +827,7 @@ pp.parseObjPropValue = function (prop, startPos, startLoc, isGenerator, isAsync,
 
   if (!prop.computed && prop.key.type === "Identifier") {
     if (isPattern) {
-      let illegalBinding = this.isKeyword(prop.key.name);
-      if (!illegalBinding && this.state.strict) {
-        illegalBinding = reservedWords.strictBind(prop.key.name) || reservedWords.strict(prop.key.name);
-      }
-      if (illegalBinding) {
-        this.raise(prop.key.start, "Binding " + prop.key.name);
-      }
+      this.checkReservedWord(prop.key.name, prop.key.start, true, true);
       prop.value = this.parseMaybeDefault(startPos, startLoc, prop.key.__clone());
     } else if (this.match(tt.eq) && refShorthandDefaultPos) {
       if (!refShorthandDefaultPos.start) {
@@ -843,6 +837,7 @@ pp.parseObjPropValue = function (prop, startPos, startLoc, isGenerator, isAsync,
     } else {
       prop.value = prop.key.__clone();
     }
+
     prop.shorthand = true;
     return this.finishNode(prop, "ObjectProperty");
   }
@@ -998,8 +993,8 @@ pp.parseIdentifier = function (liberal) {
   let node = this.startNode();
 
   if (this.match(tt.name)) {
-    if (!liberal && this.state.strict && reservedWords.strict(this.state.value)) {
-      this.raise(this.state.start, "The keyword '" + this.state.value + "' is reserved");
+    if (!liberal) {
+      this.checkReservedWord(this.state.value, this.state.start, false, false);
     }
 
     node.name = this.state.value;
@@ -1019,6 +1014,16 @@ pp.parseIdentifier = function (liberal) {
   return this.finishNode(node, "Identifier");
 };
 
+pp.checkReservedWord = function (word, startLoc, checkKeywords, isBinding) {
+  if (this.isReservedWord(word) || (checkKeywords && this.isKeyword(word))) {
+    this.raise(startLoc, word + " is a reserved word");
+  }
+
+  if (this.state.strict && (reservedWords.strict(word) || (isBinding && reservedWords.strictBind(word)))) {
+    this.raise(startLoc, word + " is a reserved word in strict mode");
+  }
+};
+
 // Parses await expression inside async function.
 
 pp.parseAwait = function (node) {
diff --git a/src/parser/index.js b/src/parser/index.js
index 38f0f4eda2..14d661b517 100644
--- a/src/parser/index.js
+++ b/src/parser/index.js
@@ -11,7 +11,6 @@ export default class Parser extends Tokenizer {
 
     this.options = options;
     this.inModule = this.options.sourceType === "module";
-    this.isReservedWord = reservedWords[6];
     this.input = input;
     this.plugins = this.loadPlugins(this.options.plugins);
     this.filename = options.sourceFilename;
@@ -22,6 +21,14 @@ export default class Parser extends Tokenizer {
     }
   }
 
+  isReservedWord(word: string): boolean {
+    if (word === "await") {
+      return this.inModule;
+    } else {
+      return reservedWords[6](word);
+    }
+  }
+
   hasPlugin(name: string): boolean {
     return !!(this.plugins["*"] || this.plugins[name]);
   }
diff --git a/src/parser/lval.js b/src/parser/lval.js
index 50ff8a3b6b..c74e88a5dd 100644
--- a/src/parser/lval.js
+++ b/src/parser/lval.js
@@ -2,7 +2,6 @@
 
 import { types as tt } from "../tokenizer/types";
 import Parser from "./index";
-import { reservedWords } from "../util/identifier";
 
 const pp = Parser.prototype;
 
@@ -204,9 +203,7 @@ pp.parseMaybeDefault = function (startPos, startLoc, left) {
 pp.checkLVal = function (expr, isBinding, checkClashes, contextDescription) {
   switch (expr.type) {
     case "Identifier":
-      if (this.state.strict && (reservedWords.strictBind(expr.name) || reservedWords.strict(expr.name))) {
-        this.raise(expr.start, (isBinding ? "Binding " : "Assigning to ") + expr.name + " in strict mode");
-      }
+      this.checkReservedWord(expr.name, expr.start, false, true);
 
       if (checkClashes) {
         // we need to prefix this with an underscore for the cases where we have a key of
diff --git a/test/fixtures/core/uncategorised/428/options.json b/test/fixtures/core/uncategorised/428/options.json
index 65ef4a184a..9ce9658f7d 100644
--- a/test/fixtures/core/uncategorised/428/options.json
+++ b/test/fixtures/core/uncategorised/428/options.json
@@ -1,3 +1,3 @@
 {
   "throws": "Unexpected token (1:8)"
-}
\ No newline at end of file
+}
diff --git a/test/fixtures/core/uncategorised/468/options.json b/test/fixtures/core/uncategorised/468/options.json
index 0e72c82fe8..28f8810614 100644
--- a/test/fixtures/core/uncategorised/468/options.json
+++ b/test/fixtures/core/uncategorised/468/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding eval in strict mode (1:36)"
-}
\ No newline at end of file
+  "throws": "eval is a reserved word in strict mode (1:36)"
+}
diff --git a/test/fixtures/core/uncategorised/469/options.json b/test/fixtures/core/uncategorised/469/options.json
index f171e1b2c8..913c7bb59f 100644
--- a/test/fixtures/core/uncategorised/469/options.json
+++ b/test/fixtures/core/uncategorised/469/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding arguments in strict mode (1:36)"
-}
\ No newline at end of file
+  "throws": "arguments is a reserved word in strict mode (1:36)"
+}
diff --git a/test/fixtures/core/uncategorised/470/options.json b/test/fixtures/core/uncategorised/470/options.json
index 52cc5e0c10..0306783e6e 100644
--- a/test/fixtures/core/uncategorised/470/options.json
+++ b/test/fixtures/core/uncategorised/470/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding eval in strict mode (1:47)"
-}
\ No newline at end of file
+  "throws": "eval is a reserved word in strict mode (1:47)"
+}
diff --git a/test/fixtures/core/uncategorised/471/options.json b/test/fixtures/core/uncategorised/471/options.json
index 1c09320e14..d1ae282536 100644
--- a/test/fixtures/core/uncategorised/471/options.json
+++ b/test/fixtures/core/uncategorised/471/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding arguments in strict mode (1:47)"
-}
\ No newline at end of file
+  "throws": "arguments is a reserved word in strict mode (1:47)"
+}
diff --git a/test/fixtures/core/uncategorised/472/options.json b/test/fixtures/core/uncategorised/472/options.json
index e606855bd2..3bcd668ab1 100644
--- a/test/fixtures/core/uncategorised/472/options.json
+++ b/test/fixtures/core/uncategorised/472/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Assigning to eval in strict mode (1:32)"
-}
\ No newline at end of file
+  "throws": "eval is a reserved word in strict mode (1:32)"
+}
diff --git a/test/fixtures/core/uncategorised/473/options.json b/test/fixtures/core/uncategorised/473/options.json
index d66800268f..04db3a2178 100644
--- a/test/fixtures/core/uncategorised/473/options.json
+++ b/test/fixtures/core/uncategorised/473/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Assigning to arguments in strict mode (1:32)"
-}
\ No newline at end of file
+  "throws": "arguments is a reserved word in strict mode (1:32)"
+}
diff --git a/test/fixtures/core/uncategorised/474/options.json b/test/fixtures/core/uncategorised/474/options.json
index 194b27c0a0..48fd4ff419 100644
--- a/test/fixtures/core/uncategorised/474/options.json
+++ b/test/fixtures/core/uncategorised/474/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Assigning to eval in strict mode (1:34)"
-}
\ No newline at end of file
+  "throws": "eval is a reserved word in strict mode (1:34)"
+}
diff --git a/test/fixtures/core/uncategorised/475/options.json b/test/fixtures/core/uncategorised/475/options.json
index 194b27c0a0..48fd4ff419 100644
--- a/test/fixtures/core/uncategorised/475/options.json
+++ b/test/fixtures/core/uncategorised/475/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Assigning to eval in strict mode (1:34)"
-}
\ No newline at end of file
+  "throws": "eval is a reserved word in strict mode (1:34)"
+}
diff --git a/test/fixtures/core/uncategorised/476/options.json b/test/fixtures/core/uncategorised/476/options.json
index fa7fd234e5..d579a92e23 100644
--- a/test/fixtures/core/uncategorised/476/options.json
+++ b/test/fixtures/core/uncategorised/476/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Assigning to arguments in strict mode (1:34)"
-}
\ No newline at end of file
+  "throws": "arguments is a reserved word in strict mode (1:34)"
+}
diff --git a/test/fixtures/core/uncategorised/477/options.json b/test/fixtures/core/uncategorised/477/options.json
index fa7fd234e5..d579a92e23 100644
--- a/test/fixtures/core/uncategorised/477/options.json
+++ b/test/fixtures/core/uncategorised/477/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Assigning to arguments in strict mode (1:34)"
-}
\ No newline at end of file
+  "throws": "arguments is a reserved word in strict mode (1:34)"
+}
diff --git a/test/fixtures/core/uncategorised/478/options.json b/test/fixtures/core/uncategorised/478/options.json
index e606855bd2..3bcd668ab1 100644
--- a/test/fixtures/core/uncategorised/478/options.json
+++ b/test/fixtures/core/uncategorised/478/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Assigning to eval in strict mode (1:32)"
-}
\ No newline at end of file
+  "throws": "eval is a reserved word in strict mode (1:32)"
+}
diff --git a/test/fixtures/core/uncategorised/479/options.json b/test/fixtures/core/uncategorised/479/options.json
index e606855bd2..3bcd668ab1 100644
--- a/test/fixtures/core/uncategorised/479/options.json
+++ b/test/fixtures/core/uncategorised/479/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Assigning to eval in strict mode (1:32)"
-}
\ No newline at end of file
+  "throws": "eval is a reserved word in strict mode (1:32)"
+}
diff --git a/test/fixtures/core/uncategorised/480/options.json b/test/fixtures/core/uncategorised/480/options.json
index d66800268f..04db3a2178 100644
--- a/test/fixtures/core/uncategorised/480/options.json
+++ b/test/fixtures/core/uncategorised/480/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Assigning to arguments in strict mode (1:32)"
-}
\ No newline at end of file
+  "throws": "arguments is a reserved word in strict mode (1:32)"
+}
diff --git a/test/fixtures/core/uncategorised/481/options.json b/test/fixtures/core/uncategorised/481/options.json
index d66800268f..04db3a2178 100644
--- a/test/fixtures/core/uncategorised/481/options.json
+++ b/test/fixtures/core/uncategorised/481/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Assigning to arguments in strict mode (1:32)"
-}
\ No newline at end of file
+  "throws": "arguments is a reserved word in strict mode (1:32)"
+}
diff --git a/test/fixtures/core/uncategorised/482/options.json b/test/fixtures/core/uncategorised/482/options.json
index 74aee2c177..71bbcc0b9c 100644
--- a/test/fixtures/core/uncategorised/482/options.json
+++ b/test/fixtures/core/uncategorised/482/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding eval in strict mode (1:41)"
-}
\ No newline at end of file
+  "throws": "eval is a reserved word in strict mode (1:41)"
+}
diff --git a/test/fixtures/core/uncategorised/483/options.json b/test/fixtures/core/uncategorised/483/options.json
index cb4087319e..544d28f502 100644
--- a/test/fixtures/core/uncategorised/483/options.json
+++ b/test/fixtures/core/uncategorised/483/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding arguments in strict mode (1:41)"
-}
\ No newline at end of file
+  "throws": "arguments is a reserved word in strict mode (1:41)"
+}
diff --git a/test/fixtures/core/uncategorised/484/options.json b/test/fixtures/core/uncategorised/484/options.json
index a49374fb46..bf851387b4 100644
--- a/test/fixtures/core/uncategorised/484/options.json
+++ b/test/fixtures/core/uncategorised/484/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding eval in strict mode (1:9)"
-}
\ No newline at end of file
+  "throws": "eval is a reserved word in strict mode (1:9)"
+}
diff --git a/test/fixtures/core/uncategorised/485/options.json b/test/fixtures/core/uncategorised/485/options.json
index 8a3871a0d1..e4d477b8e4 100644
--- a/test/fixtures/core/uncategorised/485/options.json
+++ b/test/fixtures/core/uncategorised/485/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding arguments in strict mode (1:9)"
-}
\ No newline at end of file
+  "throws": "arguments is a reserved word in strict mode (1:9)"
+}
diff --git a/test/fixtures/core/uncategorised/486/options.json b/test/fixtures/core/uncategorised/486/options.json
index 9c41225e97..f6c8eea4b0 100644
--- a/test/fixtures/core/uncategorised/486/options.json
+++ b/test/fixtures/core/uncategorised/486/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding eval in strict mode (1:42)"
-}
\ No newline at end of file
+  "throws": "eval is a reserved word in strict mode (1:42)"
+}
diff --git a/test/fixtures/core/uncategorised/487/options.json b/test/fixtures/core/uncategorised/487/options.json
index bc7c65ae7b..d26216e0a3 100644
--- a/test/fixtures/core/uncategorised/487/options.json
+++ b/test/fixtures/core/uncategorised/487/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding arguments in strict mode (1:42)"
-}
\ No newline at end of file
+  "throws": "arguments is a reserved word in strict mode (1:42)"
+}
diff --git a/test/fixtures/core/uncategorised/488/options.json b/test/fixtures/core/uncategorised/488/options.json
index 0dcd2b3e58..69e4925a3f 100644
--- a/test/fixtures/core/uncategorised/488/options.json
+++ b/test/fixtures/core/uncategorised/488/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding eval in strict mode (1:10)"
-}
\ No newline at end of file
+  "throws": "eval is a reserved word in strict mode (1:10)"
+}
diff --git a/test/fixtures/core/uncategorised/489/options.json b/test/fixtures/core/uncategorised/489/options.json
index 57ba0014b4..fbdc57cfc8 100644
--- a/test/fixtures/core/uncategorised/489/options.json
+++ b/test/fixtures/core/uncategorised/489/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding arguments in strict mode (1:10)"
-}
\ No newline at end of file
+  "throws": "arguments is a reserved word in strict mode (1:10)"
+}
diff --git a/test/fixtures/core/uncategorised/490/options.json b/test/fixtures/core/uncategorised/490/options.json
index 52cc5e0c10..0306783e6e 100644
--- a/test/fixtures/core/uncategorised/490/options.json
+++ b/test/fixtures/core/uncategorised/490/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding eval in strict mode (1:47)"
-}
\ No newline at end of file
+  "throws": "eval is a reserved word in strict mode (1:47)"
+}
diff --git a/test/fixtures/core/uncategorised/491/options.json b/test/fixtures/core/uncategorised/491/options.json
index 94e937fa7c..c2d1e1a69b 100644
--- a/test/fixtures/core/uncategorised/491/options.json
+++ b/test/fixtures/core/uncategorised/491/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding package in strict mode (1:10)"
-}
\ No newline at end of file
+  "throws": "package is a reserved word in strict mode (1:10)"
+}
diff --git a/test/fixtures/core/uncategorised/492/options.json b/test/fixtures/core/uncategorised/492/options.json
index d6f5d89ca6..92828dc4f1 100644
--- a/test/fixtures/core/uncategorised/492/options.json
+++ b/test/fixtures/core/uncategorised/492/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding eval in strict mode (1:48)"
-}
\ No newline at end of file
+  "throws": "eval is a reserved word in strict mode (1:48)"
+}
diff --git a/test/fixtures/core/uncategorised/493/options.json b/test/fixtures/core/uncategorised/493/options.json
index 74aee2c177..71bbcc0b9c 100644
--- a/test/fixtures/core/uncategorised/493/options.json
+++ b/test/fixtures/core/uncategorised/493/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding eval in strict mode (1:41)"
-}
\ No newline at end of file
+  "throws": "eval is a reserved word in strict mode (1:41)"
+}
diff --git a/test/fixtures/core/uncategorised/494/options.json b/test/fixtures/core/uncategorised/494/options.json
index c181de42a2..241eccc1bf 100644
--- a/test/fixtures/core/uncategorised/494/options.json
+++ b/test/fixtures/core/uncategorised/494/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding eval in strict mode (1:49)"
-}
\ No newline at end of file
+  "throws": "eval is a reserved word in strict mode (1:49)"
+}
diff --git a/test/fixtures/core/uncategorised/495/options.json b/test/fixtures/core/uncategorised/495/options.json
index 8de33328ad..f56e7311d8 100644
--- a/test/fixtures/core/uncategorised/495/options.json
+++ b/test/fixtures/core/uncategorised/495/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding eval in strict mode (1:15)"
-}
\ No newline at end of file
+  "throws": "eval is a reserved word in strict mode (1:15)"
+}
diff --git a/test/fixtures/core/uncategorised/496/options.json b/test/fixtures/core/uncategorised/496/options.json
index e2b36a2437..0e19621951 100644
--- a/test/fixtures/core/uncategorised/496/options.json
+++ b/test/fixtures/core/uncategorised/496/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding arguments in strict mode (1:15)"
-}
\ No newline at end of file
+  "throws": "arguments is a reserved word in strict mode (1:15)"
+}
diff --git a/test/fixtures/core/uncategorised/497/options.json b/test/fixtures/core/uncategorised/497/options.json
index d6f5d89ca6..92828dc4f1 100644
--- a/test/fixtures/core/uncategorised/497/options.json
+++ b/test/fixtures/core/uncategorised/497/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding eval in strict mode (1:48)"
-}
\ No newline at end of file
+  "throws": "eval is a reserved word in strict mode (1:48)"
+}
diff --git a/test/fixtures/core/uncategorised/498/options.json b/test/fixtures/core/uncategorised/498/options.json
index 8ee11e66ca..e9f6bf4d32 100644
--- a/test/fixtures/core/uncategorised/498/options.json
+++ b/test/fixtures/core/uncategorised/498/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding arguments in strict mode (1:48)"
-}
\ No newline at end of file
+  "throws": "arguments is a reserved word in strict mode (1:48)"
+}
diff --git a/test/fixtures/core/uncategorised/504/options.json b/test/fixtures/core/uncategorised/504/options.json
index 570ca31728..2748b9f03d 100644
--- a/test/fixtures/core/uncategorised/504/options.json
+++ b/test/fixtures/core/uncategorised/504/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding implements in strict mode (1:37)"
+  "throws": "implements is a reserved word in strict mode (1:37)"
 }
diff --git a/test/fixtures/core/uncategorised/505/options.json b/test/fixtures/core/uncategorised/505/options.json
index dfe4eddc2a..6efaf057ca 100644
--- a/test/fixtures/core/uncategorised/505/options.json
+++ b/test/fixtures/core/uncategorised/505/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding interface in strict mode (1:37)"
+  "throws": "interface is a reserved word in strict mode (1:37)"
 }
diff --git a/test/fixtures/core/uncategorised/506/options.json b/test/fixtures/core/uncategorised/506/options.json
index 766ddb41ca..61578ad8f8 100644
--- a/test/fixtures/core/uncategorised/506/options.json
+++ b/test/fixtures/core/uncategorised/506/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding package in strict mode (1:37)"
+  "throws": "package is a reserved word in strict mode (1:37)"
 }
diff --git a/test/fixtures/core/uncategorised/507/options.json b/test/fixtures/core/uncategorised/507/options.json
index 9a7c12e0a6..da502d0daa 100644
--- a/test/fixtures/core/uncategorised/507/options.json
+++ b/test/fixtures/core/uncategorised/507/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding private in strict mode (1:37)"
+  "throws": "private is a reserved word in strict mode (1:37)"
 }
diff --git a/test/fixtures/core/uncategorised/508/options.json b/test/fixtures/core/uncategorised/508/options.json
index ba43694c8d..6fd44c0e1b 100644
--- a/test/fixtures/core/uncategorised/508/options.json
+++ b/test/fixtures/core/uncategorised/508/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding protected in strict mode (1:37)"
+  "throws": "protected is a reserved word in strict mode (1:37)"
 }
diff --git a/test/fixtures/core/uncategorised/509/options.json b/test/fixtures/core/uncategorised/509/options.json
index b1dbd863ed..3a41c740ea 100644
--- a/test/fixtures/core/uncategorised/509/options.json
+++ b/test/fixtures/core/uncategorised/509/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding public in strict mode (1:37)"
+  "throws": "public is a reserved word in strict mode (1:37)"
 }
diff --git a/test/fixtures/core/uncategorised/510/options.json b/test/fixtures/core/uncategorised/510/options.json
index 75ad83ddbb..764205122e 100644
--- a/test/fixtures/core/uncategorised/510/options.json
+++ b/test/fixtures/core/uncategorised/510/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding static in strict mode (1:37)"
+  "throws": "static is a reserved word in strict mode (1:37)"
 }
diff --git a/test/fixtures/core/uncategorised/511/options.json b/test/fixtures/core/uncategorised/511/options.json
index 07a8c1c0f1..e316c4fc64 100644
--- a/test/fixtures/core/uncategorised/511/options.json
+++ b/test/fixtures/core/uncategorised/511/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding static in strict mode (1:15)"
-}
\ No newline at end of file
+  "throws": "static is a reserved word in strict mode (1:15)"
+}
diff --git a/test/fixtures/core/uncategorised/512/options.json b/test/fixtures/core/uncategorised/512/options.json
index f7524a3327..9b6fddd2eb 100644
--- a/test/fixtures/core/uncategorised/512/options.json
+++ b/test/fixtures/core/uncategorised/512/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding static in strict mode (1:9)"
-}
\ No newline at end of file
+  "throws": "static is a reserved word in strict mode (1:9)"
+}
diff --git a/test/fixtures/core/uncategorised/513/options.json b/test/fixtures/core/uncategorised/513/options.json
index 69a9237df8..a2eac88ba6 100644
--- a/test/fixtures/core/uncategorised/513/options.json
+++ b/test/fixtures/core/uncategorised/513/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "The keyword 'static' is reserved (1:23)"
+  "throws": "static is a reserved word in strict mode (1:23)"
 }
diff --git a/test/fixtures/core/uncategorised/515/options.json b/test/fixtures/core/uncategorised/515/options.json
index 301643713f..0bb96c96d8 100644
--- a/test/fixtures/core/uncategorised/515/options.json
+++ b/test/fixtures/core/uncategorised/515/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding eval in strict mode (1:11)"
-}
\ No newline at end of file
+  "throws": "eval is a reserved word in strict mode (1:11)"
+}
diff --git a/test/fixtures/core/uncategorised/516/options.json b/test/fixtures/core/uncategorised/516/options.json
index 31ebd9508d..7551a61b9e 100644
--- a/test/fixtures/core/uncategorised/516/options.json
+++ b/test/fixtures/core/uncategorised/516/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding package in strict mode (1:11)"
-}
\ No newline at end of file
+  "throws": "package is a reserved word in strict mode (1:11)"
+}
diff --git a/test/fixtures/core/uncategorised/520/options.json b/test/fixtures/core/uncategorised/520/options.json
index c9df15d6ef..b52d2d2e15 100644
--- a/test/fixtures/core/uncategorised/520/options.json
+++ b/test/fixtures/core/uncategorised/520/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding eval in strict mode (1:12)"
-}
\ No newline at end of file
+  "throws": "eval is a reserved word in strict mode (1:12)"
+}
diff --git a/test/fixtures/core/uncategorised/521/options.json b/test/fixtures/core/uncategorised/521/options.json
index 87abf59529..7b80f0e455 100644
--- a/test/fixtures/core/uncategorised/521/options.json
+++ b/test/fixtures/core/uncategorised/521/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding package in strict mode (1:12)"
-}
\ No newline at end of file
+  "throws": "package is a reserved word in strict mode (1:12)"
+}
diff --git a/test/fixtures/core/uncategorised/544/actual.js b/test/fixtures/core/uncategorised/544/actual.js
new file mode 100644
index 0000000000..10717a9104
--- /dev/null
+++ b/test/fixtures/core/uncategorised/544/actual.js
@@ -0,0 +1,2 @@
+"use strict";
+const { public } = foo();
diff --git a/test/fixtures/core/uncategorised/544/options.json b/test/fixtures/core/uncategorised/544/options.json
new file mode 100644
index 0000000000..8874a76e59
--- /dev/null
+++ b/test/fixtures/core/uncategorised/544/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "public is a reserved word in strict mode (2:8)"
+}
diff --git a/test/fixtures/core/uncategorised/545/actual.js b/test/fixtures/core/uncategorised/545/actual.js
new file mode 100644
index 0000000000..6d24f5bb05
--- /dev/null
+++ b/test/fixtures/core/uncategorised/545/actual.js
@@ -0,0 +1 @@
+const { public } = foo();
diff --git a/test/fixtures/core/uncategorised/545/options.json b/test/fixtures/core/uncategorised/545/options.json
new file mode 100644
index 0000000000..560bb89881
--- /dev/null
+++ b/test/fixtures/core/uncategorised/545/options.json
@@ -0,0 +1,4 @@
+{
+  "sourceType": "module",
+  "throws": "public is a reserved word in strict mode (1:8)"
+}
diff --git a/test/fixtures/core/uncategorised/546/actual.js b/test/fixtures/core/uncategorised/546/actual.js
new file mode 100644
index 0000000000..6d24f5bb05
--- /dev/null
+++ b/test/fixtures/core/uncategorised/546/actual.js
@@ -0,0 +1 @@
+const { public } = foo();
diff --git a/test/fixtures/core/uncategorised/546/expected.json b/test/fixtures/core/uncategorised/546/expected.json
new file mode 100644
index 0000000000..9f7364ea93
--- /dev/null
+++ b/test/fixtures/core/uncategorised/546/expected.json
@@ -0,0 +1,172 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 25,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 25
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 25,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 25
+      }
+    },
+    "sourceType": "script",
+    "body": [
+      {
+        "type": "VariableDeclaration",
+        "start": 0,
+        "end": 25,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 25
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 6,
+            "end": 24,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 6
+              },
+              "end": {
+                "line": 1,
+                "column": 24
+              }
+            },
+            "id": {
+              "type": "ObjectPattern",
+              "start": 6,
+              "end": 16,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 6
+                },
+                "end": {
+                  "line": 1,
+                  "column": 16
+                }
+              },
+              "properties": [
+                {
+                  "type": "ObjectProperty",
+                  "start": 8,
+                  "end": 14,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 8
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 14
+                    }
+                  },
+                  "method": false,
+                  "shorthand": true,
+                  "computed": false,
+                  "key": {
+                    "type": "Identifier",
+                    "start": 8,
+                    "end": 14,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 8
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 14
+                      },
+                      "identifierName": "public"
+                    },
+                    "name": "public"
+                  },
+                  "value": {
+                    "type": "Identifier",
+                    "start": 8,
+                    "end": 14,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 8
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 14
+                      },
+                      "identifierName": "public"
+                    },
+                    "name": "public"
+                  },
+                  "extra": {
+                    "shorthand": true
+                  }
+                }
+              ]
+            },
+            "init": {
+              "type": "CallExpression",
+              "start": 19,
+              "end": 24,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 19
+                },
+                "end": {
+                  "line": 1,
+                  "column": 24
+                }
+              },
+              "callee": {
+                "type": "Identifier",
+                "start": 19,
+                "end": 22,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 19
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 22
+                  },
+                  "identifierName": "foo"
+                },
+                "name": "foo"
+              },
+              "arguments": []
+            }
+          }
+        ],
+        "kind": "const"
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/test/fixtures/core/uncategorised/546/options.json b/test/fixtures/core/uncategorised/546/options.json
new file mode 100644
index 0000000000..b412ffe671
--- /dev/null
+++ b/test/fixtures/core/uncategorised/546/options.json
@@ -0,0 +1,3 @@
+{
+  "sourceType": "script"
+}
diff --git a/test/fixtures/core/uncategorised/547/actual.js b/test/fixtures/core/uncategorised/547/actual.js
new file mode 100644
index 0000000000..148e167571
--- /dev/null
+++ b/test/fixtures/core/uncategorised/547/actual.js
@@ -0,0 +1,2 @@
+"use strict";
+const { arguments } = foo();
diff --git a/test/fixtures/core/uncategorised/547/options.json b/test/fixtures/core/uncategorised/547/options.json
new file mode 100644
index 0000000000..20c9b2493e
--- /dev/null
+++ b/test/fixtures/core/uncategorised/547/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "arguments is a reserved word in strict mode (2:8)"
+}
diff --git a/test/fixtures/core/uncategorised/548/actual.js b/test/fixtures/core/uncategorised/548/actual.js
new file mode 100644
index 0000000000..d477247938
--- /dev/null
+++ b/test/fixtures/core/uncategorised/548/actual.js
@@ -0,0 +1 @@
+const { arguments } = foo();
diff --git a/test/fixtures/core/uncategorised/548/options.json b/test/fixtures/core/uncategorised/548/options.json
new file mode 100644
index 0000000000..d2dd99623c
--- /dev/null
+++ b/test/fixtures/core/uncategorised/548/options.json
@@ -0,0 +1,4 @@
+{
+  "sourceType": "module",
+  "throws": "arguments is a reserved word in strict mode (1:8)"
+}
diff --git a/test/fixtures/core/uncategorised/549/actual.js b/test/fixtures/core/uncategorised/549/actual.js
new file mode 100644
index 0000000000..d477247938
--- /dev/null
+++ b/test/fixtures/core/uncategorised/549/actual.js
@@ -0,0 +1 @@
+const { arguments } = foo();
diff --git a/test/fixtures/core/uncategorised/549/expected.json b/test/fixtures/core/uncategorised/549/expected.json
new file mode 100644
index 0000000000..b604724403
--- /dev/null
+++ b/test/fixtures/core/uncategorised/549/expected.json
@@ -0,0 +1,172 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 28,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 28
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 28,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 28
+      }
+    },
+    "sourceType": "script",
+    "body": [
+      {
+        "type": "VariableDeclaration",
+        "start": 0,
+        "end": 28,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 28
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 6,
+            "end": 27,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 6
+              },
+              "end": {
+                "line": 1,
+                "column": 27
+              }
+            },
+            "id": {
+              "type": "ObjectPattern",
+              "start": 6,
+              "end": 19,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 6
+                },
+                "end": {
+                  "line": 1,
+                  "column": 19
+                }
+              },
+              "properties": [
+                {
+                  "type": "ObjectProperty",
+                  "start": 8,
+                  "end": 17,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 8
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 17
+                    }
+                  },
+                  "method": false,
+                  "shorthand": true,
+                  "computed": false,
+                  "key": {
+                    "type": "Identifier",
+                    "start": 8,
+                    "end": 17,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 8
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 17
+                      },
+                      "identifierName": "arguments"
+                    },
+                    "name": "arguments"
+                  },
+                  "value": {
+                    "type": "Identifier",
+                    "start": 8,
+                    "end": 17,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 8
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 17
+                      },
+                      "identifierName": "arguments"
+                    },
+                    "name": "arguments"
+                  },
+                  "extra": {
+                    "shorthand": true
+                  }
+                }
+              ]
+            },
+            "init": {
+              "type": "CallExpression",
+              "start": 22,
+              "end": 27,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 22
+                },
+                "end": {
+                  "line": 1,
+                  "column": 27
+                }
+              },
+              "callee": {
+                "type": "Identifier",
+                "start": 22,
+                "end": 25,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 22
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 25
+                  },
+                  "identifierName": "foo"
+                },
+                "name": "foo"
+              },
+              "arguments": []
+            }
+          }
+        ],
+        "kind": "const"
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/test/fixtures/core/uncategorised/549/options.json b/test/fixtures/core/uncategorised/549/options.json
new file mode 100644
index 0000000000..b412ffe671
--- /dev/null
+++ b/test/fixtures/core/uncategorised/549/options.json
@@ -0,0 +1,3 @@
+{
+  "sourceType": "script"
+}
diff --git a/test/fixtures/es2015/destructuring/binding-this/options.json b/test/fixtures/es2015/destructuring/binding-this/options.json
index 751e3a83c2..bc51e124a0 100644
--- a/test/fixtures/es2015/destructuring/binding-this/options.json
+++ b/test/fixtures/es2015/destructuring/binding-this/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding this (1:6)"
+  "throws": "this is a reserved word (1:6)"
 }
diff --git a/test/fixtures/es2015/uncategorised/227/options.json b/test/fixtures/es2015/uncategorised/227/options.json
index cf0cfbf253..c83fb4f882 100644
--- a/test/fixtures/es2015/uncategorised/227/options.json
+++ b/test/fixtures/es2015/uncategorised/227/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding eval in strict mode (1:44)"
-}
\ No newline at end of file
+  "throws": "eval is a reserved word in strict mode (1:44)"
+}
diff --git a/test/fixtures/es2015/uncategorised/233/options.json b/test/fixtures/es2015/uncategorised/233/options.json
index 751d27f98c..36804413e8 100644
--- a/test/fixtures/es2015/uncategorised/233/options.json
+++ b/test/fixtures/es2015/uncategorised/233/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Assigning to eval in strict mode (1:20)"
-}
\ No newline at end of file
+  "throws": "eval is a reserved word in strict mode (1:20)"
+}
diff --git a/test/fixtures/es2015/uncategorised/234/options.json b/test/fixtures/es2015/uncategorised/234/options.json
index 86ec68e0e5..058a7e4138 100644
--- a/test/fixtures/es2015/uncategorised/234/options.json
+++ b/test/fixtures/es2015/uncategorised/234/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Assigning to arguments in strict mode (1:20)"
-}
\ No newline at end of file
+  "throws": "arguments is a reserved word in strict mode (1:20)"
+}
diff --git a/test/fixtures/es2015/uncategorised/242/options.json b/test/fixtures/es2015/uncategorised/242/options.json
index 7ba6713b58..f56e7311d8 100644
--- a/test/fixtures/es2015/uncategorised/242/options.json
+++ b/test/fixtures/es2015/uncategorised/242/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Assigning to eval in strict mode (1:15)"
-}
\ No newline at end of file
+  "throws": "eval is a reserved word in strict mode (1:15)"
+}
diff --git a/test/fixtures/es2015/uncategorised/243/options.json b/test/fixtures/es2015/uncategorised/243/options.json
index 734b22815e..c5e6f0e623 100644
--- a/test/fixtures/es2015/uncategorised/243/options.json
+++ b/test/fixtures/es2015/uncategorised/243/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding eval in strict mode (1:14)"
-}
\ No newline at end of file
+  "throws": "eval is a reserved word in strict mode (1:14)"
+}
diff --git a/test/fixtures/es2015/uncategorised/244/options.json b/test/fixtures/es2015/uncategorised/244/options.json
index a3af8401ae..3168d40d55 100644
--- a/test/fixtures/es2015/uncategorised/244/options.json
+++ b/test/fixtures/es2015/uncategorised/244/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding arguments in strict mode (1:14)"
-}
\ No newline at end of file
+  "throws": "arguments is a reserved word in strict mode (1:14)"
+}
diff --git a/test/fixtures/es2015/uncategorised/245/options.json b/test/fixtures/es2015/uncategorised/245/options.json
index 8de33328ad..f56e7311d8 100644
--- a/test/fixtures/es2015/uncategorised/245/options.json
+++ b/test/fixtures/es2015/uncategorised/245/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding eval in strict mode (1:15)"
-}
\ No newline at end of file
+  "throws": "eval is a reserved word in strict mode (1:15)"
+}
diff --git a/test/fixtures/es2015/uncategorised/246/options.json b/test/fixtures/es2015/uncategorised/246/options.json
index e2b36a2437..0e19621951 100644
--- a/test/fixtures/es2015/uncategorised/246/options.json
+++ b/test/fixtures/es2015/uncategorised/246/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding arguments in strict mode (1:15)"
-}
\ No newline at end of file
+  "throws": "arguments is a reserved word in strict mode (1:15)"
+}
diff --git a/test/fixtures/es2015/uncategorised/247/options.json b/test/fixtures/es2015/uncategorised/247/options.json
index 8de33328ad..f56e7311d8 100644
--- a/test/fixtures/es2015/uncategorised/247/options.json
+++ b/test/fixtures/es2015/uncategorised/247/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding eval in strict mode (1:15)"
-}
\ No newline at end of file
+  "throws": "eval is a reserved word in strict mode (1:15)"
+}
diff --git a/test/fixtures/es2015/uncategorised/289/options.json b/test/fixtures/es2015/uncategorised/289/options.json
index d1e5932969..bcd69af2d7 100644
--- a/test/fixtures/es2015/uncategorised/289/options.json
+++ b/test/fixtures/es2015/uncategorised/289/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding eval in strict mode (1:5)"
-}
\ No newline at end of file
+  "throws": "eval is a reserved word in strict mode (1:5)"
+}
diff --git a/test/fixtures/es2015/uncategorised/296/options.json b/test/fixtures/es2015/uncategorised/296/options.json
index 8de33328ad..f56e7311d8 100644
--- a/test/fixtures/es2015/uncategorised/296/options.json
+++ b/test/fixtures/es2015/uncategorised/296/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding eval in strict mode (1:15)"
-}
\ No newline at end of file
+  "throws": "eval is a reserved word in strict mode (1:15)"
+}
diff --git a/test/fixtures/es2015/uncategorised/297/options.json b/test/fixtures/es2015/uncategorised/297/options.json
index 4bd43226c1..12e8741b8a 100644
--- a/test/fixtures/es2015/uncategorised/297/options.json
+++ b/test/fixtures/es2015/uncategorised/297/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding eval in strict mode (1:1)"
-}
\ No newline at end of file
+  "throws": "eval is a reserved word in strict mode (1:1)"
+}
diff --git a/test/fixtures/es2015/uncategorised/332/options.json b/test/fixtures/es2015/uncategorised/332/options.json
index 7d51eb4423..b346a7872a 100644
--- a/test/fixtures/es2015/uncategorised/332/options.json
+++ b/test/fixtures/es2015/uncategorised/332/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Assigning to eval in strict mode (1:18)"
-}
\ No newline at end of file
+  "throws": "eval is a reserved word in strict mode (1:18)"
+}
diff --git a/test/fixtures/es2015/uncategorised/333/options.json b/test/fixtures/es2015/uncategorised/333/options.json
index 6b654b9b0c..46c5c8d53f 100644
--- a/test/fixtures/es2015/uncategorised/333/options.json
+++ b/test/fixtures/es2015/uncategorised/333/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Assigning to eval in strict mode (1:16)"
-}
\ No newline at end of file
+  "throws": "eval is a reserved word in strict mode (1:16)"
+}
diff --git a/test/fixtures/es2015/uncategorised/334/options.json b/test/fixtures/es2015/uncategorised/334/options.json
index 284d20506e..92b68ac333 100644
--- a/test/fixtures/es2015/uncategorised/334/options.json
+++ b/test/fixtures/es2015/uncategorised/334/options.json
@@ -1,4 +1,4 @@
 {
   "sourceType": "module",
-  "throws": "Assigning to eval in strict mode (1:4)"
-}
\ No newline at end of file
+  "throws": "eval is a reserved word in strict mode (1:4)"
+}
diff --git a/test/fixtures/es2015/uncategorised/356/actual.js b/test/fixtures/es2015/uncategorised/356/actual.js
new file mode 100644
index 0000000000..7c2b79bce1
--- /dev/null
+++ b/test/fixtures/es2015/uncategorised/356/actual.js
@@ -0,0 +1 @@
+await = foo();
diff --git a/test/fixtures/es2015/uncategorised/356/expected.json b/test/fixtures/es2015/uncategorised/356/expected.json
new file mode 100644
index 0000000000..88faf46c8e
--- /dev/null
+++ b/test/fixtures/es2015/uncategorised/356/expected.json
@@ -0,0 +1,115 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 14,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 14
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 14,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 14
+      }
+    },
+    "sourceType": "script",
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 14,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 14
+          }
+        },
+        "expression": {
+          "type": "AssignmentExpression",
+          "start": 0,
+          "end": 13,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 13
+            }
+          },
+          "operator": "=",
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 5,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 5
+              },
+              "identifierName": "await"
+            },
+            "name": "await"
+          },
+          "right": {
+            "type": "CallExpression",
+            "start": 8,
+            "end": 13,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 8
+              },
+              "end": {
+                "line": 1,
+                "column": 13
+              }
+            },
+            "callee": {
+              "type": "Identifier",
+              "start": 8,
+              "end": 11,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 8
+                },
+                "end": {
+                  "line": 1,
+                  "column": 11
+                },
+                "identifierName": "foo"
+              },
+              "name": "foo"
+            },
+            "arguments": []
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/test/fixtures/es2015/uncategorised/356/options.json b/test/fixtures/es2015/uncategorised/356/options.json
new file mode 100644
index 0000000000..b412ffe671
--- /dev/null
+++ b/test/fixtures/es2015/uncategorised/356/options.json
@@ -0,0 +1,3 @@
+{
+  "sourceType": "script"
+}
diff --git a/test/fixtures/es2015/uncategorised/357/actual.js b/test/fixtures/es2015/uncategorised/357/actual.js
new file mode 100644
index 0000000000..7c2b79bce1
--- /dev/null
+++ b/test/fixtures/es2015/uncategorised/357/actual.js
@@ -0,0 +1 @@
+await = foo();
diff --git a/test/fixtures/es2015/uncategorised/357/options.json b/test/fixtures/es2015/uncategorised/357/options.json
new file mode 100644
index 0000000000..d295c5a3a3
--- /dev/null
+++ b/test/fixtures/es2015/uncategorised/357/options.json
@@ -0,0 +1,4 @@
+{
+  "sourceType": "module",
+  "throws": "await is a reserved word (1:0)"
+}
diff --git a/test/fixtures/es2015/uncategorised/358/actual.js b/test/fixtures/es2015/uncategorised/358/actual.js
new file mode 100644
index 0000000000..87df70b406
--- /dev/null
+++ b/test/fixtures/es2015/uncategorised/358/actual.js
@@ -0,0 +1 @@
+const await = foo();
diff --git a/test/fixtures/es2015/uncategorised/358/expected.json b/test/fixtures/es2015/uncategorised/358/expected.json
new file mode 100644
index 0000000000..0220d534aa
--- /dev/null
+++ b/test/fixtures/es2015/uncategorised/358/expected.json
@@ -0,0 +1,117 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 20,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 20
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 20,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 20
+      }
+    },
+    "sourceType": "script",
+    "body": [
+      {
+        "type": "VariableDeclaration",
+        "start": 0,
+        "end": 20,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 20
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 6,
+            "end": 19,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 6
+              },
+              "end": {
+                "line": 1,
+                "column": 19
+              }
+            },
+            "id": {
+              "type": "Identifier",
+              "start": 6,
+              "end": 11,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 6
+                },
+                "end": {
+                  "line": 1,
+                  "column": 11
+                },
+                "identifierName": "await"
+              },
+              "name": "await"
+            },
+            "init": {
+              "type": "CallExpression",
+              "start": 14,
+              "end": 19,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 14
+                },
+                "end": {
+                  "line": 1,
+                  "column": 19
+                }
+              },
+              "callee": {
+                "type": "Identifier",
+                "start": 14,
+                "end": 17,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 14
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 17
+                  },
+                  "identifierName": "foo"
+                },
+                "name": "foo"
+              },
+              "arguments": []
+            }
+          }
+        ],
+        "kind": "const"
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/test/fixtures/es2015/uncategorised/358/options.json b/test/fixtures/es2015/uncategorised/358/options.json
new file mode 100644
index 0000000000..b412ffe671
--- /dev/null
+++ b/test/fixtures/es2015/uncategorised/358/options.json
@@ -0,0 +1,3 @@
+{
+  "sourceType": "script"
+}
diff --git a/test/fixtures/es2015/uncategorised/359/actual.js b/test/fixtures/es2015/uncategorised/359/actual.js
new file mode 100644
index 0000000000..87df70b406
--- /dev/null
+++ b/test/fixtures/es2015/uncategorised/359/actual.js
@@ -0,0 +1 @@
+const await = foo();
diff --git a/test/fixtures/es2015/uncategorised/359/options.json b/test/fixtures/es2015/uncategorised/359/options.json
new file mode 100644
index 0000000000..dfa11a2d85
--- /dev/null
+++ b/test/fixtures/es2015/uncategorised/359/options.json
@@ -0,0 +1,4 @@
+{
+  "sourceType": "module",
+  "throws": "await is a reserved word (1:6)"
+}
diff --git a/test/fixtures/es2015/uncategorised/360/actual.js b/test/fixtures/es2015/uncategorised/360/actual.js
new file mode 100644
index 0000000000..eb2f732679
--- /dev/null
+++ b/test/fixtures/es2015/uncategorised/360/actual.js
@@ -0,0 +1 @@
+const { await } = foo();
diff --git a/test/fixtures/es2015/uncategorised/360/expected.json b/test/fixtures/es2015/uncategorised/360/expected.json
new file mode 100644
index 0000000000..7afc6719a9
--- /dev/null
+++ b/test/fixtures/es2015/uncategorised/360/expected.json
@@ -0,0 +1,172 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 24,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 24
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 24,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 24
+      }
+    },
+    "sourceType": "script",
+    "body": [
+      {
+        "type": "VariableDeclaration",
+        "start": 0,
+        "end": 24,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 24
+          }
+        },
+        "declarations": [
+          {
+            "type": "VariableDeclarator",
+            "start": 6,
+            "end": 23,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 6
+              },
+              "end": {
+                "line": 1,
+                "column": 23
+              }
+            },
+            "id": {
+              "type": "ObjectPattern",
+              "start": 6,
+              "end": 15,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 6
+                },
+                "end": {
+                  "line": 1,
+                  "column": 15
+                }
+              },
+              "properties": [
+                {
+                  "type": "ObjectProperty",
+                  "start": 8,
+                  "end": 13,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 8
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 13
+                    }
+                  },
+                  "method": false,
+                  "shorthand": true,
+                  "computed": false,
+                  "key": {
+                    "type": "Identifier",
+                    "start": 8,
+                    "end": 13,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 8
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 13
+                      },
+                      "identifierName": "await"
+                    },
+                    "name": "await"
+                  },
+                  "value": {
+                    "type": "Identifier",
+                    "start": 8,
+                    "end": 13,
+                    "loc": {
+                      "start": {
+                        "line": 1,
+                        "column": 8
+                      },
+                      "end": {
+                        "line": 1,
+                        "column": 13
+                      },
+                      "identifierName": "await"
+                    },
+                    "name": "await"
+                  },
+                  "extra": {
+                    "shorthand": true
+                  }
+                }
+              ]
+            },
+            "init": {
+              "type": "CallExpression",
+              "start": 18,
+              "end": 23,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 18
+                },
+                "end": {
+                  "line": 1,
+                  "column": 23
+                }
+              },
+              "callee": {
+                "type": "Identifier",
+                "start": 18,
+                "end": 21,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 18
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 21
+                  },
+                  "identifierName": "foo"
+                },
+                "name": "foo"
+              },
+              "arguments": []
+            }
+          }
+        ],
+        "kind": "const"
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/test/fixtures/es2015/uncategorised/360/options.json b/test/fixtures/es2015/uncategorised/360/options.json
new file mode 100644
index 0000000000..b412ffe671
--- /dev/null
+++ b/test/fixtures/es2015/uncategorised/360/options.json
@@ -0,0 +1,3 @@
+{
+  "sourceType": "script"
+}
diff --git a/test/fixtures/es2015/uncategorised/361/actual.js b/test/fixtures/es2015/uncategorised/361/actual.js
new file mode 100644
index 0000000000..eb2f732679
--- /dev/null
+++ b/test/fixtures/es2015/uncategorised/361/actual.js
@@ -0,0 +1 @@
+const { await } = foo();
diff --git a/test/fixtures/es2015/uncategorised/361/options.json b/test/fixtures/es2015/uncategorised/361/options.json
new file mode 100644
index 0000000000..6a60772f96
--- /dev/null
+++ b/test/fixtures/es2015/uncategorised/361/options.json
@@ -0,0 +1,4 @@
+{
+  "sourceType": "module",
+  "throws": "await is a reserved word (1:8)"
+}
diff --git a/test/fixtures/es2015/uncategorised/362/actual.js b/test/fixtures/es2015/uncategorised/362/actual.js
new file mode 100644
index 0000000000..c39edf5747
--- /dev/null
+++ b/test/fixtures/es2015/uncategorised/362/actual.js
@@ -0,0 +1 @@
+function foo({ await }) {}
diff --git a/test/fixtures/es2015/uncategorised/362/expected.json b/test/fixtures/es2015/uncategorised/362/expected.json
new file mode 100644
index 0000000000..03eb6643e3
--- /dev/null
+++ b/test/fixtures/es2015/uncategorised/362/expected.json
@@ -0,0 +1,160 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 26,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 26
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 26,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 26
+      }
+    },
+    "sourceType": "script",
+    "body": [
+      {
+        "type": "FunctionDeclaration",
+        "start": 0,
+        "end": 26,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 26
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 9,
+          "end": 12,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 9
+            },
+            "end": {
+              "line": 1,
+              "column": 12
+            },
+            "identifierName": "foo"
+          },
+          "name": "foo"
+        },
+        "generator": false,
+        "expression": false,
+        "async": false,
+        "params": [
+          {
+            "type": "ObjectPattern",
+            "start": 13,
+            "end": 22,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 13
+              },
+              "end": {
+                "line": 1,
+                "column": 22
+              }
+            },
+            "properties": [
+              {
+                "type": "ObjectProperty",
+                "start": 15,
+                "end": 20,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 15
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 20
+                  }
+                },
+                "method": false,
+                "shorthand": true,
+                "computed": false,
+                "key": {
+                  "type": "Identifier",
+                  "start": 15,
+                  "end": 20,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 15
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 20
+                    },
+                    "identifierName": "await"
+                  },
+                  "name": "await"
+                },
+                "value": {
+                  "type": "Identifier",
+                  "start": 15,
+                  "end": 20,
+                  "loc": {
+                    "start": {
+                      "line": 1,
+                      "column": 15
+                    },
+                    "end": {
+                      "line": 1,
+                      "column": 20
+                    },
+                    "identifierName": "await"
+                  },
+                  "name": "await"
+                },
+                "extra": {
+                  "shorthand": true
+                }
+              }
+            ]
+          }
+        ],
+        "body": {
+          "type": "BlockStatement",
+          "start": 24,
+          "end": 26,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 24
+            },
+            "end": {
+              "line": 1,
+              "column": 26
+            }
+          },
+          "body": [],
+          "directives": []
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/test/fixtures/es2015/uncategorised/362/options.json b/test/fixtures/es2015/uncategorised/362/options.json
new file mode 100644
index 0000000000..b412ffe671
--- /dev/null
+++ b/test/fixtures/es2015/uncategorised/362/options.json
@@ -0,0 +1,3 @@
+{
+  "sourceType": "script"
+}
diff --git a/test/fixtures/es2015/uncategorised/363/actual.js b/test/fixtures/es2015/uncategorised/363/actual.js
new file mode 100644
index 0000000000..c39edf5747
--- /dev/null
+++ b/test/fixtures/es2015/uncategorised/363/actual.js
@@ -0,0 +1 @@
+function foo({ await }) {}
diff --git a/test/fixtures/es2015/uncategorised/363/options.json b/test/fixtures/es2015/uncategorised/363/options.json
new file mode 100644
index 0000000000..e9917bc908
--- /dev/null
+++ b/test/fixtures/es2015/uncategorised/363/options.json
@@ -0,0 +1,4 @@
+{
+  "sourceType": "module",
+  "throws": "await is a reserved word (1:15)"
+}
diff --git a/test/fixtures/es2015/uncategorised/364/actual.js b/test/fixtures/es2015/uncategorised/364/actual.js
new file mode 100644
index 0000000000..2526e7ed1d
--- /dev/null
+++ b/test/fixtures/es2015/uncategorised/364/actual.js
@@ -0,0 +1 @@
+function await() {}
diff --git a/test/fixtures/es2015/uncategorised/364/expected.json b/test/fixtures/es2015/uncategorised/364/expected.json
new file mode 100644
index 0000000000..51f1dbd5b4
--- /dev/null
+++ b/test/fixtures/es2015/uncategorised/364/expected.json
@@ -0,0 +1,87 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 19,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 19
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 19,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 19
+      }
+    },
+    "sourceType": "script",
+    "body": [
+      {
+        "type": "FunctionDeclaration",
+        "start": 0,
+        "end": 19,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 19
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 9,
+          "end": 14,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 9
+            },
+            "end": {
+              "line": 1,
+              "column": 14
+            },
+            "identifierName": "await"
+          },
+          "name": "await"
+        },
+        "generator": false,
+        "expression": false,
+        "async": false,
+        "params": [],
+        "body": {
+          "type": "BlockStatement",
+          "start": 17,
+          "end": 19,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 17
+            },
+            "end": {
+              "line": 1,
+              "column": 19
+            }
+          },
+          "body": [],
+          "directives": []
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/test/fixtures/es2015/uncategorised/364/options.json b/test/fixtures/es2015/uncategorised/364/options.json
new file mode 100644
index 0000000000..b412ffe671
--- /dev/null
+++ b/test/fixtures/es2015/uncategorised/364/options.json
@@ -0,0 +1,3 @@
+{
+  "sourceType": "script"
+}
diff --git a/test/fixtures/es2015/uncategorised/365/actual.js b/test/fixtures/es2015/uncategorised/365/actual.js
new file mode 100644
index 0000000000..2526e7ed1d
--- /dev/null
+++ b/test/fixtures/es2015/uncategorised/365/actual.js
@@ -0,0 +1 @@
+function await() {}
diff --git a/test/fixtures/es2015/uncategorised/365/options.json b/test/fixtures/es2015/uncategorised/365/options.json
new file mode 100644
index 0000000000..e703907857
--- /dev/null
+++ b/test/fixtures/es2015/uncategorised/365/options.json
@@ -0,0 +1,4 @@
+{
+  "sourceType": "module",
+  "throws": "await is a reserved word (1:9)"
+}
diff --git a/test/fixtures/es2015/uncategorised/366/actual.js b/test/fixtures/es2015/uncategorised/366/actual.js
new file mode 100644
index 0000000000..90acb4eb77
--- /dev/null
+++ b/test/fixtures/es2015/uncategorised/366/actual.js
@@ -0,0 +1 @@
+class await {}
diff --git a/test/fixtures/es2015/uncategorised/366/expected.json b/test/fixtures/es2015/uncategorised/366/expected.json
new file mode 100644
index 0000000000..533144506e
--- /dev/null
+++ b/test/fixtures/es2015/uncategorised/366/expected.json
@@ -0,0 +1,83 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 14,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 14
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 14,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 14
+      }
+    },
+    "sourceType": "script",
+    "body": [
+      {
+        "type": "ClassDeclaration",
+        "start": 0,
+        "end": 14,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 14
+          }
+        },
+        "id": {
+          "type": "Identifier",
+          "start": 6,
+          "end": 11,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 6
+            },
+            "end": {
+              "line": 1,
+              "column": 11
+            },
+            "identifierName": "await"
+          },
+          "name": "await"
+        },
+        "superClass": null,
+        "body": {
+          "type": "ClassBody",
+          "start": 12,
+          "end": 14,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 12
+            },
+            "end": {
+              "line": 1,
+              "column": 14
+            }
+          },
+          "body": []
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/test/fixtures/es2015/uncategorised/366/options.json b/test/fixtures/es2015/uncategorised/366/options.json
new file mode 100644
index 0000000000..b412ffe671
--- /dev/null
+++ b/test/fixtures/es2015/uncategorised/366/options.json
@@ -0,0 +1,3 @@
+{
+  "sourceType": "script"
+}
diff --git a/test/fixtures/es2015/uncategorised/367/actual.js b/test/fixtures/es2015/uncategorised/367/actual.js
new file mode 100644
index 0000000000..90acb4eb77
--- /dev/null
+++ b/test/fixtures/es2015/uncategorised/367/actual.js
@@ -0,0 +1 @@
+class await {}
diff --git a/test/fixtures/es2015/uncategorised/367/options.json b/test/fixtures/es2015/uncategorised/367/options.json
new file mode 100644
index 0000000000..dfa11a2d85
--- /dev/null
+++ b/test/fixtures/es2015/uncategorised/367/options.json
@@ -0,0 +1,4 @@
+{
+  "sourceType": "module",
+  "throws": "await is a reserved word (1:6)"
+}
diff --git a/test/fixtures/es2015/uncategorised/368/actual.js b/test/fixtures/es2015/uncategorised/368/actual.js
new file mode 100644
index 0000000000..acc83e5018
--- /dev/null
+++ b/test/fixtures/es2015/uncategorised/368/actual.js
@@ -0,0 +1 @@
+enum = foo();
diff --git a/test/fixtures/es2015/uncategorised/368/options.json b/test/fixtures/es2015/uncategorised/368/options.json
new file mode 100644
index 0000000000..be7cb5854a
--- /dev/null
+++ b/test/fixtures/es2015/uncategorised/368/options.json
@@ -0,0 +1,4 @@
+{
+  "sourceType": "script",
+  "throws": "enum is a reserved word (1:0)"
+}
diff --git a/test/fixtures/es2015/uncategorised/369/actual.js b/test/fixtures/es2015/uncategorised/369/actual.js
new file mode 100644
index 0000000000..acc83e5018
--- /dev/null
+++ b/test/fixtures/es2015/uncategorised/369/actual.js
@@ -0,0 +1 @@
+enum = foo();
diff --git a/test/fixtures/es2015/uncategorised/369/options.json b/test/fixtures/es2015/uncategorised/369/options.json
new file mode 100644
index 0000000000..471868697d
--- /dev/null
+++ b/test/fixtures/es2015/uncategorised/369/options.json
@@ -0,0 +1,4 @@
+{
+  "sourceType": "module",
+  "throws": "enum is a reserved word (1:0)"
+}
diff --git a/test/fixtures/es2015/uncategorised/370/actual.js b/test/fixtures/es2015/uncategorised/370/actual.js
new file mode 100644
index 0000000000..f38f61eeed
--- /dev/null
+++ b/test/fixtures/es2015/uncategorised/370/actual.js
@@ -0,0 +1 @@
+const enum = foo();
diff --git a/test/fixtures/es2015/uncategorised/370/options.json b/test/fixtures/es2015/uncategorised/370/options.json
new file mode 100644
index 0000000000..b792a5158d
--- /dev/null
+++ b/test/fixtures/es2015/uncategorised/370/options.json
@@ -0,0 +1,4 @@
+{
+  "sourceType": "script",
+  "throws": "enum is a reserved word (1:6)"
+}
diff --git a/test/fixtures/es2015/uncategorised/371/actual.js b/test/fixtures/es2015/uncategorised/371/actual.js
new file mode 100644
index 0000000000..f38f61eeed
--- /dev/null
+++ b/test/fixtures/es2015/uncategorised/371/actual.js
@@ -0,0 +1 @@
+const enum = foo();
diff --git a/test/fixtures/es2015/uncategorised/371/options.json b/test/fixtures/es2015/uncategorised/371/options.json
new file mode 100644
index 0000000000..4a7908c1fb
--- /dev/null
+++ b/test/fixtures/es2015/uncategorised/371/options.json
@@ -0,0 +1,4 @@
+{
+  "sourceType": "module",
+  "throws": "enum is a reserved word (1:6)"
+}
diff --git a/test/fixtures/es2015/uncategorised/372/actual.js b/test/fixtures/es2015/uncategorised/372/actual.js
new file mode 100644
index 0000000000..7277dbcf81
--- /dev/null
+++ b/test/fixtures/es2015/uncategorised/372/actual.js
@@ -0,0 +1 @@
+const { enum } = foo();
diff --git a/test/fixtures/es2015/uncategorised/372/options.json b/test/fixtures/es2015/uncategorised/372/options.json
new file mode 100644
index 0000000000..67b6ff2f16
--- /dev/null
+++ b/test/fixtures/es2015/uncategorised/372/options.json
@@ -0,0 +1,4 @@
+{
+  "sourceType": "script",
+  "throws": "enum is a reserved word (1:8)"
+}
diff --git a/test/fixtures/es2015/uncategorised/373/actual.js b/test/fixtures/es2015/uncategorised/373/actual.js
new file mode 100644
index 0000000000..7277dbcf81
--- /dev/null
+++ b/test/fixtures/es2015/uncategorised/373/actual.js
@@ -0,0 +1 @@
+const { enum } = foo();
diff --git a/test/fixtures/es2015/uncategorised/373/options.json b/test/fixtures/es2015/uncategorised/373/options.json
new file mode 100644
index 0000000000..5c2c250e15
--- /dev/null
+++ b/test/fixtures/es2015/uncategorised/373/options.json
@@ -0,0 +1,4 @@
+{
+  "sourceType": "module",
+  "throws": "enum is a reserved word (1:8)"
+}
diff --git a/test/fixtures/es2015/uncategorised/374/actual.js b/test/fixtures/es2015/uncategorised/374/actual.js
new file mode 100644
index 0000000000..99c6b6528f
--- /dev/null
+++ b/test/fixtures/es2015/uncategorised/374/actual.js
@@ -0,0 +1 @@
+function foo({ enum }) {}
diff --git a/test/fixtures/es2015/uncategorised/374/options.json b/test/fixtures/es2015/uncategorised/374/options.json
new file mode 100644
index 0000000000..b10f9979f5
--- /dev/null
+++ b/test/fixtures/es2015/uncategorised/374/options.json
@@ -0,0 +1,4 @@
+{
+  "sourceType": "script",
+  "throws": "enum is a reserved word (1:15)"
+}
diff --git a/test/fixtures/es2015/uncategorised/375/actual.js b/test/fixtures/es2015/uncategorised/375/actual.js
new file mode 100644
index 0000000000..99c6b6528f
--- /dev/null
+++ b/test/fixtures/es2015/uncategorised/375/actual.js
@@ -0,0 +1 @@
+function foo({ enum }) {}
diff --git a/test/fixtures/es2015/uncategorised/375/options.json b/test/fixtures/es2015/uncategorised/375/options.json
new file mode 100644
index 0000000000..dc427ad7ef
--- /dev/null
+++ b/test/fixtures/es2015/uncategorised/375/options.json
@@ -0,0 +1,4 @@
+{
+  "sourceType": "module",
+  "throws": "enum is a reserved word (1:15)"
+}
diff --git a/test/fixtures/es2015/uncategorised/376/actual.js b/test/fixtures/es2015/uncategorised/376/actual.js
new file mode 100644
index 0000000000..d6153faa2e
--- /dev/null
+++ b/test/fixtures/es2015/uncategorised/376/actual.js
@@ -0,0 +1 @@
+function enum() {}
diff --git a/test/fixtures/es2015/uncategorised/376/options.json b/test/fixtures/es2015/uncategorised/376/options.json
new file mode 100644
index 0000000000..8d226ef8ec
--- /dev/null
+++ b/test/fixtures/es2015/uncategorised/376/options.json
@@ -0,0 +1,4 @@
+{
+  "sourceType": "script",
+  "throws": "enum is a reserved word (1:9)"
+}
diff --git a/test/fixtures/es2015/uncategorised/377/actual.js b/test/fixtures/es2015/uncategorised/377/actual.js
new file mode 100644
index 0000000000..d6153faa2e
--- /dev/null
+++ b/test/fixtures/es2015/uncategorised/377/actual.js
@@ -0,0 +1 @@
+function enum() {}
diff --git a/test/fixtures/es2015/uncategorised/377/options.json b/test/fixtures/es2015/uncategorised/377/options.json
new file mode 100644
index 0000000000..cdfa39cc09
--- /dev/null
+++ b/test/fixtures/es2015/uncategorised/377/options.json
@@ -0,0 +1,4 @@
+{
+  "sourceType": "module",
+  "throws": "enum is a reserved word (1:9)"
+}
diff --git a/test/fixtures/es2015/uncategorised/378/actual.js b/test/fixtures/es2015/uncategorised/378/actual.js
new file mode 100644
index 0000000000..51d50e852f
--- /dev/null
+++ b/test/fixtures/es2015/uncategorised/378/actual.js
@@ -0,0 +1 @@
+class enum {}
diff --git a/test/fixtures/es2015/uncategorised/378/options.json b/test/fixtures/es2015/uncategorised/378/options.json
new file mode 100644
index 0000000000..b792a5158d
--- /dev/null
+++ b/test/fixtures/es2015/uncategorised/378/options.json
@@ -0,0 +1,4 @@
+{
+  "sourceType": "script",
+  "throws": "enum is a reserved word (1:6)"
+}
diff --git a/test/fixtures/es2015/uncategorised/379/actual.js b/test/fixtures/es2015/uncategorised/379/actual.js
new file mode 100644
index 0000000000..51d50e852f
--- /dev/null
+++ b/test/fixtures/es2015/uncategorised/379/actual.js
@@ -0,0 +1 @@
+class enum {}
diff --git a/test/fixtures/es2015/uncategorised/379/options.json b/test/fixtures/es2015/uncategorised/379/options.json
new file mode 100644
index 0000000000..4a7908c1fb
--- /dev/null
+++ b/test/fixtures/es2015/uncategorised/379/options.json
@@ -0,0 +1,4 @@
+{
+  "sourceType": "module",
+  "throws": "enum is a reserved word (1:6)"
+}
diff --git a/test/fixtures/esprima/es2015-arrow-function/invalid-param-strict-mode/options.json b/test/fixtures/esprima/es2015-arrow-function/invalid-param-strict-mode/options.json
index 811d429e63..e0027065af 100644
--- a/test/fixtures/esprima/es2015-arrow-function/invalid-param-strict-mode/options.json
+++ b/test/fixtures/esprima/es2015-arrow-function/invalid-param-strict-mode/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding eval in strict mode (1:0)"
-}
\ No newline at end of file
+  "throws": "eval is a reserved word in strict mode (1:0)"
+}
diff --git a/test/fixtures/esprima/invalid-syntax/migrated_0087/options.json b/test/fixtures/esprima/invalid-syntax/migrated_0087/options.json
index 7ba6713b58..f56e7311d8 100644
--- a/test/fixtures/esprima/invalid-syntax/migrated_0087/options.json
+++ b/test/fixtures/esprima/invalid-syntax/migrated_0087/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Assigning to eval in strict mode (1:15)"
-}
\ No newline at end of file
+  "throws": "eval is a reserved word in strict mode (1:15)"
+}
diff --git a/test/fixtures/esprima/invalid-syntax/migrated_0088/options.json b/test/fixtures/esprima/invalid-syntax/migrated_0088/options.json
index 734b22815e..c5e6f0e623 100644
--- a/test/fixtures/esprima/invalid-syntax/migrated_0088/options.json
+++ b/test/fixtures/esprima/invalid-syntax/migrated_0088/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding eval in strict mode (1:14)"
-}
\ No newline at end of file
+  "throws": "eval is a reserved word in strict mode (1:14)"
+}
diff --git a/test/fixtures/esprima/invalid-syntax/migrated_0089/options.json b/test/fixtures/esprima/invalid-syntax/migrated_0089/options.json
index a3af8401ae..3168d40d55 100644
--- a/test/fixtures/esprima/invalid-syntax/migrated_0089/options.json
+++ b/test/fixtures/esprima/invalid-syntax/migrated_0089/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding arguments in strict mode (1:14)"
-}
\ No newline at end of file
+  "throws": "arguments is a reserved word in strict mode (1:14)"
+}
diff --git a/test/fixtures/esprima/invalid-syntax/migrated_0090/options.json b/test/fixtures/esprima/invalid-syntax/migrated_0090/options.json
index 8de33328ad..f56e7311d8 100644
--- a/test/fixtures/esprima/invalid-syntax/migrated_0090/options.json
+++ b/test/fixtures/esprima/invalid-syntax/migrated_0090/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding eval in strict mode (1:15)"
-}
\ No newline at end of file
+  "throws": "eval is a reserved word in strict mode (1:15)"
+}
diff --git a/test/fixtures/esprima/invalid-syntax/migrated_0091/options.json b/test/fixtures/esprima/invalid-syntax/migrated_0091/options.json
index e2b36a2437..0e19621951 100644
--- a/test/fixtures/esprima/invalid-syntax/migrated_0091/options.json
+++ b/test/fixtures/esprima/invalid-syntax/migrated_0091/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding arguments in strict mode (1:15)"
-}
\ No newline at end of file
+  "throws": "arguments is a reserved word in strict mode (1:15)"
+}
diff --git a/test/fixtures/esprima/invalid-syntax/migrated_0100/options.json b/test/fixtures/esprima/invalid-syntax/migrated_0100/options.json
index 8de33328ad..f56e7311d8 100644
--- a/test/fixtures/esprima/invalid-syntax/migrated_0100/options.json
+++ b/test/fixtures/esprima/invalid-syntax/migrated_0100/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding eval in strict mode (1:15)"
-}
\ No newline at end of file
+  "throws": "eval is a reserved word in strict mode (1:15)"
+}
diff --git a/test/fixtures/esprima/invalid-syntax/migrated_0101/options.json b/test/fixtures/esprima/invalid-syntax/migrated_0101/options.json
index 4bd43226c1..12e8741b8a 100644
--- a/test/fixtures/esprima/invalid-syntax/migrated_0101/options.json
+++ b/test/fixtures/esprima/invalid-syntax/migrated_0101/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding eval in strict mode (1:1)"
-}
\ No newline at end of file
+  "throws": "eval is a reserved word in strict mode (1:1)"
+}
diff --git a/test/fixtures/esprima/invalid-syntax/migrated_0185/options.json b/test/fixtures/esprima/invalid-syntax/migrated_0185/options.json
index 0e72c82fe8..28f8810614 100644
--- a/test/fixtures/esprima/invalid-syntax/migrated_0185/options.json
+++ b/test/fixtures/esprima/invalid-syntax/migrated_0185/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding eval in strict mode (1:36)"
-}
\ No newline at end of file
+  "throws": "eval is a reserved word in strict mode (1:36)"
+}
diff --git a/test/fixtures/esprima/invalid-syntax/migrated_0186/options.json b/test/fixtures/esprima/invalid-syntax/migrated_0186/options.json
index f171e1b2c8..913c7bb59f 100644
--- a/test/fixtures/esprima/invalid-syntax/migrated_0186/options.json
+++ b/test/fixtures/esprima/invalid-syntax/migrated_0186/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding arguments in strict mode (1:36)"
-}
\ No newline at end of file
+  "throws": "arguments is a reserved word in strict mode (1:36)"
+}
diff --git a/test/fixtures/esprima/invalid-syntax/migrated_0187/options.json b/test/fixtures/esprima/invalid-syntax/migrated_0187/options.json
index 52cc5e0c10..0306783e6e 100644
--- a/test/fixtures/esprima/invalid-syntax/migrated_0187/options.json
+++ b/test/fixtures/esprima/invalid-syntax/migrated_0187/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding eval in strict mode (1:47)"
-}
\ No newline at end of file
+  "throws": "eval is a reserved word in strict mode (1:47)"
+}
diff --git a/test/fixtures/esprima/invalid-syntax/migrated_0188/options.json b/test/fixtures/esprima/invalid-syntax/migrated_0188/options.json
index 1c09320e14..d1ae282536 100644
--- a/test/fixtures/esprima/invalid-syntax/migrated_0188/options.json
+++ b/test/fixtures/esprima/invalid-syntax/migrated_0188/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding arguments in strict mode (1:47)"
-}
\ No newline at end of file
+  "throws": "arguments is a reserved word in strict mode (1:47)"
+}
diff --git a/test/fixtures/esprima/invalid-syntax/migrated_0189/options.json b/test/fixtures/esprima/invalid-syntax/migrated_0189/options.json
index e606855bd2..3bcd668ab1 100644
--- a/test/fixtures/esprima/invalid-syntax/migrated_0189/options.json
+++ b/test/fixtures/esprima/invalid-syntax/migrated_0189/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Assigning to eval in strict mode (1:32)"
-}
\ No newline at end of file
+  "throws": "eval is a reserved word in strict mode (1:32)"
+}
diff --git a/test/fixtures/esprima/invalid-syntax/migrated_0190/options.json b/test/fixtures/esprima/invalid-syntax/migrated_0190/options.json
index d66800268f..04db3a2178 100644
--- a/test/fixtures/esprima/invalid-syntax/migrated_0190/options.json
+++ b/test/fixtures/esprima/invalid-syntax/migrated_0190/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Assigning to arguments in strict mode (1:32)"
-}
\ No newline at end of file
+  "throws": "arguments is a reserved word in strict mode (1:32)"
+}
diff --git a/test/fixtures/esprima/invalid-syntax/migrated_0191/options.json b/test/fixtures/esprima/invalid-syntax/migrated_0191/options.json
index 194b27c0a0..48fd4ff419 100644
--- a/test/fixtures/esprima/invalid-syntax/migrated_0191/options.json
+++ b/test/fixtures/esprima/invalid-syntax/migrated_0191/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Assigning to eval in strict mode (1:34)"
-}
\ No newline at end of file
+  "throws": "eval is a reserved word in strict mode (1:34)"
+}
diff --git a/test/fixtures/esprima/invalid-syntax/migrated_0192/options.json b/test/fixtures/esprima/invalid-syntax/migrated_0192/options.json
index 194b27c0a0..48fd4ff419 100644
--- a/test/fixtures/esprima/invalid-syntax/migrated_0192/options.json
+++ b/test/fixtures/esprima/invalid-syntax/migrated_0192/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Assigning to eval in strict mode (1:34)"
-}
\ No newline at end of file
+  "throws": "eval is a reserved word in strict mode (1:34)"
+}
diff --git a/test/fixtures/esprima/invalid-syntax/migrated_0193/options.json b/test/fixtures/esprima/invalid-syntax/migrated_0193/options.json
index fa7fd234e5..d579a92e23 100644
--- a/test/fixtures/esprima/invalid-syntax/migrated_0193/options.json
+++ b/test/fixtures/esprima/invalid-syntax/migrated_0193/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Assigning to arguments in strict mode (1:34)"
-}
\ No newline at end of file
+  "throws": "arguments is a reserved word in strict mode (1:34)"
+}
diff --git a/test/fixtures/esprima/invalid-syntax/migrated_0194/options.json b/test/fixtures/esprima/invalid-syntax/migrated_0194/options.json
index fa7fd234e5..d579a92e23 100644
--- a/test/fixtures/esprima/invalid-syntax/migrated_0194/options.json
+++ b/test/fixtures/esprima/invalid-syntax/migrated_0194/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Assigning to arguments in strict mode (1:34)"
-}
\ No newline at end of file
+  "throws": "arguments is a reserved word in strict mode (1:34)"
+}
diff --git a/test/fixtures/esprima/invalid-syntax/migrated_0195/options.json b/test/fixtures/esprima/invalid-syntax/migrated_0195/options.json
index e606855bd2..3bcd668ab1 100644
--- a/test/fixtures/esprima/invalid-syntax/migrated_0195/options.json
+++ b/test/fixtures/esprima/invalid-syntax/migrated_0195/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Assigning to eval in strict mode (1:32)"
-}
\ No newline at end of file
+  "throws": "eval is a reserved word in strict mode (1:32)"
+}
diff --git a/test/fixtures/esprima/invalid-syntax/migrated_0196/options.json b/test/fixtures/esprima/invalid-syntax/migrated_0196/options.json
index e606855bd2..3bcd668ab1 100644
--- a/test/fixtures/esprima/invalid-syntax/migrated_0196/options.json
+++ b/test/fixtures/esprima/invalid-syntax/migrated_0196/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Assigning to eval in strict mode (1:32)"
-}
\ No newline at end of file
+  "throws": "eval is a reserved word in strict mode (1:32)"
+}
diff --git a/test/fixtures/esprima/invalid-syntax/migrated_0197/options.json b/test/fixtures/esprima/invalid-syntax/migrated_0197/options.json
index d66800268f..04db3a2178 100644
--- a/test/fixtures/esprima/invalid-syntax/migrated_0197/options.json
+++ b/test/fixtures/esprima/invalid-syntax/migrated_0197/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Assigning to arguments in strict mode (1:32)"
-}
\ No newline at end of file
+  "throws": "arguments is a reserved word in strict mode (1:32)"
+}
diff --git a/test/fixtures/esprima/invalid-syntax/migrated_0198/options.json b/test/fixtures/esprima/invalid-syntax/migrated_0198/options.json
index d66800268f..04db3a2178 100644
--- a/test/fixtures/esprima/invalid-syntax/migrated_0198/options.json
+++ b/test/fixtures/esprima/invalid-syntax/migrated_0198/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Assigning to arguments in strict mode (1:32)"
-}
\ No newline at end of file
+  "throws": "arguments is a reserved word in strict mode (1:32)"
+}
diff --git a/test/fixtures/esprima/invalid-syntax/migrated_0199/options.json b/test/fixtures/esprima/invalid-syntax/migrated_0199/options.json
index 74aee2c177..71bbcc0b9c 100644
--- a/test/fixtures/esprima/invalid-syntax/migrated_0199/options.json
+++ b/test/fixtures/esprima/invalid-syntax/migrated_0199/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding eval in strict mode (1:41)"
-}
\ No newline at end of file
+  "throws": "eval is a reserved word in strict mode (1:41)"
+}
diff --git a/test/fixtures/esprima/invalid-syntax/migrated_0200/options.json b/test/fixtures/esprima/invalid-syntax/migrated_0200/options.json
index cb4087319e..544d28f502 100644
--- a/test/fixtures/esprima/invalid-syntax/migrated_0200/options.json
+++ b/test/fixtures/esprima/invalid-syntax/migrated_0200/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding arguments in strict mode (1:41)"
-}
\ No newline at end of file
+  "throws": "arguments is a reserved word in strict mode (1:41)"
+}
diff --git a/test/fixtures/esprima/invalid-syntax/migrated_0201/options.json b/test/fixtures/esprima/invalid-syntax/migrated_0201/options.json
index a49374fb46..bf851387b4 100644
--- a/test/fixtures/esprima/invalid-syntax/migrated_0201/options.json
+++ b/test/fixtures/esprima/invalid-syntax/migrated_0201/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding eval in strict mode (1:9)"
-}
\ No newline at end of file
+  "throws": "eval is a reserved word in strict mode (1:9)"
+}
diff --git a/test/fixtures/esprima/invalid-syntax/migrated_0202/options.json b/test/fixtures/esprima/invalid-syntax/migrated_0202/options.json
index 8a3871a0d1..e4d477b8e4 100644
--- a/test/fixtures/esprima/invalid-syntax/migrated_0202/options.json
+++ b/test/fixtures/esprima/invalid-syntax/migrated_0202/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding arguments in strict mode (1:9)"
-}
\ No newline at end of file
+  "throws": "arguments is a reserved word in strict mode (1:9)"
+}
diff --git a/test/fixtures/esprima/invalid-syntax/migrated_0203/options.json b/test/fixtures/esprima/invalid-syntax/migrated_0203/options.json
index 9c41225e97..f6c8eea4b0 100644
--- a/test/fixtures/esprima/invalid-syntax/migrated_0203/options.json
+++ b/test/fixtures/esprima/invalid-syntax/migrated_0203/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding eval in strict mode (1:42)"
-}
\ No newline at end of file
+  "throws": "eval is a reserved word in strict mode (1:42)"
+}
diff --git a/test/fixtures/esprima/invalid-syntax/migrated_0204/options.json b/test/fixtures/esprima/invalid-syntax/migrated_0204/options.json
index bc7c65ae7b..d26216e0a3 100644
--- a/test/fixtures/esprima/invalid-syntax/migrated_0204/options.json
+++ b/test/fixtures/esprima/invalid-syntax/migrated_0204/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding arguments in strict mode (1:42)"
-}
\ No newline at end of file
+  "throws": "arguments is a reserved word in strict mode (1:42)"
+}
diff --git a/test/fixtures/esprima/invalid-syntax/migrated_0205/options.json b/test/fixtures/esprima/invalid-syntax/migrated_0205/options.json
index 0dcd2b3e58..69e4925a3f 100644
--- a/test/fixtures/esprima/invalid-syntax/migrated_0205/options.json
+++ b/test/fixtures/esprima/invalid-syntax/migrated_0205/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding eval in strict mode (1:10)"
-}
\ No newline at end of file
+  "throws": "eval is a reserved word in strict mode (1:10)"
+}
diff --git a/test/fixtures/esprima/invalid-syntax/migrated_0206/options.json b/test/fixtures/esprima/invalid-syntax/migrated_0206/options.json
index 57ba0014b4..fbdc57cfc8 100644
--- a/test/fixtures/esprima/invalid-syntax/migrated_0206/options.json
+++ b/test/fixtures/esprima/invalid-syntax/migrated_0206/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding arguments in strict mode (1:10)"
-}
\ No newline at end of file
+  "throws": "arguments is a reserved word in strict mode (1:10)"
+}
diff --git a/test/fixtures/esprima/invalid-syntax/migrated_0207/options.json b/test/fixtures/esprima/invalid-syntax/migrated_0207/options.json
index 52cc5e0c10..0306783e6e 100644
--- a/test/fixtures/esprima/invalid-syntax/migrated_0207/options.json
+++ b/test/fixtures/esprima/invalid-syntax/migrated_0207/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding eval in strict mode (1:47)"
-}
\ No newline at end of file
+  "throws": "eval is a reserved word in strict mode (1:47)"
+}
diff --git a/test/fixtures/esprima/invalid-syntax/migrated_0208/options.json b/test/fixtures/esprima/invalid-syntax/migrated_0208/options.json
index 94e937fa7c..c2d1e1a69b 100644
--- a/test/fixtures/esprima/invalid-syntax/migrated_0208/options.json
+++ b/test/fixtures/esprima/invalid-syntax/migrated_0208/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding package in strict mode (1:10)"
-}
\ No newline at end of file
+  "throws": "package is a reserved word in strict mode (1:10)"
+}
diff --git a/test/fixtures/esprima/invalid-syntax/migrated_0209/options.json b/test/fixtures/esprima/invalid-syntax/migrated_0209/options.json
index d6f5d89ca6..92828dc4f1 100644
--- a/test/fixtures/esprima/invalid-syntax/migrated_0209/options.json
+++ b/test/fixtures/esprima/invalid-syntax/migrated_0209/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding eval in strict mode (1:48)"
-}
\ No newline at end of file
+  "throws": "eval is a reserved word in strict mode (1:48)"
+}
diff --git a/test/fixtures/esprima/invalid-syntax/migrated_0210/options.json b/test/fixtures/esprima/invalid-syntax/migrated_0210/options.json
index 74aee2c177..71bbcc0b9c 100644
--- a/test/fixtures/esprima/invalid-syntax/migrated_0210/options.json
+++ b/test/fixtures/esprima/invalid-syntax/migrated_0210/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding eval in strict mode (1:41)"
-}
\ No newline at end of file
+  "throws": "eval is a reserved word in strict mode (1:41)"
+}
diff --git a/test/fixtures/esprima/invalid-syntax/migrated_0211/options.json b/test/fixtures/esprima/invalid-syntax/migrated_0211/options.json
index c181de42a2..241eccc1bf 100644
--- a/test/fixtures/esprima/invalid-syntax/migrated_0211/options.json
+++ b/test/fixtures/esprima/invalid-syntax/migrated_0211/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding eval in strict mode (1:49)"
-}
\ No newline at end of file
+  "throws": "eval is a reserved word in strict mode (1:49)"
+}
diff --git a/test/fixtures/esprima/invalid-syntax/migrated_0212/options.json b/test/fixtures/esprima/invalid-syntax/migrated_0212/options.json
index 8de33328ad..f56e7311d8 100644
--- a/test/fixtures/esprima/invalid-syntax/migrated_0212/options.json
+++ b/test/fixtures/esprima/invalid-syntax/migrated_0212/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding eval in strict mode (1:15)"
-}
\ No newline at end of file
+  "throws": "eval is a reserved word in strict mode (1:15)"
+}
diff --git a/test/fixtures/esprima/invalid-syntax/migrated_0213/options.json b/test/fixtures/esprima/invalid-syntax/migrated_0213/options.json
index e2b36a2437..0e19621951 100644
--- a/test/fixtures/esprima/invalid-syntax/migrated_0213/options.json
+++ b/test/fixtures/esprima/invalid-syntax/migrated_0213/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding arguments in strict mode (1:15)"
-}
\ No newline at end of file
+  "throws": "arguments is a reserved word in strict mode (1:15)"
+}
diff --git a/test/fixtures/esprima/invalid-syntax/migrated_0214/options.json b/test/fixtures/esprima/invalid-syntax/migrated_0214/options.json
index d6f5d89ca6..92828dc4f1 100644
--- a/test/fixtures/esprima/invalid-syntax/migrated_0214/options.json
+++ b/test/fixtures/esprima/invalid-syntax/migrated_0214/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding eval in strict mode (1:48)"
-}
\ No newline at end of file
+  "throws": "eval is a reserved word in strict mode (1:48)"
+}
diff --git a/test/fixtures/esprima/invalid-syntax/migrated_0215/options.json b/test/fixtures/esprima/invalid-syntax/migrated_0215/options.json
index 8ee11e66ca..e9f6bf4d32 100644
--- a/test/fixtures/esprima/invalid-syntax/migrated_0215/options.json
+++ b/test/fixtures/esprima/invalid-syntax/migrated_0215/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding arguments in strict mode (1:48)"
-}
\ No newline at end of file
+  "throws": "arguments is a reserved word in strict mode (1:48)"
+}
diff --git a/test/fixtures/esprima/invalid-syntax/migrated_0224/options.json b/test/fixtures/esprima/invalid-syntax/migrated_0224/options.json
index 570ca31728..2748b9f03d 100644
--- a/test/fixtures/esprima/invalid-syntax/migrated_0224/options.json
+++ b/test/fixtures/esprima/invalid-syntax/migrated_0224/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding implements in strict mode (1:37)"
+  "throws": "implements is a reserved word in strict mode (1:37)"
 }
diff --git a/test/fixtures/esprima/invalid-syntax/migrated_0225/options.json b/test/fixtures/esprima/invalid-syntax/migrated_0225/options.json
index dfe4eddc2a..6efaf057ca 100644
--- a/test/fixtures/esprima/invalid-syntax/migrated_0225/options.json
+++ b/test/fixtures/esprima/invalid-syntax/migrated_0225/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding interface in strict mode (1:37)"
+  "throws": "interface is a reserved word in strict mode (1:37)"
 }
diff --git a/test/fixtures/esprima/invalid-syntax/migrated_0226/options.json b/test/fixtures/esprima/invalid-syntax/migrated_0226/options.json
index 766ddb41ca..61578ad8f8 100644
--- a/test/fixtures/esprima/invalid-syntax/migrated_0226/options.json
+++ b/test/fixtures/esprima/invalid-syntax/migrated_0226/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding package in strict mode (1:37)"
+  "throws": "package is a reserved word in strict mode (1:37)"
 }
diff --git a/test/fixtures/esprima/invalid-syntax/migrated_0227/options.json b/test/fixtures/esprima/invalid-syntax/migrated_0227/options.json
index 9a7c12e0a6..da502d0daa 100644
--- a/test/fixtures/esprima/invalid-syntax/migrated_0227/options.json
+++ b/test/fixtures/esprima/invalid-syntax/migrated_0227/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding private in strict mode (1:37)"
+  "throws": "private is a reserved word in strict mode (1:37)"
 }
diff --git a/test/fixtures/esprima/invalid-syntax/migrated_0228/options.json b/test/fixtures/esprima/invalid-syntax/migrated_0228/options.json
index ba43694c8d..6fd44c0e1b 100644
--- a/test/fixtures/esprima/invalid-syntax/migrated_0228/options.json
+++ b/test/fixtures/esprima/invalid-syntax/migrated_0228/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding protected in strict mode (1:37)"
+  "throws": "protected is a reserved word in strict mode (1:37)"
 }
diff --git a/test/fixtures/esprima/invalid-syntax/migrated_0229/options.json b/test/fixtures/esprima/invalid-syntax/migrated_0229/options.json
index b1dbd863ed..3a41c740ea 100644
--- a/test/fixtures/esprima/invalid-syntax/migrated_0229/options.json
+++ b/test/fixtures/esprima/invalid-syntax/migrated_0229/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding public in strict mode (1:37)"
+  "throws": "public is a reserved word in strict mode (1:37)"
 }
diff --git a/test/fixtures/esprima/invalid-syntax/migrated_0230/options.json b/test/fixtures/esprima/invalid-syntax/migrated_0230/options.json
index 75ad83ddbb..764205122e 100644
--- a/test/fixtures/esprima/invalid-syntax/migrated_0230/options.json
+++ b/test/fixtures/esprima/invalid-syntax/migrated_0230/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding static in strict mode (1:37)"
+  "throws": "static is a reserved word in strict mode (1:37)"
 }
diff --git a/test/fixtures/esprima/invalid-syntax/migrated_0233/options.json b/test/fixtures/esprima/invalid-syntax/migrated_0233/options.json
index 07a8c1c0f1..e316c4fc64 100644
--- a/test/fixtures/esprima/invalid-syntax/migrated_0233/options.json
+++ b/test/fixtures/esprima/invalid-syntax/migrated_0233/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding static in strict mode (1:15)"
-}
\ No newline at end of file
+  "throws": "static is a reserved word in strict mode (1:15)"
+}
diff --git a/test/fixtures/esprima/invalid-syntax/migrated_0234/options.json b/test/fixtures/esprima/invalid-syntax/migrated_0234/options.json
index f7524a3327..9b6fddd2eb 100644
--- a/test/fixtures/esprima/invalid-syntax/migrated_0234/options.json
+++ b/test/fixtures/esprima/invalid-syntax/migrated_0234/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding static in strict mode (1:9)"
-}
\ No newline at end of file
+  "throws": "static is a reserved word in strict mode (1:9)"
+}
diff --git a/test/fixtures/esprima/invalid-syntax/migrated_0235/options.json b/test/fixtures/esprima/invalid-syntax/migrated_0235/options.json
index a49374fb46..bf851387b4 100644
--- a/test/fixtures/esprima/invalid-syntax/migrated_0235/options.json
+++ b/test/fixtures/esprima/invalid-syntax/migrated_0235/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding eval in strict mode (1:9)"
-}
\ No newline at end of file
+  "throws": "eval is a reserved word in strict mode (1:9)"
+}
diff --git a/test/fixtures/esprima/invalid-syntax/migrated_0236/options.json b/test/fixtures/esprima/invalid-syntax/migrated_0236/options.json
index 8a3871a0d1..e4d477b8e4 100644
--- a/test/fixtures/esprima/invalid-syntax/migrated_0236/options.json
+++ b/test/fixtures/esprima/invalid-syntax/migrated_0236/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding arguments in strict mode (1:9)"
-}
\ No newline at end of file
+  "throws": "arguments is a reserved word in strict mode (1:9)"
+}
diff --git a/test/fixtures/esprima/invalid-syntax/migrated_0239/options.json b/test/fixtures/esprima/invalid-syntax/migrated_0239/options.json
index 69a9237df8..a2eac88ba6 100644
--- a/test/fixtures/esprima/invalid-syntax/migrated_0239/options.json
+++ b/test/fixtures/esprima/invalid-syntax/migrated_0239/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "The keyword 'static' is reserved (1:23)"
+  "throws": "static is a reserved word in strict mode (1:23)"
 }
diff --git a/test/fixtures/esprima/invalid-syntax/migrated_0241/options.json b/test/fixtures/esprima/invalid-syntax/migrated_0241/options.json
index 301643713f..0bb96c96d8 100644
--- a/test/fixtures/esprima/invalid-syntax/migrated_0241/options.json
+++ b/test/fixtures/esprima/invalid-syntax/migrated_0241/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding eval in strict mode (1:11)"
-}
\ No newline at end of file
+  "throws": "eval is a reserved word in strict mode (1:11)"
+}
diff --git a/test/fixtures/esprima/invalid-syntax/migrated_0242/options.json b/test/fixtures/esprima/invalid-syntax/migrated_0242/options.json
index 31ebd9508d..7551a61b9e 100644
--- a/test/fixtures/esprima/invalid-syntax/migrated_0242/options.json
+++ b/test/fixtures/esprima/invalid-syntax/migrated_0242/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding package in strict mode (1:11)"
-}
\ No newline at end of file
+  "throws": "package is a reserved word in strict mode (1:11)"
+}
diff --git a/test/fixtures/esprima/invalid-syntax/migrated_0246/options.json b/test/fixtures/esprima/invalid-syntax/migrated_0246/options.json
index c9df15d6ef..b52d2d2e15 100644
--- a/test/fixtures/esprima/invalid-syntax/migrated_0246/options.json
+++ b/test/fixtures/esprima/invalid-syntax/migrated_0246/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding eval in strict mode (1:12)"
-}
\ No newline at end of file
+  "throws": "eval is a reserved word in strict mode (1:12)"
+}
diff --git a/test/fixtures/esprima/invalid-syntax/migrated_0247/options.json b/test/fixtures/esprima/invalid-syntax/migrated_0247/options.json
index 87abf59529..7b80f0e455 100644
--- a/test/fixtures/esprima/invalid-syntax/migrated_0247/options.json
+++ b/test/fixtures/esprima/invalid-syntax/migrated_0247/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "Binding package in strict mode (1:12)"
-}
\ No newline at end of file
+  "throws": "package is a reserved word in strict mode (1:12)"
+}
diff --git a/test/fixtures/esprima/invalid-syntax/migrated_0278/options.json b/test/fixtures/esprima/invalid-syntax/migrated_0278/options.json
index 8a55b8365f..a07e958c4d 100644
--- a/test/fixtures/esprima/invalid-syntax/migrated_0278/options.json
+++ b/test/fixtures/esprima/invalid-syntax/migrated_0278/options.json
@@ -1,3 +1,3 @@
 {
-  "throws": "The keyword 'static' is reserved (1:17)"
+  "throws": "static is a reserved word in strict mode (1:17)"
 }