diff --git a/.eslintrc.json b/.eslintrc.json
index 36d4a7a6261a..c76fcbe5bf58 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -1,5 +1,5 @@
 {
-  "extends": "eslint-config-edx",
+  "extends": "eslint-config-edx-es5",
   "globals": {  // Try to avoid adding any new globals.
     // Old compatibility things and hacks
     "edx": true,
diff --git a/package.json b/package.json
index 19dd474b6204..ecdb764a2bb9 100644
--- a/package.json
+++ b/package.json
@@ -20,8 +20,8 @@
   },
   "devDependencies": {
     "edx-custom-a11y-rules": "0.1.3",
-    "eslint": "^2.13.1",
-    "eslint-config-edx": "^1.2.1",
+    "eslint-config-edx": "^2.0.0",
+    "eslint-config-edx-es5": "^2.0.0",
     "jasmine-core": "^2.4.1",
     "jasmine-jquery": "^2.1.1",
     "karma": "^0.13.22",
diff --git a/scripts/all-tests.sh b/scripts/all-tests.sh
index b025d7c0bb66..dc63a81eef91 100755
--- a/scripts/all-tests.sh
+++ b/scripts/all-tests.sh
@@ -12,7 +12,7 @@ set -e
 
 # Violations thresholds for failing the build
 export PYLINT_THRESHOLD=3600
-export ESLINT_THRESHOLD=9850
+export ESLINT_THRESHOLD=10106
 
 SAFELINT_THRESHOLDS=`cat scripts/safelint_thresholds.json`
 export SAFELINT_THRESHOLDS=${SAFELINT_THRESHOLDS//[[:space:]]/}