diff --git a/src/parser/expression.js b/src/parser/expression.js
index 9335983b3e..61f458aa66 100644
--- a/src/parser/expression.js
+++ b/src/parser/expression.js
@@ -50,7 +50,7 @@ pp.checkPropClash = function (prop, propHash) {
       return;
   }
 
-  if (name === "__proto__" && prop.kind === "init") {
+  if (name === "__proto__" && !prop.kind) {
     if (propHash.proto) this.raise(key.start, "Redefinition of __proto__ property");
     propHash.proto = true;
   }
diff --git a/test/fixtures/es2015/uncategorised/.348/actual.js b/test/fixtures/es2015/uncategorised/348/actual.js
similarity index 100%
rename from test/fixtures/es2015/uncategorised/.348/actual.js
rename to test/fixtures/es2015/uncategorised/348/actual.js
diff --git a/test/fixtures/es2015/uncategorised/.348/expected.json b/test/fixtures/es2015/uncategorised/348/expected.json
similarity index 100%
rename from test/fixtures/es2015/uncategorised/.348/expected.json
rename to test/fixtures/es2015/uncategorised/348/expected.json
diff --git a/test/fixtures/es2015/uncategorised/.348/options.json b/test/fixtures/es2015/uncategorised/348/options.json
similarity index 100%
rename from test/fixtures/es2015/uncategorised/.348/options.json
rename to test/fixtures/es2015/uncategorised/348/options.json
diff --git a/test/fixtures/es2015/uncategorised/.349/actual.js b/test/fixtures/es2015/uncategorised/349/actual.js
similarity index 100%
rename from test/fixtures/es2015/uncategorised/.349/actual.js
rename to test/fixtures/es2015/uncategorised/349/actual.js
diff --git a/test/fixtures/es2015/uncategorised/.349/expected.json b/test/fixtures/es2015/uncategorised/349/expected.json
similarity index 100%
rename from test/fixtures/es2015/uncategorised/.349/expected.json
rename to test/fixtures/es2015/uncategorised/349/expected.json
diff --git a/test/fixtures/es2015/uncategorised/.349/options.json b/test/fixtures/es2015/uncategorised/349/options.json
similarity index 100%
rename from test/fixtures/es2015/uncategorised/.349/options.json
rename to test/fixtures/es2015/uncategorised/349/options.json
diff --git a/test/fixtures/es2015/uncategorised/.353/actual.js b/test/fixtures/es2015/uncategorised/353/actual.js
similarity index 100%
rename from test/fixtures/es2015/uncategorised/.353/actual.js
rename to test/fixtures/es2015/uncategorised/353/actual.js
diff --git a/test/fixtures/es2015/uncategorised/.353/expected.json b/test/fixtures/es2015/uncategorised/353/expected.json
similarity index 100%
rename from test/fixtures/es2015/uncategorised/.353/expected.json
rename to test/fixtures/es2015/uncategorised/353/expected.json
diff --git a/test/fixtures/es2015/uncategorised/.353/options.json b/test/fixtures/es2015/uncategorised/353/options.json
similarity index 100%
rename from test/fixtures/es2015/uncategorised/.353/options.json
rename to test/fixtures/es2015/uncategorised/353/options.json
diff --git a/test/fixtures/esprima/es2015-object-initialiser/.invalid-proto-getter-literal-identifier/actual.js b/test/fixtures/esprima/es2015-object-initialiser/invalid-proto-getter-literal-identifier/actual.js
similarity index 100%
rename from test/fixtures/esprima/es2015-object-initialiser/.invalid-proto-getter-literal-identifier/actual.js
rename to test/fixtures/esprima/es2015-object-initialiser/invalid-proto-getter-literal-identifier/actual.js
diff --git a/test/fixtures/esprima/es2015-object-initialiser/.invalid-proto-getter-literal-identifier/expected.json b/test/fixtures/esprima/es2015-object-initialiser/invalid-proto-getter-literal-identifier/expected.json
similarity index 100%
rename from test/fixtures/esprima/es2015-object-initialiser/.invalid-proto-getter-literal-identifier/expected.json
rename to test/fixtures/esprima/es2015-object-initialiser/invalid-proto-getter-literal-identifier/expected.json
diff --git a/test/fixtures/esprima/es2015-object-initialiser/.invalid-proto-getter-literal-identifier/options.json b/test/fixtures/esprima/es2015-object-initialiser/invalid-proto-getter-literal-identifier/options.json
similarity index 100%
rename from test/fixtures/esprima/es2015-object-initialiser/.invalid-proto-getter-literal-identifier/options.json
rename to test/fixtures/esprima/es2015-object-initialiser/invalid-proto-getter-literal-identifier/options.json
diff --git a/test/fixtures/esprima/es2015-object-initialiser/.invalid-proto-identifier-literal/actual.js b/test/fixtures/esprima/es2015-object-initialiser/invalid-proto-identifier-literal/actual.js
similarity index 100%
rename from test/fixtures/esprima/es2015-object-initialiser/.invalid-proto-identifier-literal/actual.js
rename to test/fixtures/esprima/es2015-object-initialiser/invalid-proto-identifier-literal/actual.js
diff --git a/test/fixtures/esprima/es2015-object-initialiser/.invalid-proto-identifier-literal/expected.json b/test/fixtures/esprima/es2015-object-initialiser/invalid-proto-identifier-literal/expected.json
similarity index 100%
rename from test/fixtures/esprima/es2015-object-initialiser/.invalid-proto-identifier-literal/expected.json
rename to test/fixtures/esprima/es2015-object-initialiser/invalid-proto-identifier-literal/expected.json
diff --git a/test/fixtures/esprima/es2015-object-initialiser/.invalid-proto-identifier-literal/options.json b/test/fixtures/esprima/es2015-object-initialiser/invalid-proto-identifier-literal/options.json
similarity index 100%
rename from test/fixtures/esprima/es2015-object-initialiser/.invalid-proto-identifier-literal/options.json
rename to test/fixtures/esprima/es2015-object-initialiser/invalid-proto-identifier-literal/options.json
diff --git a/test/fixtures/esprima/es2015-object-initialiser/.invalid-proto-identifier-shorthand/actual.js b/test/fixtures/esprima/es2015-object-initialiser/invalid-proto-identifier-shorthand/actual.js
similarity index 100%
rename from test/fixtures/esprima/es2015-object-initialiser/.invalid-proto-identifier-shorthand/actual.js
rename to test/fixtures/esprima/es2015-object-initialiser/invalid-proto-identifier-shorthand/actual.js
diff --git a/test/fixtures/esprima/es2015-object-initialiser/.invalid-proto-identifier-shorthand/expected.json b/test/fixtures/esprima/es2015-object-initialiser/invalid-proto-identifier-shorthand/expected.json
similarity index 100%
rename from test/fixtures/esprima/es2015-object-initialiser/.invalid-proto-identifier-shorthand/expected.json
rename to test/fixtures/esprima/es2015-object-initialiser/invalid-proto-identifier-shorthand/expected.json
diff --git a/test/fixtures/esprima/es2015-object-initialiser/.invalid-proto-identifier-shorthand/options.json b/test/fixtures/esprima/es2015-object-initialiser/invalid-proto-identifier-shorthand/options.json
similarity index 100%
rename from test/fixtures/esprima/es2015-object-initialiser/.invalid-proto-identifier-shorthand/options.json
rename to test/fixtures/esprima/es2015-object-initialiser/invalid-proto-identifier-shorthand/options.json
diff --git a/test/fixtures/esprima/es2015-object-initialiser/.invalid-proto-identifiers/actual.js b/test/fixtures/esprima/es2015-object-initialiser/invalid-proto-identifiers/actual.js
similarity index 100%
rename from test/fixtures/esprima/es2015-object-initialiser/.invalid-proto-identifiers/actual.js
rename to test/fixtures/esprima/es2015-object-initialiser/invalid-proto-identifiers/actual.js
diff --git a/test/fixtures/esprima/es2015-object-initialiser/.invalid-proto-identifiers/expected.json b/test/fixtures/esprima/es2015-object-initialiser/invalid-proto-identifiers/expected.json
similarity index 100%
rename from test/fixtures/esprima/es2015-object-initialiser/.invalid-proto-identifiers/expected.json
rename to test/fixtures/esprima/es2015-object-initialiser/invalid-proto-identifiers/expected.json
diff --git a/test/fixtures/esprima/es2015-object-initialiser/.invalid-proto-identifiers/options.json b/test/fixtures/esprima/es2015-object-initialiser/invalid-proto-identifiers/options.json
similarity index 100%
rename from test/fixtures/esprima/es2015-object-initialiser/.invalid-proto-identifiers/options.json
rename to test/fixtures/esprima/es2015-object-initialiser/invalid-proto-identifiers/options.json
diff --git a/test/fixtures/esprima/es2015-object-initialiser/.invalid-proto-literal-identifier/actual.js b/test/fixtures/esprima/es2015-object-initialiser/invalid-proto-literal-identifier/actual.js
similarity index 100%
rename from test/fixtures/esprima/es2015-object-initialiser/.invalid-proto-literal-identifier/actual.js
rename to test/fixtures/esprima/es2015-object-initialiser/invalid-proto-literal-identifier/actual.js
diff --git a/test/fixtures/esprima/es2015-object-initialiser/.invalid-proto-literal-identifier/expected.json b/test/fixtures/esprima/es2015-object-initialiser/invalid-proto-literal-identifier/expected.json
similarity index 100%
rename from test/fixtures/esprima/es2015-object-initialiser/.invalid-proto-literal-identifier/expected.json
rename to test/fixtures/esprima/es2015-object-initialiser/invalid-proto-literal-identifier/expected.json
diff --git a/test/fixtures/esprima/es2015-object-initialiser/.invalid-proto-literal-identifier/options.json b/test/fixtures/esprima/es2015-object-initialiser/invalid-proto-literal-identifier/options.json
similarity index 100%
rename from test/fixtures/esprima/es2015-object-initialiser/.invalid-proto-literal-identifier/options.json
rename to test/fixtures/esprima/es2015-object-initialiser/invalid-proto-literal-identifier/options.json
diff --git a/test/fixtures/esprima/es2015-object-initialiser/.invalid-proto-literal-shorthand/actual.js b/test/fixtures/esprima/es2015-object-initialiser/invalid-proto-literal-shorthand/actual.js
similarity index 100%
rename from test/fixtures/esprima/es2015-object-initialiser/.invalid-proto-literal-shorthand/actual.js
rename to test/fixtures/esprima/es2015-object-initialiser/invalid-proto-literal-shorthand/actual.js
diff --git a/test/fixtures/esprima/es2015-object-initialiser/.invalid-proto-literal-shorthand/expected.json b/test/fixtures/esprima/es2015-object-initialiser/invalid-proto-literal-shorthand/expected.json
similarity index 100%
rename from test/fixtures/esprima/es2015-object-initialiser/.invalid-proto-literal-shorthand/expected.json
rename to test/fixtures/esprima/es2015-object-initialiser/invalid-proto-literal-shorthand/expected.json
diff --git a/test/fixtures/esprima/es2015-object-initialiser/.invalid-proto-literal-shorthand/options.json b/test/fixtures/esprima/es2015-object-initialiser/invalid-proto-literal-shorthand/options.json
similarity index 100%
rename from test/fixtures/esprima/es2015-object-initialiser/.invalid-proto-literal-shorthand/options.json
rename to test/fixtures/esprima/es2015-object-initialiser/invalid-proto-literal-shorthand/options.json
diff --git a/test/fixtures/esprima/es2015-object-initialiser/.invalid-proto-literals/actual.js b/test/fixtures/esprima/es2015-object-initialiser/invalid-proto-literals/actual.js
similarity index 100%
rename from test/fixtures/esprima/es2015-object-initialiser/.invalid-proto-literals/actual.js
rename to test/fixtures/esprima/es2015-object-initialiser/invalid-proto-literals/actual.js
diff --git a/test/fixtures/esprima/es2015-object-initialiser/.invalid-proto-literals/expected.json b/test/fixtures/esprima/es2015-object-initialiser/invalid-proto-literals/expected.json
similarity index 100%
rename from test/fixtures/esprima/es2015-object-initialiser/.invalid-proto-literals/expected.json
rename to test/fixtures/esprima/es2015-object-initialiser/invalid-proto-literals/expected.json
diff --git a/test/fixtures/esprima/es2015-object-initialiser/.invalid-proto-literals/options.json b/test/fixtures/esprima/es2015-object-initialiser/invalid-proto-literals/options.json
similarity index 100%
rename from test/fixtures/esprima/es2015-object-initialiser/.invalid-proto-literals/options.json
rename to test/fixtures/esprima/es2015-object-initialiser/invalid-proto-literals/options.json
diff --git a/test/fixtures/esprima/es2015-object-initialiser/.invalid-proto-setter-literal-identifier/actual.js b/test/fixtures/esprima/es2015-object-initialiser/invalid-proto-setter-literal-identifier/actual.js
similarity index 100%
rename from test/fixtures/esprima/es2015-object-initialiser/.invalid-proto-setter-literal-identifier/actual.js
rename to test/fixtures/esprima/es2015-object-initialiser/invalid-proto-setter-literal-identifier/actual.js
diff --git a/test/fixtures/esprima/es2015-object-initialiser/.invalid-proto-setter-literal-identifier/expected.json b/test/fixtures/esprima/es2015-object-initialiser/invalid-proto-setter-literal-identifier/expected.json
similarity index 100%
rename from test/fixtures/esprima/es2015-object-initialiser/.invalid-proto-setter-literal-identifier/expected.json
rename to test/fixtures/esprima/es2015-object-initialiser/invalid-proto-setter-literal-identifier/expected.json
diff --git a/test/fixtures/esprima/es2015-object-initialiser/.invalid-proto-setter-literal-identifier/options.json b/test/fixtures/esprima/es2015-object-initialiser/invalid-proto-setter-literal-identifier/options.json
similarity index 100%
rename from test/fixtures/esprima/es2015-object-initialiser/.invalid-proto-setter-literal-identifier/options.json
rename to test/fixtures/esprima/es2015-object-initialiser/invalid-proto-setter-literal-identifier/options.json
diff --git a/test/fixtures/esprima/es2015-object-initialiser/.invalid-proto-shorthand-identifier/actual.js b/test/fixtures/esprima/es2015-object-initialiser/invalid-proto-shorthand-identifier/actual.js
similarity index 100%
rename from test/fixtures/esprima/es2015-object-initialiser/.invalid-proto-shorthand-identifier/actual.js
rename to test/fixtures/esprima/es2015-object-initialiser/invalid-proto-shorthand-identifier/actual.js
diff --git a/test/fixtures/esprima/es2015-object-initialiser/.invalid-proto-shorthand-identifier/expected.json b/test/fixtures/esprima/es2015-object-initialiser/invalid-proto-shorthand-identifier/expected.json
similarity index 100%
rename from test/fixtures/esprima/es2015-object-initialiser/.invalid-proto-shorthand-identifier/expected.json
rename to test/fixtures/esprima/es2015-object-initialiser/invalid-proto-shorthand-identifier/expected.json
diff --git a/test/fixtures/esprima/es2015-object-initialiser/.invalid-proto-shorthand-identifier/options.json b/test/fixtures/esprima/es2015-object-initialiser/invalid-proto-shorthand-identifier/options.json
similarity index 100%
rename from test/fixtures/esprima/es2015-object-initialiser/.invalid-proto-shorthand-identifier/options.json
rename to test/fixtures/esprima/es2015-object-initialiser/invalid-proto-shorthand-identifier/options.json
diff --git a/test/fixtures/esprima/es2015-object-initialiser/.invalid-proto-shorthand-literal/actual.js b/test/fixtures/esprima/es2015-object-initialiser/invalid-proto-shorthand-literal/actual.js
similarity index 100%
rename from test/fixtures/esprima/es2015-object-initialiser/.invalid-proto-shorthand-literal/actual.js
rename to test/fixtures/esprima/es2015-object-initialiser/invalid-proto-shorthand-literal/actual.js
diff --git a/test/fixtures/esprima/es2015-object-initialiser/.invalid-proto-shorthand-literal/expected.json b/test/fixtures/esprima/es2015-object-initialiser/invalid-proto-shorthand-literal/expected.json
similarity index 100%
rename from test/fixtures/esprima/es2015-object-initialiser/.invalid-proto-shorthand-literal/expected.json
rename to test/fixtures/esprima/es2015-object-initialiser/invalid-proto-shorthand-literal/expected.json
diff --git a/test/fixtures/esprima/es2015-object-initialiser/.invalid-proto-shorthand-literal/options.json b/test/fixtures/esprima/es2015-object-initialiser/invalid-proto-shorthand-literal/options.json
similarity index 100%
rename from test/fixtures/esprima/es2015-object-initialiser/.invalid-proto-shorthand-literal/options.json
rename to test/fixtures/esprima/es2015-object-initialiser/invalid-proto-shorthand-literal/options.json
diff --git a/test/fixtures/esprima/es2015-object-initialiser/.invalid-proto-shorthands/actual.js b/test/fixtures/esprima/es2015-object-initialiser/invalid-proto-shorthands/actual.js
similarity index 100%
rename from test/fixtures/esprima/es2015-object-initialiser/.invalid-proto-shorthands/actual.js
rename to test/fixtures/esprima/es2015-object-initialiser/invalid-proto-shorthands/actual.js
diff --git a/test/fixtures/esprima/es2015-object-initialiser/.invalid-proto-shorthands/expected.json b/test/fixtures/esprima/es2015-object-initialiser/invalid-proto-shorthands/expected.json
similarity index 100%
rename from test/fixtures/esprima/es2015-object-initialiser/.invalid-proto-shorthands/expected.json
rename to test/fixtures/esprima/es2015-object-initialiser/invalid-proto-shorthands/expected.json
diff --git a/test/fixtures/esprima/es2015-object-initialiser/.invalid-proto-shorthands/options.json b/test/fixtures/esprima/es2015-object-initialiser/invalid-proto-shorthands/options.json
similarity index 100%
rename from test/fixtures/esprima/es2015-object-initialiser/.invalid-proto-shorthands/options.json
rename to test/fixtures/esprima/es2015-object-initialiser/invalid-proto-shorthands/options.json
diff --git a/test/fixtures/esprima/invalid-syntax/.migrated_0250/actual.js b/test/fixtures/esprima/invalid-syntax/migrated_0250/actual.js
similarity index 100%
rename from test/fixtures/esprima/invalid-syntax/.migrated_0250/actual.js
rename to test/fixtures/esprima/invalid-syntax/migrated_0250/actual.js
diff --git a/test/fixtures/esprima/invalid-syntax/.migrated_0250/expected.json b/test/fixtures/esprima/invalid-syntax/migrated_0250/expected.json
similarity index 100%
rename from test/fixtures/esprima/invalid-syntax/.migrated_0250/expected.json
rename to test/fixtures/esprima/invalid-syntax/migrated_0250/expected.json
diff --git a/test/fixtures/esprima/invalid-syntax/.migrated_0250/options.json b/test/fixtures/esprima/invalid-syntax/migrated_0250/options.json
similarity index 100%
rename from test/fixtures/esprima/invalid-syntax/.migrated_0250/options.json
rename to test/fixtures/esprima/invalid-syntax/migrated_0250/options.json