diff --git a/test/unit/partials/test-plugin-storage/invalid-package/package.json b/test/unit/modules/plugin/partials/test-plugin-storage/invalid-package/package.json
similarity index 100%
rename from test/unit/partials/test-plugin-storage/invalid-package/package.json
rename to test/unit/modules/plugin/partials/test-plugin-storage/invalid-package/package.json
diff --git a/test/unit/partials/test-plugin-storage/invalid-plugin-sanity/index.js b/test/unit/modules/plugin/partials/test-plugin-storage/invalid-plugin-sanity/index.js
similarity index 100%
rename from test/unit/partials/test-plugin-storage/invalid-plugin-sanity/index.js
rename to test/unit/modules/plugin/partials/test-plugin-storage/invalid-plugin-sanity/index.js
diff --git a/test/unit/partials/test-plugin-storage/invalid-plugin-sanity/package.json b/test/unit/modules/plugin/partials/test-plugin-storage/invalid-plugin-sanity/package.json
similarity index 100%
rename from test/unit/partials/test-plugin-storage/invalid-plugin-sanity/package.json
rename to test/unit/modules/plugin/partials/test-plugin-storage/invalid-plugin-sanity/package.json
diff --git a/test/unit/partials/test-plugin-storage/invalid-plugin/index.js b/test/unit/modules/plugin/partials/test-plugin-storage/invalid-plugin/index.js
similarity index 100%
rename from test/unit/partials/test-plugin-storage/invalid-plugin/index.js
rename to test/unit/modules/plugin/partials/test-plugin-storage/invalid-plugin/index.js
diff --git a/test/unit/partials/test-plugin-storage/invalid-plugin/package.json b/test/unit/modules/plugin/partials/test-plugin-storage/invalid-plugin/package.json
similarity index 100%
rename from test/unit/partials/test-plugin-storage/invalid-plugin/package.json
rename to test/unit/modules/plugin/partials/test-plugin-storage/invalid-plugin/package.json
diff --git a/test/unit/partials/test-plugin-storage/verdaccio-es6-plugin/dummy.js b/test/unit/modules/plugin/partials/test-plugin-storage/verdaccio-es6-plugin/dummy.js
similarity index 100%
rename from test/unit/partials/test-plugin-storage/verdaccio-es6-plugin/dummy.js
rename to test/unit/modules/plugin/partials/test-plugin-storage/verdaccio-es6-plugin/dummy.js
diff --git a/test/unit/partials/test-plugin-storage/verdaccio-es6-plugin/index.js b/test/unit/modules/plugin/partials/test-plugin-storage/verdaccio-es6-plugin/index.js
similarity index 100%
rename from test/unit/partials/test-plugin-storage/verdaccio-es6-plugin/index.js
rename to test/unit/modules/plugin/partials/test-plugin-storage/verdaccio-es6-plugin/index.js
diff --git a/test/unit/partials/test-plugin-storage/verdaccio-plugin/index.js b/test/unit/modules/plugin/partials/test-plugin-storage/verdaccio-plugin/index.js
similarity index 100%
rename from test/unit/partials/test-plugin-storage/verdaccio-plugin/index.js
rename to test/unit/modules/plugin/partials/test-plugin-storage/verdaccio-plugin/index.js
diff --git a/test/unit/partials/test-plugin-storage/verdaccio-plugin/package.json b/test/unit/modules/plugin/partials/test-plugin-storage/verdaccio-plugin/package.json
similarity index 100%
rename from test/unit/partials/test-plugin-storage/verdaccio-plugin/package.json
rename to test/unit/modules/plugin/partials/test-plugin-storage/verdaccio-plugin/package.json
diff --git a/test/unit/modules/plugin_loader.spec.js b/test/unit/modules/plugin/plugin_loader.spec.js
similarity index 92%
rename from test/unit/modules/plugin_loader.spec.js
rename to test/unit/modules/plugin/plugin_loader.spec.js
index b7b5df368..6b0cb3ea3 100644
--- a/test/unit/modules/plugin_loader.spec.js
+++ b/test/unit/modules/plugin/plugin_loader.spec.js
@@ -1,12 +1,12 @@
 import path from 'path';
-import loadPlugin from '../../../src/lib/plugin-loader';
-import logger from '../../../src/lib/logger';
+import loadPlugin from '../../../../src/lib/plugin-loader';
+import logger from '../../../../src/lib/logger';
 
 logger.setup([]);
 
 describe('plugin loader', () => {
 
-  const relativePath = './partials/test-plugin-storage';
+  const relativePath = path.join(__dirname, './partials/test-plugin-storage');
   const buildConf = name => {
     return {
       self_path: path.join(__dirname, './'),