--- a/build/automation.py.in
+++ b/build/automation.py.in
@@ -236,20 +236,19 @@ user_pref("browser.warnOnQuit", false);
 user_pref("accessibility.typeaheadfind.autostart", false);
 user_pref("javascript.options.showInConsole", true);
 user_pref("layout.debug.enable_data_xbl", true);
 user_pref("browser.EULA.override", true);
 user_pref("javascript.options.jit.content", true);
 user_pref("gfx.color_management.force_srgb", true);
 user_pref("network.manage-offline-status", false);
 user_pref("security.default_personal_cert", "Select Automatically"); // Need to client auth test be w/o any dialogs
-user_pref("security.warn_viewing_mixed", false);
 
 user_pref("camino.warn_when_closing", false); // Camino-only, harmless to others
-""" % { "downloadDir": (os.path.join(profileDir, "downloads")) }
+"""
   
   prefs.append(part)
 
   # Increase the max script run time 10-fold for debug builds
   if (IS_DEBUG_BUILD):
     prefs.append("""\
 user_pref("dom.max_script_run_time", 100);
 user_pref("dom.max_chrome_script_run_time", 200);

--- a/security/manager/ssl/tests/mochitest/Makefile.in
+++ b/security/manager/ssl/tests/mochitest/Makefile.in
@@ -39,12 +39,12 @@
 DEPTH		= ../../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 MODULE		= pipnss
 DIRS = \
   bugs \
-  mixedcontent \
   $(NULL)
+#  mixedcontent \ Need re-review, occasionally fail and probably collide with other tests
 
 include $(topsrcdir)/config/rules.mk