diff --git a/eslint.config.js b/eslint.config.js
index 10e67b91..6493cff9 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -42,5 +42,22 @@ export default [
       'n/no-process-exit': 'off',
       'n/no-unsupported-features/node-builtins': 'off',
     },
+    settings: {
+      'import/resolver': {
+        node: {
+          pathFilter(pkg, path, relativePath) {
+            const pkgExport = relativePath
+              ? pkg.exports?.[`./${relativePath}`]
+              : pkg.exports?.['.'];
+            return pkgExport?.import?.default ??
+                   pkgExport?.import ??
+                   pkgExport?.[0]?.import ??
+                   pkgExport?.default ??
+                   pkgExport ??
+                   (relativePath || pkg.main);
+          },
+        },
+      },
+    },
   },
 ];
diff --git a/lib/voting_session.js b/lib/voting_session.js
index 02b035a2..e3d349fe 100644
--- a/lib/voting_session.js
+++ b/lib/voting_session.js
@@ -10,7 +10,6 @@ import {
   getEditor, isGhAvailable
 } from './utils.js';
 
-// eslint-disable-next-line import/no-unresolved
 import voteUsingGit from '@node-core/caritat/voteUsingGit';
 import * as yaml from 'js-yaml';
 
diff --git a/test/unit/ci_start.test.js b/test/unit/ci_start.test.js
index 154356e4..cd8df818 100644
--- a/test/unit/ci_start.test.js
+++ b/test/unit/ci_start.test.js
@@ -1,8 +1,7 @@
-/* eslint-disable import/no-named-as-default-member */
 import { describe, it, before, afterEach } from 'node:test';
 import assert from 'assert';
 
-import sinon from 'sinon';
+import * as sinon from 'sinon';
 import { FormData } from 'undici';
 
 import {
diff --git a/test/unit/pr_checker.test.js b/test/unit/pr_checker.test.js
index bd98c6e4..eff5812b 100644
--- a/test/unit/pr_checker.test.js
+++ b/test/unit/pr_checker.test.js
@@ -1,8 +1,7 @@
-/* eslint-disable import/no-named-as-default-member */
 import { describe, it, before, after, afterEach } from 'node:test';
 import assert from 'node:assert';
 
-import sinon from 'sinon';
+import * as sinon from 'sinon';
 
 import PRData from '../../lib/pr_data.js';
 import PRChecker from '../../lib/pr_checker.js';
diff --git a/test/unit/pr_data.test.js b/test/unit/pr_data.test.js
index 1b4870ff..86f7b31d 100644
--- a/test/unit/pr_data.test.js
+++ b/test/unit/pr_data.test.js
@@ -1,8 +1,7 @@
-/* eslint-disable import/no-named-as-default-member */
 import { describe, it } from 'node:test';
 import assert from 'node:assert';
 
-import sinon from 'sinon';
+import * as sinon from 'sinon';
 
 import PRData from '../../lib/pr_data.js';
 
diff --git a/test/unit/team_info.test.js b/test/unit/team_info.test.js
index a696204a..89e7e1f6 100644
--- a/test/unit/team_info.test.js
+++ b/test/unit/team_info.test.js
@@ -1,8 +1,7 @@
-/* eslint-disable import/no-named-as-default-member */
 import { describe, it, before, after } from 'node:test';
 import assert from 'node:assert';
 
-import sinon from 'sinon';
+import * as sinon from 'sinon';
 
 import TestCLI from '../fixtures/test_cli.js';
 import TeamInfo from '../../lib/team_info.js';