diff --git a/spec/integration/fixtures/atom-home/config-openEmptyEditorOnStart.cson b/spec/integration/fixtures/atom-home/config-openEmptyEditorOnStart.cson
new file mode 100644
index 000000000..4d09f3deb
--- /dev/null
+++ b/spec/integration/fixtures/atom-home/config-openEmptyEditorOnStart.cson
@@ -0,0 +1,6 @@
+"*":
+  welcome:
+    showOnStartup: false
+  "exception-reporting":
+    userId: "7c0a3c52-795c-5e20-5323-64efcf91f212"
+	openEmptyEditorOnStart: false
\ No newline at end of file
diff --git a/spec/integration/startup-spec.coffee b/spec/integration/startup-spec.coffee
index d2583ed27..67f4dc0a8 100644
--- a/spec/integration/startup-spec.coffee
+++ b/spec/integration/startup-spec.coffee
@@ -196,6 +196,13 @@ describe "Starting Atom", ->
           , 5000)
           .waitForExist("atom-workspace")
           .waitForPaneItemCount(1, 5000)
+          
+    it "doesn't open a new window if openEmptyEditorOnStart is disabled", ->
+      fs.writeFileSync(path.join(atomHome, 'config.cson'), fs.readFileSync(path.join(__dirname, 'fixtures', 'atom-home', 'config-openEmptyEditorOnStart.cson')))
+      runAtom [], {ATOM_HOME: atomHome}, (client) ->
+        client
+          .waitForExist("atom-workspace")
+          .waitForPaneItemCount(0, 5000)
 
     it "reopens any previously opened windows", ->
       runAtom [tempDirPath], {ATOM_HOME: atomHome}, (client) ->