Index: content/base/test/test_bug367164.html
===================================================================
RCS file: /cvsroot/mozilla/content/base/test/test_bug367164.html,v
retrieving revision 1.1
diff -u -8 -p -r1.1 test_bug367164.html
--- content/base/test/test_bug367164.html	14 Apr 2007 17:46:36 -0000	1.1
+++ content/base/test/test_bug367164.html	20 Jun 2007 09:39:06 -0000
@@ -17,32 +17,26 @@ https://bugzilla.mozilla.org/show_bug.cg
 </div>
 <pre id="test">
 <script class="testbody" type="text/javascript">
 
 /** Test for Bug 367164 **/
 
 var span = document.createElement("span");
 
-var ins1 = false;
-var ins2 = false;
-var rem1 = false;
-var rem2 = false;
+var ins = false;
+var rem = false;
 
-span.addEventListener("DOMNodeInserted", function() { ins1 = true; }, true);
-span.addEventListener("DOMNodeInserted", function() { ins2 = true; }, false);
-span.addEventListener("DOMNodeRemoved", function() { rem1 = true; }, true);
-span.addEventListener("DOMNodeRemoved", function() { rem2 = true; }, false);
+span.addEventListener("DOMNodeInserted", function() { ins = true; }, false);
+span.addEventListener("DOMNodeRemoved", function() { rem = true; }, false);
 
 $("content").appendChild(span);
 $("content").removeChild(span);
 
-is(ins1, true, "Capturing DOMNodeInserted listener");
-is(ins2, true, "Bubbling DOMNodeInserted listener");
-is(rem1, true, "Capturing DOMNodeRemoved listener");
-is(rem2, true, "Bubbling DOMNodeRemoved listener");
+is(ins, true, "Bubbling DOMNodeInserted listener");
+is(rem, true, "Bubbling DOMNodeRemoved listener");
   
 </script>
 
 </pre>
 </body>
 </html>
 
Index: content/xul/content/test/test_bug330705-2.xul
===================================================================
RCS file: /cvsroot/mozilla/content/xul/content/test/test_bug330705-2.xul,v
retrieving revision 1.1
diff -u -8 -p -r1.1 test_bug330705-2.xul
--- content/xul/content/test/test_bug330705-2.xul	19 Feb 2007 14:55:46 -0000	1.1
+++ content/xul/content/test/test_bug330705-2.xul	20 Jun 2007 09:39:06 -0000
@@ -17,18 +17,18 @@ https://bugzilla.mozilla.org/show_bug.cg
     <div id="content" style="display: none">
       <script class="testbody" type="text/javascript">
       <![CDATA[
         SimpleTest.waitForExplicitFinish();
 
         function onLoad() {
           var isFocused = false;
           var box = document.getElementsByTagName('box')[0];
-          box.addEventListener('focus', function() { isFocused = true; }, true);
-          box.addEventListener('blur', function() { isFocused = false;}, true);
+          box.addEventListener('focus', function() { isFocused = true; }, false);
+          box.addEventListener('blur', function() { isFocused = false;}, false);
           box.focus();
           document.getElementsByTagName('box')[1].blur();
           ok(isFocused == true, "The first box element is still focused after blur() has been called on the second box element");
           SimpleTest.finish();
         }
 
         addLoadEvent(onLoad);
       ]]>