1 files changed, 19 insertions, 3 deletions
diff --git a/deps/npm/test/tap/404-private-registry.js b/deps/npm/test/tap/404-private-registry.js
index a30f61432a..a38fa02c12 100644
--- a/deps/npm/test/tap/404-private-registry.js
+++ b/deps/npm/test/tap/404-private-registry.js
@@ -1,13 +1,25 @@
-require('../common-tap')
 var test = require('tap').test
 var path = require('path')
+var mkdirp = require('mkdirp')
+var rimraf = require('rimraf')
 var common = require('../common-tap.js')
 var mr = require('npm-registry-mock')
 var server
 
 var packageName = path.basename(__filename, '.js')
+var testdir = path.join(__dirname, packageName)
+
+function setup () {
+  cleanup()
+  mkdirp.sync(testdir)
+}
+
+function cleanup () {
+  rimraf.sync(testdir)
+}
 
 test('setup', function (t) {
+  setup()
   mr({port: common.port, throwOnUnmatched: true}, function (err, s) {
     t.ifError(err, 'registry mocked successfully')
     server = s
@@ -16,8 +28,11 @@ test('setup', function (t) {
 })
 
 test('package names not mangled on error with non-root registry', function (t) {
+  server.get('/' + packageName).reply(404, {})
   common.npm(
     [
+      '--registry=' + common.registry,
+      '--cache=' + testdir,
       'cache',
       'add',
       packageName + '@*'
@@ -27,14 +42,15 @@ test('package names not mangled on error with non-root registry', function (t) {
       t.ifError(er, 'correctly handled 404')
       t.equal(code, 1, 'exited with error')
       t.match(stderr, packageName, 'should have package name in error')
+      server.done()
       t.end()
     }
   )
 })
 
 test('cleanup', function (t) {
-  t.pass('cleaned up')
-  server.done()
   server.close()
+  cleanup()
+  t.pass('cleaned up')
   t.end()
 })