diff --git a/test/components/zotero-unit.js b/test/components/zotero-unit.js
index 9f7c28fcd..2d2898913 100644
--- a/test/components/zotero-unit.js
+++ b/test/components/zotero-unit.js
@@ -38,6 +38,7 @@ ZoteroUnit.prototype = {
 		this.runTests = !this.makeTestData;
 		this.bail = cmdLine.handleFlag("bail", false);
 		this.grep = cmdLine.handleFlagWithParam("grep", false);
+		this.timeout = cmdLine.handleFlagWithParam("ZoteroTestTimeout", false);
 	},
 
 	dump:function(x) {
diff --git a/test/content/runtests.js b/test/content/runtests.js
index d9c86a163..7ad9d2f27 100644
--- a/test/content/runtests.js
+++ b/test/content/runtests.js
@@ -178,7 +178,7 @@ Mocha.Runner.prototype.fail = function(test, err){
 mocha.setup({
 	ui: "bdd",
 	reporter: Reporter,
-	timeout: 5000,
+	timeout: ZoteroUnit.timeout || 5000,
 	grep: ZoteroUnit.grep
 });
 
diff --git a/test/runtests.sh b/test/runtests.sh
index 84bd94f01..c0dd2322d 100755
--- a/test/runtests.sh
+++ b/test/runtests.sh
@@ -132,7 +132,7 @@ fi
 
 
 if [ "$TRAVIS" = true ]; then
-	FX_ARGS="$FX_ARGS -ZoteroNoUserInput"
+	FX_ARGS="$FX_ARGS -ZoteroNoUserInput -ZoteroTestTimeout 10000"
 fi
 
 # Clean up on exit