diff --git a/.gitignore b/.gitignore
index 7079eb9..3c3629e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
 node_modules
-test/tmp
diff --git a/test/api_brfs.js b/test/api_brfs.js
index 7897f3a..fccf0e1 100644
--- a/test/api_brfs.js
+++ b/test/api_brfs.js
@@ -9,7 +9,7 @@ var mkdirp = require('mkdirp');
 var split = require('split');
 
 var os = require('os');
-var tmpdir = path.join(__dirname, 'tmp', Math.random() + '');
+var tmpdir = path.join((os.tmpdir || os.tmpDir)(), 'watchify-' + Math.random());
 
 var files = {
     main: path.join(tmpdir, 'main.js'),
diff --git a/test/errors.js b/test/errors.js
index 521ff70..e683a87 100644
--- a/test/errors.js
+++ b/test/errors.js
@@ -9,7 +9,7 @@ var mkdirp = require('mkdirp');
 var split = require('split');
 
 var os = require('os');
-var tmpdir = path.join(__dirname, 'tmp', Math.random() + '');
+var tmpdir = path.join((os.tmpdir || os.tmpDir)(), 'watchify-' + Math.random());
 
 var file = path.join(tmpdir, 'main.js');
 
diff --git a/test/errors_transform.js b/test/errors_transform.js
index 5a4c08c..c458690 100644
--- a/test/errors_transform.js
+++ b/test/errors_transform.js
@@ -9,7 +9,7 @@ var mkdirp = require('mkdirp');
 var through = require('through2');
 
 var os = require('os');
-var tmpdir = path.join(__dirname, 'tmp', Math.random() + '');
+var tmpdir = path.join((os.tmpdir || os.tmpDir)(), 'watchify-' + Math.random());
 
 var main = path.join(tmpdir, 'main.js');
 var file = path.join(tmpdir, 'dep.jsnum');