diff --git a/src/browser/atom-application.coffee b/src/browser/atom-application.coffee
index c7ac7c27a..58981f0d1 100644
--- a/src/browser/atom-application.coffee
+++ b/src/browser/atom-application.coffee
@@ -65,7 +65,7 @@ class AtomApplication
   exit: (status) -> app.exit(status)
 
   constructor: (options) ->
-    {@resourcePath, @devResourcePath, @version, @devMode, @safeMode, @socketPath, @timeout} = options
+    {@resourcePath, @devResourcePath, @version, @devMode, @safeMode, @socketPath, timeout} = options
 
     global.atomApplication = this
 
diff --git a/src/browser/atom-window.coffee b/src/browser/atom-window.coffee
index 2415e916b..7823388dd 100644
--- a/src/browser/atom-window.coffee
+++ b/src/browser/atom-window.coffee
@@ -19,7 +19,7 @@ class AtomWindow
   isSpec: null
 
   constructor: (settings={}) ->
-    {@resourcePath, pathToOpen, locationsToOpen, @isSpec, @headless, @safeMode, @devMode, @timeout} = settings
+    {@resourcePath, pathToOpen, locationsToOpen, @isSpec, @headless, @safeMode, @devMode, timeout} = settings
     locationsToOpen ?= [{pathToOpen}] if pathToOpen
     locationsToOpen ?= []
 
diff --git a/src/initialize-test-window.coffee b/src/initialize-test-window.coffee
index d8354a416..89ef44e4f 100644
--- a/src/initialize-test-window.coffee
+++ b/src/initialize-test-window.coffee
@@ -33,7 +33,6 @@ try
 
   document.title = "Spec Suite"
 
-  timeoutCop = null
   if timeout = getWindowLoadSettings().timeout
     ChildProcess = remote.require("child_process")
     timeoutCop = ChildProcess.fork(require.resolve('./timeout-cop'), [remote.process.pid, timeout])