diff --git a/build/tasks/spec-task.coffee b/build/tasks/spec-task.coffee
index 80041c441..92ccc58a6 100644
--- a/build/tasks/spec-task.coffee
+++ b/build/tasks/spec-task.coffee
@@ -4,11 +4,7 @@ path = require 'path'
 _ = require 'underscore-plus'
 async = require 'async'
 
-if process.env.JANKY_SHA1
-  # Use all the cores on CI
-  concurrency = require('os').cpus().length
-else
-  concurrency = 2
+concurrency = 2
 
 module.exports = (grunt) ->
   {isAtomPackage, spawn} = require('./task-helpers')(grunt)
diff --git a/spec/spec-helper.coffee b/spec/spec-helper.coffee
index 9c5b0cfbc..6f84c2eab 100644
--- a/spec/spec-helper.coffee
+++ b/spec/spec-helper.coffee
@@ -45,7 +45,7 @@ Object.defineProperty document, 'title',
 
 jasmine.getEnv().addEqualityTester(_.isEqual) # Use underscore's definition of equality for toEqual assertions
 
-if process.env.JANKY_SHA1
+if process.env.JANKY_SHA1 and process.platform is 'win32'
   jasmine.getEnv().defaultTimeoutInterval = 60000
 else
   jasmine.getEnv().defaultTimeoutInterval = 5000