diff --git a/test/common/tmpdir.js b/test/common/tmpdir.js
index 16d375afff06b1..0b8465bb22fc73 100644
--- a/test/common/tmpdir.js
+++ b/test/common/tmpdir.js
@@ -36,60 +36,12 @@ function rimrafSync(pathname, { spawn = true } = {}) {
     }
   }
 
-  try {
-    if (st.isDirectory())
-      rmdirSync(pathname, null);
-    else
-      fs.unlinkSync(pathname);
-  } catch (e) {
-    debug(e);
-    switch (e.code) {
-      case 'ENOENT':
-        // It's not there anymore. Work is done. Exiting.
-        return;
-
-      case 'EPERM':
-        // This can happen, try again with `rmdirSync`.
-        break;
-
-      case 'EISDIR':
-        // Got 'EISDIR' even after testing `st.isDirectory()`...
-        // Try again with `rmdirSync`.
-        break;
-
-      default:
-        throw e;
-    }
-    rmdirSync(pathname, e);
-  }
+  fs.rmdirSync(pathname, { recursive: true, maxRetries: 5 });
 
   if (fs.existsSync(pathname))
     throw new Error(`Unable to rimraf ${pathname}`);
 }
 
-function rmdirSync(p, originalEr) {
-  try {
-    fs.rmdirSync(p);
-  } catch (e) {
-    if (e.code === 'ENOTDIR')
-      throw originalEr;
-    if (e.code === 'ENOTEMPTY' || e.code === 'EEXIST' || e.code === 'EPERM') {
-      const enc = process.platform === 'linux' ? 'buffer' : 'utf8';
-      fs.readdirSync(p, enc).forEach((f) => {
-        if (f instanceof Buffer) {
-          const buf = Buffer.concat([Buffer.from(p), Buffer.from(path.sep), f]);
-          rimrafSync(buf);
-        } else {
-          rimrafSync(path.join(p, f));
-        }
-      });
-      fs.rmdirSync(p);
-      return;
-    }
-    throw e;
-  }
-}
-
 const testRoot = process.env.NODE_TEST_DIR ?
   fs.realpathSync(process.env.NODE_TEST_DIR) : path.resolve(__dirname, '..');