diff --git a/eslint/babel-eslint-parser/package.json b/eslint/babel-eslint-parser/package.json
index ace66a9191..83923ac490 100644
--- a/eslint/babel-eslint-parser/package.json
+++ b/eslint/babel-eslint-parser/package.json
@@ -8,7 +8,7 @@
     "url": "https://github.com/babel/babel-eslint.git"
   },
   "dependencies": {
-    "acorn-to-esprima": "^2.0.3",
+    "acorn-to-esprima": "^2.0.4",
     "babel-traverse": "^6.0.20",
     "babel-types": "^6.0.19",
     "babylon": "^6.0.18",
diff --git a/eslint/babel-eslint-parser/test/babel-eslint.js b/eslint/babel-eslint-parser/test/babel-eslint.js
index 3c2782dbb7..dea774eb2e 100644
--- a/eslint/babel-eslint-parser/test/babel-eslint.js
+++ b/eslint/babel-eslint-parser/test/babel-eslint.js
@@ -432,6 +432,16 @@ describe("acorn-to-esprima", function () {
           "}",
         "}"
       ].join("\n"));
+      parseAndAssertSame([
+        "var B = {",
+            "get x () {",
+                "return this.ecks;",
+            "},",
+            "set x (ecks) {",
+                "this.ecks = ecks;",
+            "}",
+        "};"
+      ].join("\n"));
     });
   });
 });
diff --git a/eslint/babel-eslint-parser/test/non-regression.js b/eslint/babel-eslint-parser/test/non-regression.js
index 0e7559df3b..af887aa4a7 100644
--- a/eslint/babel-eslint-parser/test/non-regression.js
+++ b/eslint/babel-eslint-parser/test/non-regression.js
@@ -1304,4 +1304,31 @@ describe("verify", function () {
       []
     )
   });
+
+  it("getter/setter #218", function () {
+    verifyAndAssertMessages([
+        "class Person {",
+          "set a (v) { }",
+        "}"
+      ].join("\n"),
+      { "space-before-function-paren": 1, "space-before-keywords": 1, "indent": 1 },
+      []
+    )
+  });
+
+  it("getter/setter #220", function () {
+    verifyAndAssertMessages([
+        "var B = {",
+            "get x () {",
+                "return this.ecks;",
+            "},",
+            "set x (ecks) {",
+                "this.ecks = ecks;",
+            "}",
+        "};"
+      ].join("\n"),
+      { "no-dupe-keys": 1 },
+      []
+    )
+  });
 });