diff --git a/package.json b/package.json
index 16d98f3a..134f1432 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
   },
   "license": "BSD-2-Clause",
   "dependencies": {
-    "acorn": "^3.1.0",
+    "acorn": "^3.2.0",
     "acorn-jsx": "^3.0.0"
   },
   "devDependencies": {
diff --git a/tests/fixtures/ecma-version/6/objectLiteralShorthandProperties/shorthand-properties-keyword.result.js b/tests/fixtures/ecma-version/6/objectLiteralShorthandProperties/shorthand-properties-keyword.result.js
new file mode 100644
index 00000000..47911f77
--- /dev/null
+++ b/tests/fixtures/ecma-version/6/objectLiteralShorthandProperties/shorthand-properties-keyword.result.js
@@ -0,0 +1,6 @@
+module.exports = {
+    "index": 14,
+    "lineNumber": 2,
+    "column": 5,
+    "message": "'this' can not be used as shorthand property"
+};
\ No newline at end of file
diff --git a/tests/fixtures/ecma-version/6/objectLiteralShorthandProperties/shorthand-properties-keyword.src.js b/tests/fixtures/ecma-version/6/objectLiteralShorthandProperties/shorthand-properties-keyword.src.js
new file mode 100644
index 00000000..21142d4b
--- /dev/null
+++ b/tests/fixtures/ecma-version/6/objectLiteralShorthandProperties/shorthand-properties-keyword.src.js
@@ -0,0 +1,3 @@
+var x = {
+    this
+};
diff --git a/tests/fixtures/ecma-version/6/regexUFlag/regex-u-extended-escape.result.js b/tests/fixtures/ecma-version/6/regexUFlag/regex-u-extended-escape.result.js
index f111ee8a..5939f86b 100644
--- a/tests/fixtures/ecma-version/6/regexUFlag/regex-u-extended-escape.result.js
+++ b/tests/fixtures/ecma-version/6/regexUFlag/regex-u-extended-escape.result.js
@@ -82,7 +82,7 @@ module.exports = {
                             8,
                             40
                         ],
-                        "value": null,
+                        "value": {},
                         "raw": "/[\\u{0000000000000061}-\\u{7A}]/u",
                         "regex": {
                             "pattern": "[\\u{0000000000000061}-\\u{7A}]",
diff --git a/tests/fixtures/ecma-version/6/regexUFlag/regex-u-invalid-extended-escape.result.js b/tests/fixtures/ecma-version/6/regexUFlag/regex-u-invalid-extended-escape.result.js
index 8370cfa6..b52c51b2 100644
--- a/tests/fixtures/ecma-version/6/regexUFlag/regex-u-invalid-extended-escape.result.js
+++ b/tests/fixtures/ecma-version/6/regexUFlag/regex-u-invalid-extended-escape.result.js
@@ -1,6 +1,6 @@
 module.exports = {
-    "index": 12,
+    "index": 9,
     "lineNumber": 1,
-    "column": 13,
-    "message": "Code point out of bounds"
+    "column": 10,
+    "message": "Error parsing regular expression: Invalid regular expression: /\\u{110000}/: Invalid unicode escape"
 };
\ No newline at end of file
diff --git a/tests/fixtures/ecma-version/6/regexUFlag/regex-u-simple.result.js b/tests/fixtures/ecma-version/6/regexUFlag/regex-u-simple.result.js
index ba8560d7..17b9f254 100644
--- a/tests/fixtures/ecma-version/6/regexUFlag/regex-u-simple.result.js
+++ b/tests/fixtures/ecma-version/6/regexUFlag/regex-u-simple.result.js
@@ -82,7 +82,7 @@ module.exports = {
                             10,
                             16
                         ],
-                        "value": null,
+                        "value": {},
                         "raw": "/foo/u",
                         "regex": {
                             "pattern": "foo",
diff --git a/tests/fixtures/ecma-version/6/regexYFlag/regexp-y-simple.result.js b/tests/fixtures/ecma-version/6/regexYFlag/regexp-y-simple.result.js
index e0bf35b6..04635544 100644
--- a/tests/fixtures/ecma-version/6/regexYFlag/regexp-y-simple.result.js
+++ b/tests/fixtures/ecma-version/6/regexYFlag/regexp-y-simple.result.js
@@ -82,7 +82,7 @@ module.exports = {
                             10,
                             16
                         ],
-                        "value": null,
+                        "value": {},
                         "raw": "/foo/y",
                         "regex": {
                             "pattern": "foo",