diff --git a/build/tasks/testswarm.js b/build/tasks/testswarm.js
index 78cba98f8..a147b8f57 100644
--- a/build/tasks/testswarm.js
+++ b/build/tasks/testswarm.js
@@ -51,8 +51,6 @@ function submit( commit, runs, configFile, extra, done ) {
 
 	testswarm.createClient({
 		url: config.swarmUrl,
-		pollInterval: 10000,
-		timeout: 1000 * 60 * 45
 	})
 	.addReporter( testswarm.reporters.cli )
 	.auth({
@@ -63,7 +61,8 @@ function submit( commit, runs, configFile, extra, done ) {
 		name: "Commit <a href='" + commitUrl + "'>" + commit.substr( 0, 10 ) + "</a>" + extra,
 		runs: runs,
 		runMax: config.runMax,
-		browserSets: [ "popular-ui" ]
+		browserSets: [ "popular-ui" ],
+		timeout: 1000 * 60 * 30
 	}, function( error, passed ) {
 		if ( error ) {
 			grunt.log.error( error );