diff --git a/src/test/common.js b/src/test/common.js
index 30753d375..fcf334b73 100644
--- a/src/test/common.js
+++ b/src/test/common.js
@@ -11,7 +11,6 @@ const apps = require('../apps.js'),
     mailer = require('../mailer.js'),
     nock = require('nock'),
     path = require('path'),
-    rimraf = require('rimraf'),
     settings = require('../settings.js'),
     tasks = require('../tasks.js'),
     users = require('../users.js');
@@ -136,7 +135,7 @@ exports = module.exports = {
 };
 
 function createTree(root, obj) {
-    rimraf.sync(root);
+    fs.rmSync(root, { recursive: true, force: true });
     fs.mkdirSync(root, { recursive: true });
 
     function createSubTree(tree, curpath) {
diff --git a/src/test/storage-test.js b/src/test/storage-test.js
index 2678667df..2ff99120c 100644
--- a/src/test/storage-test.js
+++ b/src/test/storage-test.js
@@ -18,7 +18,6 @@ const BoxError = require('../boxerror.js'),
     os = require('os'),
     path = require('path'),
     readdirp = require('readdirp'),
-    rimraf = require('rimraf'),
     s3 = require('../storage/s3.js'),
     safe = require('safetydance'),
     settings = require('../settings.js');
@@ -52,7 +51,7 @@ describe('Storage', function () {
         });
 
         after(function (done) {
-            rimraf.sync(gTmpFolder);
+            fs.rmSync(gTmpFolder, { recursive: true, force: true });
             done();
         });
 
@@ -217,7 +216,7 @@ describe('Storage', function () {
 
         before(function () {
             MockS3.config.basePath = path.join(os.tmpdir(), 's3-backup-test-buckets/');
-            rimraf.sync(MockS3.config.basePath);
+            fs.rmSync(MockS3.config.basePath, { recursive: true, force: true });
             gS3Folder = path.join(MockS3.config.basePath, gBackupConfig.bucket);
 
             s3._mockInject(MockS3);
@@ -225,7 +224,7 @@ describe('Storage', function () {
 
         after(function () {
             s3._mockRestore();
-            rimraf.sync(MockS3.config.basePath);
+            fs.rmSync(MockS3.config.basePath, { recursive: true, force: true });
         });
 
         it('can upload', function (done) {
@@ -367,7 +366,7 @@ describe('Storage', function () {
 
         after(function (done) {
             gcs._mockRestore();
-            rimraf.sync(GCSMockBasePath);
+            fs.rmSync(GCSMockBasePath, { recursive: true, force: true });
             done();
         });