--- a/dom/events/test/bug299673.js
+++ b/dom/events/test/bug299673.js
@@ -90,20 +90,16 @@ function doTest1(expectedEventLog,focusA
   } catch(e) {
     if (popup)
       popup.close();
     throw e;
   }
 }
 
 function setPrefAndDoTest(expectedEventLog,focusAfterCloseId,prefValue) {
-  var origPrefValue = SpecialPowers.getIntPref("browser.link.open_newwindow");
   var select1 = document.getElementById('Select1');
   select1.blur();
   result = "";
   log({},"Test with browser.link.open_newwindow = "+prefValue);
-  try {
-    SpecialPowers.setIntPref("browser.link.open_newwindow", prefValue);
-    doTest1(expectedEventLog,focusAfterCloseId);
-  } finally {
-    SpecialPowers.setIntPref("browser.link.open_newwindow", origPrefValue);
-  }
+   SpecialPowers.pushPrefEnv({"set": [['browser.link.open_newwindow', prefValue]]}, function() {
+     doTest1(expectedEventLog,focusAfterCloseId);
+   });
 }

--- a/dom/events/test/test_bug299673-1.html
+++ b/dom/events/test/test_bug299673-1.html
@@ -48,14 +48,14 @@ SELECT(Select1): blur \n\
 INPUT(popupText1): blur \n\
 : blur popup-doc\n\
 : focus top-doc\n\
 '
 
   setPrefAndDoTest(eventLogForNewWindow,'Body',2);  // 2 = open new window as window
 }
 
-todo(false, "Please write a test for bug 299673 that actually works");
+todo(false, "Please write a test for bug 299673 that actually works, see bug 553417");
 
 </script>
 </pre>
 </body>
 </html>

--- a/dom/events/test/test_bug299673-2.html
+++ b/dom/events/test/test_bug299673-2.html
@@ -36,25 +36,25 @@ https://bugzilla.mozilla.org/show_bug.cg
 function doTest(expectedEventLog) {
   var eventLogForNewTab = '\
  :  Test with browser.link.open_newwindow = 3\n\
 : focus top-doc\n\
 SELECT(Select1): focus \n\
 SELECT(Select1): change \n\
  :  >>> OpenWindow\n\
 : blur top-doc\n\
+: focus popup-doc\n\
 INPUT(popupText1): focus \n\
  :  <<< OpenWindow\n\
 SELECT(Select1): blur \n\
 INPUT(popupText1): blur \n\
 : blur popup-doc\n\
 : focus top-doc\n\
 '
   setPrefAndDoTest(eventLogForNewTab,'Body',3);  // 3 = open new window as tab
-
 }
 
-todo(false, "Please write a test for bug 299673 that actually works");
+todo(false, "Please write a test for bug 299673 that actually works, see bug 553417");
 
 </script>
 </pre>
 </body>
 </html>