diff --git a/package.json b/package.json
index e24562bc8..9c5b5c6d1 100644
--- a/package.json
+++ b/package.json
@@ -61,8 +61,7 @@
     "express-session": "^1.15.2",
     "fatfs": "^0.10.4",
     "from2": "^2.3.0",
-    "fs-extra": "^2.1.2",
-    "fs-promise": "^2.0.3",
+    "fs-extra": "^3.0.1",
     "golike-defer": "^0.0.0",
     "hashy": "~0.6.1",
     "helmet": "^3.6.0",
diff --git a/src/api/xosan.js b/src/api/xosan.js
index f8f836190..06d3194cf 100644
--- a/src/api/xosan.js
+++ b/src/api/xosan.js
@@ -3,7 +3,7 @@ import createLogger from 'debug'
 import defer from 'golike-defer'
 import execa from 'execa'
 import fromPairs from 'lodash/fromPairs'
-import fs from 'fs-promise'
+import fs from 'fs-extra'
 import map from 'lodash/map'
 import splitLines from 'split-lines'
 import {
diff --git a/src/index.js b/src/index.js
index e8246d275..d4dbfdbc2 100644
--- a/src/index.js
+++ b/src/index.js
@@ -21,7 +21,7 @@ import {
   ensureDir,
   readdir,
   readFile
-} from 'fs-promise'
+} from 'fs-extra'
 
 import WebServer from 'http-server-plus'
 import Xo from './xo'
diff --git a/src/remote-handlers/local.js b/src/remote-handlers/local.js
index a7d922349..7f69f8c94 100644
--- a/src/remote-handlers/local.js
+++ b/src/remote-handlers/local.js
@@ -1,4 +1,4 @@
-import fs from 'fs-promise'
+import fs from 'fs-extra'
 import startsWith from 'lodash/startsWith'
 import {
   dirname,
diff --git a/src/remote-handlers/nfs.js b/src/remote-handlers/nfs.js
index 02de3b5ea..40b948f34 100644
--- a/src/remote-handlers/nfs.js
+++ b/src/remote-handlers/nfs.js
@@ -1,5 +1,5 @@
 import execa from 'execa'
-import fs from 'fs-promise'
+import fs from 'fs-extra'
 
 import LocalHandler from './local'
 import {
diff --git a/src/xo-mixins/store.js b/src/xo-mixins/store.js
index 4dafd2fb9..de5473825 100644
--- a/src/xo-mixins/store.js
+++ b/src/xo-mixins/store.js
@@ -2,7 +2,7 @@ import endsWith from 'lodash/endsWith'
 import levelup from 'level-party'
 import startsWith from 'lodash/startsWith'
 import sublevel from 'level-sublevel'
-import { ensureDir } from 'fs-promise'
+import { ensureDir } from 'fs-extra'
 
 import {
   forEach,
diff --git a/yarn.lock b/yarn.lock
index 9d571e392..043e5ffad 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2674,12 +2674,13 @@ fs-extra@^0.26.5:
     path-is-absolute "^1.0.0"
     rimraf "^2.2.8"
 
-fs-extra@^2.0.0, fs-extra@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-2.1.2.tgz#046c70163cef9aad46b0e4a7fa467fb22d71de35"
+fs-extra@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-3.0.1.tgz#3794f378c58b342ea7dbbb23095109c4b3b62291"
   dependencies:
     graceful-fs "^4.1.2"
-    jsonfile "^2.1.0"
+    jsonfile "^3.0.0"
+    universalify "^0.1.0"
 
 fs-promise@^0.4.1:
   version "0.4.1"
@@ -2696,15 +2697,6 @@ fs-promise@^0.5.0:
     mz "^2.3.1"
     thenify-all "^1.6.0"
 
-fs-promise@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/fs-promise/-/fs-promise-2.0.3.tgz#f64e4f854bcf689aa8bddcba268916db3db46854"
-  dependencies:
-    any-promise "^1.3.0"
-    fs-extra "^2.0.0"
-    mz "^2.6.0"
-    thenify-all "^1.6.0"
-
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
@@ -3235,15 +3227,7 @@ http-proxy@^1.16.2:
     eventemitter3 "1.x.x"
     requires-port "1.x.x"
 
-http-request-plus@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/http-request-plus/-/http-request-plus-0.1.1.tgz#f12e5f00d4808d5863145e9dde7b3e3274bb5e0c"
-  dependencies:
-    is-redirect "^1.0.0"
-    lodash "^4.17.4"
-    promise-toolbox "^0.8.2"
-
-http-request-plus@^0.1.3:
+http-request-plus@^0.1.1, http-request-plus@^0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/http-request-plus/-/http-request-plus-0.1.3.tgz#44b90f6d3b391cf5f21c1dbfefc115c86975cdd7"
   dependencies:
@@ -3994,6 +3978,12 @@ jsonfile@^2.1.0:
   optionalDependencies:
     graceful-fs "^4.1.6"
 
+jsonfile@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-3.0.0.tgz#92e7c7444e5ffd5fa32e6a9ae8b85034df8347d0"
+  optionalDependencies:
+    graceful-fs "^4.1.6"
+
 jsonify@~0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
@@ -4607,7 +4597,7 @@ mute-stream@0.0.5:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.5.tgz#8fbfabb0a98a253d3184331f9e8deb7372fac6c0"
 
-mz@^2.3.1, mz@^2.6.0:
+mz@^2.3.1:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/mz/-/mz-2.6.0.tgz#c8b8521d958df0a4f2768025db69c719ee4ef1ce"
   dependencies:
@@ -6541,6 +6531,10 @@ unique-stream@^2.0.2:
     json-stable-stringify "^1.0.0"
     through2-filter "^2.0.0"
 
+universalify@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.0.tgz#9eb1c4651debcc670cc94f1a75762332bb967778"
+
 unpipe@1.0.0, unpipe@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"