diff --git a/chrome/content/zotero/xpcom/file.js b/chrome/content/zotero/xpcom/file.js
index 969d57ace..c4e5b0875 100644
--- a/chrome/content/zotero/xpcom/file.js
+++ b/chrome/content/zotero/xpcom/file.js
@@ -544,6 +544,12 @@ Zotero.File = new function(){
 					let entry = yield iterator.next();
 					let dest = newDir + entry.path.substr(rootDir.length);
 					
+					// entry.isDir can be false for some reason on Travis, causing spurious test failures
+					if (Zotero.automatedTest && !entry.isDir && (yield OS.File.stat(entry.path)).isDir) {
+						Zotero.debug("Overriding isDir for " + entry.path);
+						entry.isDir = true;
+					}
+					
 					// Move files in directory
 					if (!entry.isDir) {
 						try {