diff --git a/.eslintrc.json b/.eslintrc.json
index 229f05c6c..5a2bd22e7 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -39,7 +39,7 @@
         "block-scoped-var": 2,
         "brace-style": [2, "1tbs", { "allowSingleLine": false }],
         "camelcase": [2, {"properties": "never"}],
-        "class-methods-use-this": 1,
+        "class-methods-use-this": 0,
         "comma-dangle": [2, "never"],
         "comma-spacing": [2, {"before": false, "after": true}],
         "comma-style": [2, "last"],
@@ -162,7 +162,7 @@
         "no-unsafe-negation": 2,
         "no-unused-expressions": 2,
         "no-unused-vars": [2, {"vars": "all", "args": "after-used"}],
-        "no-use-before-define": [2, "nofunc"],
+        "no-use-before-define": [2, {"classes": false, "functions": false, "variables": false}],
         "no-useless-computed-key": 2,
         "no-useless-concat": 2,
         "no-useless-constructor": 2,
@@ -173,7 +173,7 @@
         "no-warning-comments": 1,
         "no-whitespace-before-property": 2,
         "no-with": 2,
-        "object-curly-newline": 0, 
+        "object-curly-newline": 0,
         "object-curly-spacing": [2, "never"],
         "object-property-newline": [2, {"allowMultiplePropertiesPerLine": true}],
         "object-shorthand": [2, "always"],
diff --git a/package.json b/package.json
index e280c98ee..84e425e28 100644
--- a/package.json
+++ b/package.json
@@ -33,7 +33,7 @@
     "chai-enzyme": "0.6.1",
     "deep-freeze": "0.0.1",
     "enzyme": "2.7.1",
-    "eslint": "3.12.2",
+    "eslint": "3.15.0",
     "eslint-plugin-mocha": "4.8.0",
     "eslint-plugin-react": "6.8.0",
     "fetch-mock": "5.8.1",