diff --git a/package.json b/package.json
index 1b4f0d09..28c729e9 100644
--- a/package.json
+++ b/package.json
@@ -164,6 +164,7 @@
     "babel-plugin-transform-object-assign": "^6.22.0",
     "babel-preset-env": "^1.6.0",
     "clean-css-loader": "^0.1.2",
+    "clear-module": "^2.1.0",
     "coveralls": "^3.0.0",
     "css-loader": "^0.28.4",
     "emitify": "^3.0.2",
diff --git a/test/server/validate.js b/test/server/validate.js
index 676588aa..866c5080 100644
--- a/test/server/validate.js
+++ b/test/server/validate.js
@@ -13,6 +13,8 @@ const validatePath = `${dir}/server/validate`;
 const exitPath = `${dir}/server/exit`;
 
 const validate = require(validatePath);
+const stub = require('mock-require');
+const clear = require('clear-module');
 
 test('validate: root: bad', (t) => {
     const config = {
@@ -106,11 +108,7 @@ test('validate: editor: not valid', (t) => {
 });
 
 function clean() {
-    delete require.cache[require.resolve(validatePath)];
-    delete require.cache[require.resolve(exitPath)];
-}
-
-function stub(name, fn) {
-    require.cache[require.resolve(name)].exports = fn;
+    clear(validatePath);
+    clear(exitPath);
 }