diff --git a/.eslintrc b/.eslintrc
index e0e97a7..93fdf39 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -9,23 +9,28 @@
   },
   "env": {
     "browser": true,
-    "node": true
+    "es6": true,
+    "node": true,
   },
   "rules": {
     "quotes": [2, "single"],
-    "eol-last": 0,
+    "eol-last": 2,
     "no-debugger": 1,
     "no-mixed-requires": 0,
     "no-underscore-dangle": 0,
     "no-multi-spaces": 0,
     "no-trailing-spaces": 0,
     "no-extra-boolean-cast": 0,
-    "no-unused-vars": 1,
+    "no-undef": 2,
+    "no-unused-vars": 2,
+    "no-var": 2,
+    "prefer-const": 2,
     "new-cap": 0,
-    "camelcase": 1,
+    "camelcase": 2,
+    "semi": 2,
     "react/jsx-uses-react": 2,
     "react/jsx-uses-vars": 2,
-    "react/react-in-jsx-scope": 0,
+    "react/react-in-jsx-scope": 2,
     "react/prop-types": 2
   }
-}
\ No newline at end of file
+}
diff --git a/tests/.eslintrc b/tests/.eslintrc
index 9039b52..e2c436b 100644
--- a/tests/.eslintrc
+++ b/tests/.eslintrc
@@ -6,6 +6,6 @@
   "globals": {
     "sinon": true,
     "sandbox": true,
-    "Should": true
+    "assert": true
   }
-}
\ No newline at end of file
+}