diff --git a/build/tasks/testswarm.js b/build/tasks/testswarm.js
index d724aafcc..558aac4e6 100644
--- a/build/tasks/testswarm.js
+++ b/build/tasks/testswarm.js
@@ -61,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: config.browserSets,
+		timeout: 1000 * 60 * 30
 	}, function( error, passed ) {
 		if ( error ) {
 			grunt.log.error( error );