diff --git a/benchmark/browser-process-startup.coffee b/benchmark/browser-process-startup.coffee
index 06f2a0d48..53748f5d0 100755
--- a/benchmark/browser-process-startup.coffee
+++ b/benchmark/browser-process-startup.coffee
@@ -8,7 +8,7 @@ _ = require 'underscore-plus'
 temp = require 'temp'
 
 directoryToOpen = temp.mkdirSync('browser-process-startup-')
-socketPath = path.join(os.tmpdir(), 'atom.sock')
+socketPath = path.join(os.tmpdir(), "atom_#{process.env['USER']}.sock")
 numberOfRuns = 10
 
 deleteSocketFile = ->
diff --git a/spec/integration/helpers/start-atom.coffee b/spec/integration/helpers/start-atom.coffee
index b5f5a8c1f..9d57e93ae 100644
--- a/spec/integration/helpers/start-atom.coffee
+++ b/spec/integration/helpers/start-atom.coffee
@@ -9,7 +9,7 @@ webdriverio = require "../../../build/node_modules/webdriverio"
 AtomPath = remote.process.argv[0]
 AtomLauncherPath = path.join(__dirname, "..", "helpers", "atom-launcher.sh")
 ChromedriverPath = path.resolve(__dirname, '..', '..', '..', 'atom-shell', 'chromedriver', 'chromedriver')
-SocketPath = path.join(temp.mkdirSync("socket-dir"), "atom.sock")
+SocketPath = path.join(temp.mkdirSync("socket-dir"), "atom_#{process.env['USER']}.sock")
 ChromedriverPort = 9515
 
 buildAtomClient = (args, env) ->
diff --git a/src/browser/atom-application.coffee b/src/browser/atom-application.coffee
index 1ecbe9570..138448f52 100644
--- a/src/browser/atom-application.coffee
+++ b/src/browser/atom-application.coffee
@@ -18,7 +18,7 @@ DefaultSocketPath =
   if process.platform is 'win32'
     '\\\\.\\pipe\\atom-sock'
   else
-    path.join(os.tmpdir(), 'atom.sock')
+    path.join(os.tmpdir(), "atom_#{process.env.USER}.sock")
 
 # The application's singleton class.
 #