diff --git a/test/tap/bearer-token-check.js b/test/tap/bearer-token-check.js
index 3f9be6a186e5b..86602b303c9f0 100644
--- a/test/tap/bearer-token-check.js
+++ b/test/tap/bearer-token-check.js
@@ -4,8 +4,6 @@ var writeFileSync = require('graceful-fs').writeFileSync
 var fs = require('fs')
 var mkdirp = require('mkdirp')
 var http = require('http')
-var osenv = require('osenv')
-var rimraf = require('rimraf')
 const t = require('tap')
 
 var common = require('../common-tap.js')
@@ -38,7 +36,6 @@ server.on('request', (req, res) => {
   }
 })
 
-
 var contents = '@scoped:registry=' + common.registry + '\n' +
                toNerfDart(common.registry) + ':_authToken=0xabad1dea\n'
 
diff --git a/test/tap/version-commit-hooks.js b/test/tap/version-commit-hooks.js
index 568c82b46b039..028767ab4e5ba 100644
--- a/test/tap/version-commit-hooks.js
+++ b/test/tap/version-commit-hooks.js
@@ -1,10 +1,7 @@
-var fs = require('graceful-fs')
-var path = require('path')
-var osenv = require('osenv')
-var mkdirp = require('mkdirp')
-var rimraf = require('rimraf')
+const fs = require('graceful-fs')
+const path = require('path')
 const common = require('../common-tap.js')
-var pkg = common.pkg
+const pkg = common.pkg
 
 var test = require('tap').test
 var npm = require('../../')
@@ -12,7 +9,6 @@ var npm = require('../../')
 delete process.env['npm_config_commit_hooks']
 
 test('npm version <semver> with commit-hooks disabled in .npmrc', function (t) {
-  mkdirp.sync(pkg)
   var npmrc = path.resolve(pkg, '.npmrc')
   fs.writeFileSync(npmrc, 'commit-hooks=false\n', 'ascii')
   process.chdir(pkg)
@@ -57,9 +53,3 @@ test('npm version <semver> with commit-hooks enabled (default)', function (t) {
     t.end()
   })
 })
-
-test('cleanup', function (t) {
-  process.chdir(osenv.tmpdir())
-  rimraf.sync(pkg)
-  t.end()
-})
diff --git a/test/tap/version-consistent-newlines.js b/test/tap/version-consistent-newlines.js
index 4387c489e2c77..583874db7a305 100644
--- a/test/tap/version-consistent-newlines.js
+++ b/test/tap/version-consistent-newlines.js
@@ -3,11 +3,9 @@
 const common = require('../common-tap.js')
 const test = require('tap').test
 const npm = require('../../')
-const osenv = require('osenv')
 const path = require('path')
 const fs = require('fs')
 const mkdirp = require('mkdirp')
-const rimraf = require('rimraf')
 const requireInject = require('require-inject')
 
 const pkg = common.pkg
@@ -66,16 +64,7 @@ test('npm version does not alter the line endings in package.json (CRLF)', funct
   })
 })
 
-test('cleanup', function (t) {
-  process.chdir(osenv.tmpdir())
-
-  rimraf.sync(pkg)
-  t.end()
-})
-
 function setup (lineEnding) {
-  mkdirp.sync(pkg)
-  mkdirp.sync(cache)
   mkdirp.sync(gitDir)
   fs.writeFileSync(
     path.resolve(pkg, 'package.json'),
diff --git a/test/tap/version-sub-directory.js b/test/tap/version-sub-directory.js
index 809f24e79ffa5..fc4a41f36e583 100644
--- a/test/tap/version-sub-directory.js
+++ b/test/tap/version-sub-directory.js
@@ -3,8 +3,6 @@ var fs = require('fs')
 var path = require('path')
 
 var mkdirp = require('mkdirp')
-var osenv = require('osenv')
-var rimraf = require('rimraf')
 var test = require('tap').test
 
 var npm = require('../../lib/npm.js')
@@ -17,7 +15,9 @@ var cache = common.cache
 var json = { name: 'cat', version: '0.1.2' }
 
 test('npm version <semver> from a subdirectory', function (t) {
-  setup()
+  mkdirp.sync(subDirectory)
+  process.chdir(subDirectory)
+  fs.writeFileSync(packagePath, JSON.stringify(json), 'utf8')
   npmLoad()
 
   function npmLoad () {
@@ -54,22 +54,3 @@ test('npm version <semver> from a subdirectory', function (t) {
     t.end()
   }
 })
-
-test('cleanup', function (t) {
-  cleanup()
-  t.end()
-})
-
-function cleanup () {
-  // windows fix for locked files
-  process.chdir(osenv.tmpdir())
-  rimraf.sync(pkg)
-}
-
-function setup () {
-  cleanup()
-  mkdirp.sync(cache)
-  mkdirp.sync(subDirectory)
-  process.chdir(subDirectory)
-  fs.writeFileSync(packagePath, JSON.stringify(json), 'utf8')
-}