diff --git a/toolkit/mozapps/update/test/unit/xpcshell.ini b/toolkit/mozapps/update/test/unit/xpcshell.ini
index 3eba7ad685f..9791c35de8b 100644
--- a/toolkit/mozapps/update/test/unit/xpcshell.ini
+++ b/toolkit/mozapps/update/test/unit/xpcshell.ini
@@ -18,23 +18,19 @@ tail =
 [test_0073_update_dir_cleanup.js]
 [test_0080_prompt_silent.js]
 [test_0081_prompt_uiAlreadyOpen.js]
-skip-if = toolkit == "gonk"
+skip-if = toolkit == 'gonk'
 reason = custom nsIUpdatePrompt
 [test_0082_prompt_unsupportAlreadyNotified.js]
-skip-if = toolkit == "gonk"
+skip-if = toolkit == 'gonk'
 reason = custom nsIUpdatePrompt
-; Tests that require the updater binary
+
+; Tests that require the updater binary. Conditions for the included ini file
+; aren't used due to cascading of the conditions (see bug 676876).
 [include:xpcshell_updater.ini]
-skip-if = os == 'android'
-[include:xpcshell_updater_windows.ini]
-run-if = os == 'win'
-[include:xpcshell_updater_xp_unix.ini]
-run-if = os == 'linux' || os == 'mac' || os == 'sunos'
-[test_0160_appInUse_complete.js]
-run-if = os == 'linux' || os == 'mac' || os == 'sunos' || os == 'win'
+
 [test_bug595059.js]
-skip-if = toolkit == "gonk"
+skip-if = toolkit == 'gonk'
 reason = custom nsIUpdatePrompt
 [test_bug794211.js]
 [test_bug833708.js]
-run-if = toolkit == "gonk"
+run-if = toolkit == 'gonk'
diff --git a/toolkit/mozapps/update/test/unit/xpcshell_updater.ini b/toolkit/mozapps/update/test/unit/xpcshell_updater.ini
index 2f6b5c81d9e..6820f55be0d 100644
--- a/toolkit/mozapps/update/test/unit/xpcshell_updater.ini
+++ b/toolkit/mozapps/update/test/unit/xpcshell_updater.ini
@@ -1,15 +1,83 @@
+; Tests that require the updater binary. These tests should never run on android.
+
 [test_0110_general.js]
+skip-if = os == 'android'
 [test_0111_general.js]
+skip-if = os == 'android'
 [test_0112_general.js]
+skip-if = os == 'android'
 [test_0113_general.js]
-skip-if = os == "mac" || toolkit == "gonk"
+skip-if = os == 'mac' || toolkit == 'gonk' || os == 'android'
 reason = bug 820380
+[test_0113_versionDowngradeCheck.js]
+run-if = os == 'win'
 [test_0114_general.js]
-skip-if = os == "mac"
+skip-if = os == 'mac' || os == 'android'
+[test_0114_productChannelCheck.js]
+run-if = os == 'win'
 [test_0115_general.js]
+skip-if = os == 'android'
+[test_0150_appBinReplaced_xp_win_complete.js]
+run-if = os == 'win'
+[test_0151_appBinPatched_xp_win_partial.js]
+run-if = os == 'win'
+[test_0152_appBinReplaced_xp_win_complete.js]
+run-if = os == 'win'
+[test_0153_appBinPatched_xp_win_partial.js]
+run-if = os == 'win'
+[test_0160_appInUse_complete.js]
+run-if = os == 'linux' || os == 'mac' || os == 'sunos' || os == 'win'
+[test_0161_appInUse_xp_unix_complete.js]
+run-if = os == 'linux' || os == 'sunos'
+[test_0161_appInUse_xp_win_complete.js]
+run-if = os == 'win'
+[test_0162_appInUse_xp_win_complete.js]
+run-if = os == 'win'
+[test_0170_fileLocked_xp_win_complete.js]
+run-if = os == 'win'
+[test_0171_fileLocked_xp_win_partial.js]
+run-if = os == 'win'
+[test_0172_fileLocked_xp_win_complete.js]
+run-if = os == 'win'
+[test_0173_fileLocked_xp_win_partial.js]
+run-if = os == 'win'
+[test_0174_fileLocked_xp_win_complete.js]
+run-if = os == 'win'
+[test_0175_fileLocked_xp_win_partial.js]
+run-if = os == 'win'
+[test_0180_fileInUse_xp_win_complete.js]
+run-if = os == 'win'
+[test_0181_fileInUse_xp_win_partial.js]
+run-if = os == 'win'
+[test_0182_rmrfdirFileInUse_xp_win_complete.js]
+run-if = os == 'win'
+[test_0183_rmrfdirFileInUse_xp_win_partial.js]
+run-if = os == 'win'
+[test_0184_fileInUse_xp_win_complete.js]
+run-if = os == 'win'
+[test_0185_fileInUse_xp_win_partial.js]
+run-if = os == 'win'
+[test_0186_rmrfdirFileInUse_xp_win_complete.js]
+run-if = os == 'win'
+[test_0187_rmrfdirFileInUse_xp_win_partial.js]
+run-if = os == 'win'
+[test_0188_fileInUse_xp_win_complete.js]
+run-if = os == 'win'
+[test_0189_fileInUse_xp_win_partial.js]
+run-if = os == 'win'
+[test_0190_rmrfdirFileInUse_xp_win_complete.js]
+run-if = os == 'win'
+[test_0191_rmrfdirFileInUse_xp_win_partial.js]
+run-if = os == 'win'
 [test_0200_app_launch_apply_update.js]
