diff --git a/docs/api.md b/docs/api.md
index 95b90d5..a7ed696 100644
--- a/docs/api.md
+++ b/docs/api.md
@@ -43,7 +43,7 @@
  Below are the settings available:
  
    - `workers`  Number of workers to spawn, defaults to the number of CPUs or `1`
-   - `working directory`  Working directory defaulting to `/`
+   - `working directory`  Working directory defaulting to the script's dir
    - `backlog`  Connection backlog, defaulting to 128
    - `socket path`  Master socket path defaulting to `./`
    - `timeout` Worker shutdown timeout in milliseconds, defaulting to `60000`
diff --git a/lib/master.js b/lib/master.js
index fde0b43..5a27160 100644
--- a/lib/master.js
+++ b/lib/master.js
@@ -45,7 +45,7 @@ var node = process.execPath
  * Options:
  *
  *   - `workers`  Number of workers to spawn, defaults to the number of CPUs
- *   - 'working directory`  Working directory defaulting to '/'
+ *   - 'working directory`  Working directory defaulting to the script's dir
  *   - 'backlog` Connection backlog, defaulting to 128
  *   - 'socket path` Master socket path defaulting to `./`
  *   - 'timeout` Worker shutdown timeout in milliseconds, defaulting to 60000
@@ -93,7 +93,7 @@ var Master = module.exports = function Master(server) {
   // defaults
   this.options = {
       'backlog': 128
-    , 'working directory': '/'
+    , 'working directory': this.dir
     , 'socket path': this.dir
     , 'timeout': 60000
   };
diff --git a/test/test.basic.js b/test/test.basic.js
index 6da238d..19ea822 100644
--- a/test/test.basic.js
+++ b/test/test.basic.js
@@ -17,6 +17,7 @@ cluster = cluster(server)
   .listen(3000);
 
 cluster.on('listening', function(){
+  process.cwd().should.include.string('cluster/test');
   http.get({ host: 'localhost', port: 3000 }, function(res){
     res.on('data', function(chunk){
       chunk.toString().should.equal('Hello World');