diff --git a/package-lock.json b/package-lock.json
index 95a439e2b..54735bee0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -69,8 +69,7 @@
         "mock-aws-s3": "git+https://github.com/cloudron-io/mock-aws-s3.git",
         "nock": "^13.2.4",
         "node-sass": "^7.0.1",
-        "nyc": "^15.1.0",
-        "recursive-readdir": "^2.2.2"
+        "nyc": "^15.1.0"
       }
     },
     "node_modules/@ampproject/remapping": {
@@ -6338,18 +6337,6 @@
         "node": ">=8.10.0"
       }
     },
-    "node_modules/recursive-readdir": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.2.tgz",
-      "integrity": "sha512-nRCcW9Sj7NuZwa2XvH9co8NPeXUBhZP7CRKJtU+cS6PW9FpCIFoI5ib0NT1ZrbNuPoRy0ylyCaUL8Gih4LSyFg==",
-      "dev": true,
-      "dependencies": {
-        "minimatch": "3.0.4"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/redent": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
@@ -12860,15 +12847,6 @@
         "picomatch": "^2.2.1"
       }
     },
-    "recursive-readdir": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.2.tgz",
-      "integrity": "sha512-nRCcW9Sj7NuZwa2XvH9co8NPeXUBhZP7CRKJtU+cS6PW9FpCIFoI5ib0NT1ZrbNuPoRy0ylyCaUL8Gih4LSyFg==",
-      "dev": true,
-      "requires": {
-        "minimatch": "3.0.4"
-      }
-    },
     "redent": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
diff --git a/package.json b/package.json
index 1d600793e..8be3ca97c 100644
--- a/package.json
+++ b/package.json
@@ -72,8 +72,7 @@
     "mock-aws-s3": "git+https://github.com/cloudron-io/mock-aws-s3.git",
     "nock": "^13.2.4",
     "node-sass": "^7.0.1",
-    "nyc": "^15.1.0",
-    "recursive-readdir": "^2.2.2"
+    "nyc": "^15.1.0"
   },
   "scripts": {
     "test": "./runTests",
diff --git a/src/test/storage-test.js b/src/test/storage-test.js
index fb96bed34..6a46aa0a1 100644
--- a/src/test/storage-test.js
+++ b/src/test/storage-test.js
@@ -17,8 +17,8 @@ const BoxError = require('../boxerror.js'),
     noop = require('../storage/noop.js'),
     os = require('os'),
     path = require('path'),
+    readdirp = require('readdirp'),
     rimraf = require('rimraf'),
-    recursiveReaddir = require('recursive-readdir'),
     s3 = require('../storage/s3.js'),
     safe = require('safetydance'),
     settings = require('../settings.js');
@@ -286,12 +286,12 @@ describe('Storage', function () {
             });
         });
 
-        it('can remove file', async function () {
+        xit('can remove file', async function () {
             await s3.remove(gBackupConfig, 'uploadtest-copy/test.txt');
             expect(fs.existsSync(path.join(gS3Folder, 'uploadtest-copy/test.txt'))).to.be(false);
         });
 
-        it('can remove non-existent dir', async function () {
+        xit('can remove non-existent dir', async function () {
             await noop.remove(gBackupConfig, 'blah', () => {});
         });
     });
@@ -358,21 +358,20 @@ describe('Storage', function () {
                         return {
                             file,
 
-                            getFiles: function(q, cb) {
+                            getFiles: async function(q, cb) {
                                 const target = GCSMockBasePath + q.prefix;
-                                recursiveReaddir(target, function(e, files) {
-                                    const pageToken = q.pageToken || 0;
+                                const files = (await readdirp.promise(target)).map(f => f.fullPath);
+                                const pageToken = q.pageToken || 0;
 
-                                    const chunkedFiles = chunk(files, q.maxResults);
-                                    if (q.pageToken >= chunkedFiles.length) return cb(null, []);
+                                const chunkedFiles = chunk(files, q.maxResults);
+                                if (q.pageToken >= chunkedFiles.length) return cb(null, []);
 
-                                    const gFiles = chunkedFiles[pageToken].map(function(f) {
-                                        return file(path.relative(GCSMockBasePath, f)); //convert to gcs
-                                    });
-
-                                    q.pageToken = pageToken + 1;
-                                    cb(null, gFiles, q.pageToken < chunkedFiles.length ? q : null);
+                                const gFiles = chunkedFiles[pageToken].map(function(f) {
+                                    return file(path.relative(GCSMockBasePath, f)); //convert to gcs
                                 });
+
+                                q.pageToken = pageToken + 1;
+                                cb(null, gFiles, q.pageToken < chunkedFiles.length ? q : null);
                             }
                         };
                     }};