diff --git a/lib/babel/transformation/transformers/es6/classes.js b/lib/babel/transformation/transformers/es6/classes.js
index de547859f3..6d1705bffa 100644
--- a/lib/babel/transformation/transformers/es6/classes.js
+++ b/lib/babel/transformation/transformers/es6/classes.js
@@ -159,7 +159,7 @@ ClassTransformer.prototype.buildBody = function () {
       }, true);
       replaceSupers.replace();
 
-      if (node.key.name === "constructor") {
+      if ((!node.computed && t.isIdentifier(node.key, { name: "constructor" })) || t.isLiteral(node.key, { value: "constructor" })) {
         this.pushConstructor(node);
       } else {
         this.pushMethod(node);