diff --git a/.eslintignore b/.eslintignore
index 9c53635d1dcc..51bba90ec978 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -193,6 +193,7 @@ toolkit/modules/tests/xpcshell/test_task.js
 toolkit/components/osfile/**
 
 # External code:
+toolkit/components/microformats/test/**
 toolkit/components/reader/Readability.js
 toolkit/components/reader/JSDOMParser.js
 
diff --git a/toolkit/.eslintrc b/toolkit/.eslintrc
index 7d5da4752436..9b915e7dd001 100644
--- a/toolkit/.eslintrc
+++ b/toolkit/.eslintrc
@@ -43,6 +43,9 @@
     // Space after colon not before in property declarations
     // "key-spacing": [2, { "beforeColon": false, "afterColon": true, "mode": "minimum" }],
 
+    // Require spaces before and after keywords
+    // "keyword-spacing": 2,
+
     // Unix linebreaks
     "linebreak-style": [2, "unix"],
 
@@ -163,27 +166,18 @@
     // Always require semicolon at end of statement
     // "semi": [2, "always"],
 
-    // Require space after keywords
-    // "space-after-keywords": 2,
-
     // Require space before blocks
     // "space-before-blocks": 2,
 
     // Never use spaces before function parentheses
     // "space-before-function-paren": [2, { "anonymous": "always", "named": "never" }],
 
-    // Require spaces before finally, catch, etc.
-    // "space-before-keywords": [2, "always"],
-
     // No space padding in parentheses
     // "space-in-parens": [2, "never"],
 
     // Require spaces around operators
     // "space-infix-ops": 2,
 
-    // Require spaces after return, throw and case
-    // "space-return-throw-case": 2,
-
     // ++ and -- should not need spacing
     // "space-unary-ops": [2, { "words": true, "nonwords": false }],