--- a/mailnews/imap/test/unit/xpcshell.ini
+++ b/mailnews/imap/test/unit/xpcshell.ini
@@ -2,44 +2,56 @@
 head = head_server.js
 tail = tail_imap.js
 
 [test_autosync_date_constraints.js]
 [test_bccProperty.js]
 [test_bug460636.js]
 [test_chunkLastLF.js]
 [test_compactOfflineStore.js]
+# Disabled until bug 870864 is resolved
+skip-if = true
 [test_copyThenMove.js]
 [test_customCommandReturnsFetchResponse.js]
 [test_dod.js]
 [test_dontStatNoSelect.js]
 [test_downloadOffline.js]
 [test_fetchCustomAttribute.js]
 [test_filterCustomHeaders.js]
 [test_filterNeedsBody.js]
 [test_folderOfflineFlags.js]
 [test_gmailAttributes.js]
 [test_gmailOfflineMsgStore.js]
 [test_imapAttachmentSaves.js]
+# Disabled until bug 870864 is resolved
+skip-if = true
 [test_imapAuthMethods.js]
 # Disabled per bug 553764
 skip-if = true
 [test_imapAutoSync.js]
 [test_imapChunks.js]
 [test_imapContentLength.js]
 [test_imapCopyTimeout.js]
+# Disabled until bug 870864 is resolved
+skip-if = true
 [test_imapFilterActions.js]
 [test_imapFlagChange.js]
 [test_imapFolderCopy.js]
 [test_imapHdrChunking.js]
+# Disabled until bug 870864 is resolved
+skip-if = true
 [test_imapHdrStreaming.js]
 [test_imapHighWater.js]
+# Disabled until bug 870864 is resolved
+skip-if = true
 [test_imapID.js]
 [test_imapMove.js]
 [test_imapPasswordFailure.js]
+# Disabled until bug 870864 is resolved
+skip-if = true
 [test_imapProtocols.js]
 [test_imapSearch.js]
 [test_imapStatusCloseDBs.js]
 [test_imapStoreMsgOffline.js]
 [test_imapUndo.js]
 [test_imapUrls.js]
 [test_largeOfflineStore.js]
 skip-if = os == 'mac'
@@ -52,17 +64,20 @@ skip-if = true
 [test_lsub.js]
 [test_mailboxes.js]
 [test_nsIMsgFolderListenerIMAP.js]
 [test_offlineCopy.js]
 [test_offlineDraftDataloss.js]
 [test_offlinePlayback.js]
 [test_offlineStoreLocking.js]
 # Doesn't currently work on Windows, bug 782625
-skip-if = os == "win"
+# Disabled until bug 870864 is resolved
+skip-if = true
 [test_partsOnDemand.js]
 [test_preserveDataOnMove.js]
 [test_saveImapDraft.js]
 [test_saveTemplate.js]
 [test_starttlsFailure.js]
+# Disabled until bug 870864 is resolved
+skip-if = true
 [test_stopMovingToLocalFolder.js]
 [test_syncChanges.js]
 [test_trustSpamAssassin.js]