-skip-if = toolkit == "gonk"
+skip-if = toolkit == 'gonk' || os == 'android'
 reason = bug 820380
 [test_0201_app_launch_apply_update.js]
-skip-if = toolkit == "gonk"
+skip-if = toolkit == 'gonk' || os == 'android'
 reason = bug 820380
+[test_0202_app_launch_apply_update_dirlocked.js]
+run-if = os == 'win'
+[test_0203_app_launch_apply_update.js]
+run-if = os == 'win'
+[test_0300_update_root_dir_migration.js]
+run-if = os == 'win'
diff --git a/toolkit/mozapps/update/test/unit/xpcshell_updater_windows.ini b/toolkit/mozapps/update/test/unit/xpcshell_updater_windows.ini
deleted file mode 100644
index 34840338b0a..00000000000
--- a/toolkit/mozapps/update/test/unit/xpcshell_updater_windows.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-[test_0113_versionDowngradeCheck.js]
-[test_0114_productChannelCheck.js]
-[test_0150_appBinReplaced_xp_win_complete.js]
-[test_0151_appBinPatched_xp_win_partial.js]
-[test_0152_appBinReplaced_xp_win_complete.js]
-[test_0153_appBinPatched_xp_win_partial.js]
-[test_0161_appInUse_xp_win_complete.js]
-[test_0162_appInUse_xp_win_complete.js]
-[test_0170_fileLocked_xp_win_complete.js]
-[test_0171_fileLocked_xp_win_partial.js]
-[test_0172_fileLocked_xp_win_complete.js]
-[test_0173_fileLocked_xp_win_partial.js]
-[test_0174_fileLocked_xp_win_complete.js]
-[test_0175_fileLocked_xp_win_partial.js]
-[test_0180_fileInUse_xp_win_complete.js]
-[test_0181_fileInUse_xp_win_partial.js]
-[test_0182_rmrfdirFileInUse_xp_win_complete.js]
-[test_0183_rmrfdirFileInUse_xp_win_partial.js]
-[test_0184_fileInUse_xp_win_complete.js]
-[test_0185_fileInUse_xp_win_partial.js]
-[test_0186_rmrfdirFileInUse_xp_win_complete.js]
-[test_0187_rmrfdirFileInUse_xp_win_partial.js]
-[test_0188_fileInUse_xp_win_complete.js]
-[test_0189_fileInUse_xp_win_partial.js]
-[test_0190_rmrfdirFileInUse_xp_win_complete.js]
-[test_0191_rmrfdirFileInUse_xp_win_partial.js]
-[test_0202_app_launch_apply_update_dirlocked.js]
-[test_0203_app_launch_apply_update.js]
-[test_0300_update_root_dir_migration.js]
diff --git a/toolkit/mozapps/update/test/unit/xpcshell_updater_xp_unix.ini b/toolkit/mozapps/update/test/unit/xpcshell_updater_xp_unix.ini
deleted file mode 100644
index 23aacaa46ed..00000000000
--- a/toolkit/mozapps/update/test/unit/xpcshell_updater_xp_unix.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[test_0161_appInUse_xp_unix_complete.js]
-skip-if = os == 'mac'