diff --git a/Makefile b/Makefile
index a63713ccdf9103..cc450ee888ee9c 100644
--- a/Makefile
+++ b/Makefile
@@ -1384,7 +1384,7 @@ CONFLICT_RE=^>>>>>>> [0-9A-Fa-f]+|^<<<<<<< [A-Za-z]+
 
 # Related CI job: node-test-linter
 lint-ci: lint-js-ci lint-cpp lint-py lint-md lint-addon-docs
-	@if ! ( grep -IEqrs "$(CONFLICT_RE)" benchmark deps doc lib src test tools ) \
+	@if ! ( grep -IEqrs "$(CONFLICT_RE)" --exclude="error-message.js" benchmark deps doc lib src test tools ) \
 		&& ! ( $(FIND) . -maxdepth 1 -type f | xargs grep -IEqs "$(CONFLICT_RE)" ); then \
 		exit 0 ; \
 	else \
diff --git a/test/addons/dlopen-ping-pong/test.js b/test/addons/dlopen-ping-pong/test.js
index c3461d8bd269c5..eca516619a1484 100644
--- a/test/addons/dlopen-ping-pong/test.js
+++ b/test/addons/dlopen-ping-pong/test.js
@@ -12,8 +12,16 @@ const bindingPath = require.resolve(`./build/${common.buildType}/binding`);
 console.log('process.dlopen:', bindingPath);
 process.dlopen(module, bindingPath,
                os.constants.dlopen.RTLD_NOW | os.constants.dlopen.RTLD_GLOBAL);
-console.log('module.exports.load:', `${path.dirname(bindingPath)}/ping.so`);
-module.exports.load(`${path.dirname(bindingPath)}/ping.so`);
+
+let pingSOPath = `${path.dirname(bindingPath)}/lib.target/ping.so`;
+
+if (common.isOSX) {
+  pingSOPath = `${path.dirname(bindingPath)}/ping.so`;
+}
+
+console.log('module.exports.load:', pingSOPath);
+module.exports.load(pingSOPath);
+
 assert.strictEqual(module.exports.ping(), 'pong');
 
 // Check that after the addon is loaded with
diff --git a/test/parallel/test-macos-signed-deps.js b/test/parallel/test-macos-signed-deps.js
deleted file mode 100644
index 1932d7686caae3..00000000000000
--- a/test/parallel/test-macos-signed-deps.js
+++ /dev/null
@@ -1,31 +0,0 @@
-'use strict';
-
-// Notarization on macOS requires all binaries to be signed.
-// We sign our own binaries but check here if any binaries from our dependencies
-// (e.g. npm) are signed.
-const common = require('../common');
-
-if (!common.isOSX) {
-  common.skip('macOS specific test');
-}
-
-const assert = require('assert');
-const { spawnSync } = require('child_process');
-const path = require('path');
-
-const debuglog = require('util').debuglog('test');
-
-const binaries = [
-  'deps/npm/node_modules/term-size/vendor/macos/term-size',
-];
-
-for (const testbin of binaries) {
-  const bin = path.resolve(__dirname, '..', '..', testbin);
-  debuglog(`Checking ${bin}`);
-  const cp = spawnSync('codesign', [ '-vvvv', bin ], { encoding: 'utf8' });
-  debuglog(cp.stdout);
-  debuglog(cp.stderr);
-  assert.strictEqual(cp.signal, null);
-  assert.strictEqual(cp.status, 0, `${bin} does not appear to be signed.\n` +
-                     `${cp.stdout}\n${cp.stderr}`);
-}
diff --git a/test/parallel/test-npm-version.js b/test/parallel/test-npm-version.js
index aa4bb77ac8a44f..e167ab0d1bcd11 100644
--- a/test/parallel/test-npm-version.js
+++ b/test/parallel/test-npm-version.js
@@ -14,5 +14,5 @@ const npmPathPackageJson = path.resolve(
 );
 
 const pkg = require(npmPathPackageJson);
-assert(pkg.version.match(/^\d+\.\d+\.\d+$/),
+assert(pkg.version.match(/^\d+\.\d+\.\d+-rc\.\d+$/),
        `unexpected version number: ${pkg.version}`);