diff --git a/browser/base/content/test/browser_bug462289.js b/browser/base/content/test/browser_bug462289.js
index 4e576133ad55..12aaf3c9df98 100644
--- a/browser/base/content/test/browser_bug462289.js
+++ b/browser/base/content/test/browser_bug462289.js
@@ -1,5 +1,13 @@
 var tab1, tab2;
 
+function focus_in_navbar() {
+  var parent = document.activeElement.parentNode;
+  while (parent && parent.id != "nav-bar")
+    parent = parent.parentNode;
+
+  return (parent != null);
+}
+
 function test() {
   waitForExplicitFinish();
 
@@ -27,7 +35,9 @@ function step3()
     EventUtils.synthesizeKey("VK_TAB", {shiftKey: true});
   } else {
     document.getElementById("searchbar").focus();
-    EventUtils.synthesizeKey("VK_TAB", {});
+
+    while (focus_in_navbar())
+      EventUtils.synthesizeKey("VK_TAB", { });
   }
   is(document.activeElement, tab1, "tab key to tab activeElement");
 
diff --git a/browser/fuel/test/browser_ApplicationPrefs.js b/browser/fuel/test/browser_ApplicationPrefs.js
index d505f708392c..e88bc22828df 100644
--- a/browser/fuel/test/browser_ApplicationPrefs.js
+++ b/browser/fuel/test/browser_ApplicationPrefs.js
@@ -148,6 +148,9 @@ function test() {
   pref.locked = false;
   ok(!pref.locked, "A single preference is unlocked.");
 
+  // Preference events tests disabled until bug 533290 is fixed
+  return;
+
   // check for change event when setting a value
   waitForExplicitFinish();
   Application.prefs.events.addListener("change", onPrefChange);