diff --git a/common/cloudfunc.spec.mjs b/common/cloudfunc.spec.mjs
index 6e9c4f96..79ddfedf 100644
--- a/common/cloudfunc.spec.mjs
+++ b/common/cloudfunc.spec.mjs
@@ -1,7 +1,7 @@
 import {readFileSync} from 'node:fs';
 import test from 'supertape';
 import montag from 'montag';
-import cheerio from 'cheerio';
+import * as cheerio from 'cheerio';
 import {
     _getSize,
     getPathLink,
diff --git a/server/config.spec.mjs b/server/config.spec.mjs
index 21cea8c0..3c6bbbc0 100644
--- a/server/config.spec.mjs
+++ b/server/config.spec.mjs
@@ -1,7 +1,7 @@
 import {createRequire} from 'node:module';
 import {test, stub} from 'supertape';
-import {createConfig, _cryptoPass} from './config.js';
-import {apiURL} from '../common/cloudfunc.js';
+import {createConfig, _cryptoPass} from './config.mjs';
+import {apiURL} from '../common/cloudfunc.mjs';
 import {connect} from '../test/before.mjs';
 
 const require = createRequire(import.meta.url);
diff --git a/server/distribute/export.spec.mjs b/server/distribute/export.spec.mjs
index e6dd1f8a..f234c8e7 100644
--- a/server/distribute/export.spec.mjs
+++ b/server/distribute/export.spec.mjs
@@ -1,7 +1,7 @@
 import {once} from 'node:events';
 import test from 'supertape';
 import io from 'socket.io-client';
-import Config from '../config.js';
+import * as Config from '../config.mjs';
 import {connect} from '../../test/before.mjs';
 
 const config = Config.createConfig();
diff --git a/server/distribute/log.spec.mjs b/server/distribute/log.spec.mjs
index 50e4df11..eef535e3 100644
--- a/server/distribute/log.spec.mjs
+++ b/server/distribute/log.spec.mjs
@@ -1,6 +1,6 @@
 import test from 'supertape';
 import log from './log.mjs';
-import {createConfig} from '../config.js';
+import {createConfig} from '../config.mjs';
 
 test('distribute: log: getMessage', (t) => {
     const e = 'hello';
diff --git a/server/rest/index.spec.js b/server/rest/index.spec.js
index 9ce836ef..540356ad 100644
--- a/server/rest/index.spec.js
+++ b/server/rest/index.spec.js
@@ -9,7 +9,7 @@ const {
     _isRootWin32,
     _isRootAll,
     _onPUT,
-} = require('.');
+} = require('./index.mjs');
 
 test('rest: formatMsg', (t) => {
     const result = _formatMsg('hello', 'world');
diff --git a/test/server/console.mjs b/test/server/console.mjs
index 266cce14..72984d50 100644
--- a/test/server/console.mjs
+++ b/test/server/console.mjs
@@ -1,16 +1,10 @@
-import path, {dirname} from 'node:path';
 import {once} from 'node:events';
-import {fileURLToPath} from 'node:url';
-import {createRequire} from 'node:module';
 import test from 'supertape';
 import io from 'socket.io-client';
 import {connect} from '../before.mjs';
+import {createConfig} from '../../server/config.mjs';
 
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
-const require = createRequire(import.meta.url);
-const configPath = path.join(__dirname, '../..', 'server', 'config');
-const configFn = require(configPath).createConfig();
+const configFn = createConfig();
 
 test('cloudcmd: console: enabled', async (t) => {
     const config = {
diff --git a/test/server/modulas.mjs b/test/server/modulas.mjs
index ed2f736f..c6281501 100644
--- a/test/server/modulas.mjs
+++ b/test/server/modulas.mjs
@@ -4,15 +4,14 @@ import {fileURLToPath} from 'node:url';
 import serveOnce from 'serve-once';
 import {test, stub} from 'supertape';
 import cloudcmd from '../../server/cloudcmd.mjs';
+import modulas from '../../server/modulas.mjs';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 const require = createRequire(import.meta.url);
 const cloudcmdPath = join(__dirname, '..', '..');
-
 const modulesPath = join(cloudcmdPath, 'json', 'modules.json');
 const localModules = require(modulesPath);
-const modulas = require(`../../server/modulas`);
 
 const {request} = serveOnce(cloudcmd, {
     config: {