diff --git a/bin/ci.sh b/bin/ci.sh
index 7eadb7ee..dd064ea2 100755
--- a/bin/ci.sh
+++ b/bin/ci.sh
@@ -11,7 +11,7 @@ typecheck() {
 lint() {
   REPO_URL="https://raw.githubusercontent.com/ripple/javascript-style-guide"
   curl "$REPO_URL/es6/eslintrc" > ./eslintrc
-  echo "parser: esprima-fb" >> ./eslintrc
+  echo "parser: babel-eslint" >> ./eslintrc
   node_modules/.bin/eslint --reset -c ./eslintrc $(git --no-pager diff --name-only -M100% --diff-filter=AM --relative $(git merge-base FETCH_HEAD origin/HEAD) FETCH_HEAD | grep "\.js$")
 }
 
diff --git a/package.json b/package.json
index fd5823c1..4bb6edc6 100644
--- a/package.json
+++ b/package.json
@@ -32,10 +32,10 @@
     "assert-diff": "^1.0.1",
     "babel": "^5.5.4",
     "babel-core": "^5.5.4",
+    "babel-eslint": "^3.1.20",
     "babel-loader": "^5.0.0",
     "coveralls": "~2.10.0",
     "eslint": "^0.24.0",
-    "esprima-fb": "^15001.1.0-dev-harmony-fb",
     "eventemitter2": "^0.4.14",
     "gulp": "~3.8.10",
     "gulp-bump": "~0.1.13",
@@ -55,7 +55,7 @@
     "prepublish": "npm run clean && npm run compile",
     "test": "istanbul test _mocha",
     "coveralls": "cat ./coverage/lcov.info | coveralls",
-    "lint": "if ! [ -f eslintrc ]; then curl -o eslintrc 'https://raw.githubusercontent.com/ripple/javascript-style-guide/es6/eslintrc'; echo 'parser: esprima-fb' >> eslintrc; fi; eslint --reset -c eslintrc src/",
+    "lint": "if ! [ -f eslintrc ]; then curl -o eslintrc 'https://raw.githubusercontent.com/ripple/javascript-style-guide/es6/eslintrc'; echo 'parser: babel-eslint' >> eslintrc; fi; eslint --reset -c eslintrc src/",
     "perf": "./scripts/perf_test.sh"
   },
   "repository": {