diff --git a/escodegen.js b/escodegen.js
index 6fe6646d..a23b7c06 100644
--- a/escodegen.js
+++ b/escodegen.js
@@ -983,7 +983,7 @@
             result.push('[');
         }
 
-        result.push(this.generateExpression(expr, Precedence.Sequence, E_TTT));
+        result.push(this.generateExpression(expr, Precedence.Assignment, E_TTT));
 
         if (computed) {
             result.push(']');
diff --git a/test/compare-acorn-es6/class-declaration.expected.js b/test/compare-acorn-es6/class-declaration.expected.js
new file mode 100644
index 00000000..abc86a65
--- /dev/null
+++ b/test/compare-acorn-es6/class-declaration.expected.js
@@ -0,0 +1,12 @@
+class ComputedKey {
+    [n1 + n2]() {
+    }
+}
+class AssignmentExpressionAsKey {
+    [n1 = n2]() {
+    }
+}
+class SequenceExpressionAsKey {
+    [(n1, n2)]() {
+    }
+}
diff --git a/test/compare-acorn-es6/class-declaration.expected.min.js b/test/compare-acorn-es6/class-declaration.expected.min.js
new file mode 100644
index 00000000..496f2f81
--- /dev/null
+++ b/test/compare-acorn-es6/class-declaration.expected.min.js
@@ -0,0 +1 @@
+class ComputedKey{[n1+n2](){}}class AssignmentExpressionAsKey{[n1=n2](){}}class SequenceExpressionAsKey{[(n1,n2)](){}}
diff --git a/test/compare-acorn-es6/class-declaration.js b/test/compare-acorn-es6/class-declaration.js
new file mode 100644
index 00000000..db15285f
--- /dev/null
+++ b/test/compare-acorn-es6/class-declaration.js
@@ -0,0 +1,9 @@
+class ComputedKey {
+    [n1 + n2]() {}
+}
+class AssignmentExpressionAsKey {
+    [n1 = n2]() {}
+}
+class SequenceExpressionAsKey {
+    [(n1, n2)]() {}
+}
\ No newline at end of file