--- a/editor/libeditor/tests/mochitest.ini
+++ b/editor/libeditor/tests/mochitest.ini
@@ -74,23 +74,23 @@ skip-if = toolkit == 'android'
 [test_bug587461.html]
 [test_bug590554.html]
 [test_bug592592.html]
 [test_bug596001.html]
 [test_bug596333.html]
 skip-if = toolkit == 'android'
 [test_bug596506.html]
 [test_bug597331.html]
-skip-if = buildapp == 'mulet' || toolkit == 'android' || asan # Bug 1211213
+skip-if = buildapp == 'mulet' || toolkit == 'android' || asan || (os == "win" && os_version != "5.1") # Bug 718316, Bug 1211213
 [test_bug597784.html]
 [test_bug599322.html]
 skip-if = toolkit == 'android'
 [test_bug599983.html]
 [test_bug600570.html]
-skip-if = toolkit == 'android'
+skip-if = toolkit == 'android' || (os == "win" && os_version != "5.1") # Bug 718316
 [test_bug602130.html]
 [test_bug603556.html]
 [test_bug604532.html]
 skip-if = toolkit == 'android'
 [test_bug607584.html]
 [test_bug611182.html]
 skip-if = toolkit == 'android'
 [test_bug612128.html]

--- a/editor/libeditor/tests/test_bug597331.html
+++ b/editor/libeditor/tests/test_bug597331.html
@@ -19,20 +19,16 @@ line2
 line3
 </textarea>
 </div>
 <pre id="test">
 <script type="application/javascript">
 
 /** Test for Bug 597331 **/
 
-// Bug 718316: This test fails on Windows 7 and 8
-if (navigator.userAgent.indexOf("Windows NT 6.1") == -1 &&
-    navigator.userAgent.indexOf("Windows NT 6.2") == -1) {
-
 SimpleTest.waitForExplicitFinish();
 addLoadEvent(function() {
   SimpleTest.executeSoon(function() {
     var t = document.querySelector("textarea");
     t.focus();
     t.selectionStart = 4;
     t.selectionEnd = 4;
     SimpleTest.executeSoon(function() {
@@ -65,17 +61,12 @@ addLoadEvent(function() {
           SimpleTest.finish();
         });
       }, false);
       synthesizeKey("VK_LEFT", {});
     });
   });
 });
 
-}
-else {
-  ok(true, "Somebody thought it was a great idea to make me type this.");
-}
-
 </script>
 </pre>
 </body>
 </html>

--- a/editor/libeditor/tests/test_bug600570.html
+++ b/editor/libeditor/tests/test_bug600570.html
@@ -18,20 +18,16 @@ https://bugzilla.mozilla.org/show_bug.cg
 aaa
 [bbb]</textarea>
 </div>
 <pre id="test">
 <script type="application/javascript">
 
 /** Test for Bug 600570 **/
 
-// Bug 718316: This test fails on Windows 7 and 8
-if (navigator.userAgent.indexOf("Windows NT 6.1") == -1 &&
-    navigator.userAgent.indexOf("Windows NT 6.2") == -1) {
-
 SimpleTest.waitForExplicitFinish();
 SimpleTest.waitForFocus(function() {
   var t = document.querySelector("textarea");
   t.value = "[aaa\nbbb]";
   t.focus();
   synthesizeKey("A", {accelKey: true});
 
   SimpleTest.executeSoon(function() {
@@ -73,17 +69,12 @@ SimpleTest.waitForFocus(function() {
       },
       function() {
         SimpleTest.finish();
       }
     );
   });
 });
 
-}
-else {
-  ok(true, "Somebody thought it was a great idea to make me type this.");
-}
-
 </script>
 </pre>
 </body>
 </html>