diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index 8bfb31fed83..3c4c6479071 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -811,7 +811,11 @@ pref("plugin.state.f5 sam inspection host plugin", 2);
 // display door hanger if flash not installed
 pref("plugins.notifyMissingFlash", true);
 
+#ifdef XP_WIN
+pref("browser.preferences.instantApply", false);
+#else
 pref("browser.preferences.instantApply", true);
+#endif
 #ifdef XP_MACOSX
 pref("browser.preferences.animateFadeIn", true);
 #else
@@ -819,7 +823,7 @@ pref("browser.preferences.animateFadeIn", false);
 #endif
 
 // Toggles between the two Preferences implementations, pop-up window and in-content
-pref("browser.preferences.inContent", true);
+pref("browser.preferences.inContent", false);
 
 pref("browser.download.show_plugins_in_list", true);
 pref("browser.download.hide_plugins_without_extensions", true);
diff --git a/browser/base/content/test/general/browser_datareporting_notification.js b/browser/base/content/test/general/browser_datareporting_notification.js
index abb4533eb07..deb0832a957 100644
--- a/browser/base/content/test/general/browser_datareporting_notification.js
+++ b/browser/base/content/test/general/browser_datareporting_notification.js
@@ -99,7 +99,10 @@ function test_multiple_windows() {
     ok(notification2, "2nd window has a global notification box.");
 
     let policy;
+
     let displayCount = 0;
+    let prefPaneClosed = false;
+    let childWindowClosed = false;
 
     function onAlertDisplayed() {
       displayCount++;
@@ -110,6 +113,26 @@ function test_multiple_windows() {
 
       ok(true, "Data reporting info bar displayed on all open windows.");
 
+      // We register two independent observers and we need both to clean up
+      // properly. This handles gating for test completion.
+      function maybeFinish() {
+        if (!prefPaneClosed) {
+          dump("Not finishing test yet because pref pane isn't closed.\n");
+          return;
+        }
+
+        if (!childWindowClosed) {
+          dump("Not finishing test yet because child window isn't closed.\n");
+          return;
+        }
+
+        dump("Finishing multiple window test.\n");
+        rootLogger.removeAppender(dumpAppender);
+        delete dumpAppender;
+        delete rootLogger;
+        finish();
+      }
+
       let closeCount = 0;
       function onAlertClose() {
         closeCount++;
@@ -127,6 +150,10 @@ function test_multiple_windows() {
            "Policy records reason for acceptance was button press.");
         is(notification1.allNotifications.length, 0, "No notifications remain on main window.");
         is(notification2.allNotifications.length, 0, "No notifications remain on 2nd window.");
+
+        window2.close();
+        childWindowClosed = true;
+        maybeFinish();
       }
 
       waitForNotificationClose(notification1.currentNotification, onAlertClose);
@@ -145,16 +172,10 @@ function test_multiple_windows() {
 
         ok(true, "Pref pane opened on info bar button press.");
         executeSoon(function soon() {
-          window2.close();
-
           dump("Closing pref pane.\n");
           prefWin.close();
-
-          dump("Finishing multiple window test.\n");
-          rootLogger.removeAppender(dumpAppender);
-          delete dumpAppender;
-          delete rootLogger;
-          finish();
+          prefPaneClosed = true;
+          maybeFinish();
         });
       }, "advanced-pane-loaded", false);
 
diff --git a/browser/base/content/test/general/browser_offlineQuotaNotification.js b/browser/base/content/test/general/browser_offlineQuotaNotification.js
index e5298d0a5b1..080adb81007 100644
--- a/browser/base/content/test/general/browser_offlineQuotaNotification.js
+++ b/browser/base/content/test/general/browser_offlineQuotaNotification.js
@@ -38,11 +38,6 @@ function checkPreferences(prefsWin) {
 }
 
 function test() {
-  if (Services.prefs.getBoolPref("browser.preferences.inContent")) {
-    // Bug 881576 - ensure this works with inContent prefs.
-    todo(false, "Bug 881576 - this test needs to be updated for inContent prefs");
-    return;
-  }
   waitForExplicitFinish();
   gBrowser.selectedBrowser.addEventListener("load", function onload() {
     gBrowser.selectedBrowser.removeEventListener("load", onload, true);
@@ -55,13 +50,18 @@ function test() {
         // window to open - which we track either via a window watcher (for
         // the window-based prefs) or via an "Initialized" event (for
         // in-content prefs.)
-        Services.ww.registerNotification(function wwobserver(aSubject, aTopic, aData) {
-          if (aTopic != "domwindowopened")
-            return;
-          Services.ww.unregisterNotification(wwobserver);
-          checkPreferences(aSubject);
-        });
-        PopupNotifications.panel.firstElementChild.button.click();
+        if (Services.prefs.getBoolPref("browser.preferences.inContent")) {
+          // Bug 881576 - ensure this works with inContent prefs.
+          todo(false, "Bug 881576 - this test needs to be updated for inContent prefs");
+        } else {
+          Services.ww.registerNotification(function wwobserver(aSubject, aTopic, aData) {
+            if (aTopic != "domwindowopened")
+              return;
+            Services.ww.unregisterNotification(wwobserver);
+            checkPreferences(aSubject);
+          });
+          PopupNotifications.panel.firstElementChild.button.click();
+        }
       });
     };
     Services.prefs.setIntPref("offline-apps.quota.warn", 1);