diff --git a/test/common/crypto-dh.js b/test/common/crypto-dh.js
new file mode 100644
index 00000000000..67e39c18347
--- /dev/null
+++ b/test/common/crypto-dh.js
@@ -0,0 +1,74 @@
+'use strict';
+
+const common = require('../common');
+if (!common.hasCrypto)
+  common.skip('missing crypto');
+
+const assert = require('assert');
+const crypto = require('crypto');
+
+// Runs diffieHellman for key pairs in both directions,
+// verifies results match, and checks both sync and async paths.
+function test({ publicKey: alicePublicKey, privateKey: alicePrivateKey },
+              { publicKey: bobPublicKey, privateKey: bobPrivateKey },
+              expectedValue) {
+  const buf1 = crypto.diffieHellman({
+    privateKey: alicePrivateKey,
+    publicKey: bobPublicKey,
+  });
+  const buf2 = crypto.diffieHellman({
+    privateKey: bobPrivateKey,
+    publicKey: alicePublicKey,
+  });
+  const buf3 = crypto.diffieHellman({
+    privateKey: bobPrivateKey,
+    publicKey: alicePrivateKey,
+  });
+  assert.deepStrictEqual(buf1, buf2);
+  assert.deepStrictEqual(buf1, buf3);
+
+  if (expectedValue !== undefined)
+    assert.deepStrictEqual(buf1, expectedValue);
+
+  // Verify async produces the same results
+  crypto.diffieHellman({
+    privateKey: alicePrivateKey,
+    publicKey: bobPublicKey,
+  }, common.mustSucceed((asyncBuf) => {
+    assert.deepStrictEqual(asyncBuf, buf1);
+  }));
+  crypto.diffieHellman({
+    privateKey: bobPrivateKey,
+    publicKey: alicePublicKey,
+  }, common.mustSucceed((asyncBuf) => {
+    assert.deepStrictEqual(asyncBuf, buf1);
+  }));
+}
+
+// Verifies diffieHellman succeeds sync and async with expected result.
+function testDH(options, expected) {
+  const syncResult = crypto.diffieHellman(options);
+  if (expected !== undefined) {
+    assert.deepStrictEqual(syncResult, expected);
+  }
+  crypto.diffieHellman(options, common.mustSucceed((asyncResult) => {
+    assert.deepStrictEqual(asyncResult, syncResult);
+  }));
+}
+
+// Verifies diffieHellman fails with expected error, both sync and async.
+function testDHError(options, expected) {
+  assert.throws(() => crypto.diffieHellman(options), expected);
+  crypto.diffieHellman(options, common.mustCall((err) => {
+    assert.ok(err);
+    for (const [key, value] of Object.entries(expected)) {
+      if (value instanceof RegExp) {
+        assert.match(err[key], value);
+      } else {
+        assert.strictEqual(err[key], value);
+      }
+    }
+  }));
+}
+
+module.exports = { test, testDH, testDHError };
diff --git a/test/parallel/parallel.status b/test/parallel/parallel.status
index 921c04d011d..9e61bd1f55d 100644
--- a/test/parallel/parallel.status
+++ b/test/parallel/parallel.status
@@ -43,9 +43,6 @@ test-http-server-request-timeout-keepalive: PASS,FLAKY
 test-cluster-dgram-1: SKIP
 
 [$arch==arm || $arch==arm64]
-# https://github.com/nodejs/node/pull/31178
-test-crypto-dh-stateless: SKIP
-test-crypto-keygen: SKIP
 # https://github.com/nodejs/node/issues/54801
 test-debugger-heap-profiler: PASS, FLAKY
 
diff --git a/test/parallel/test-crypto-dh-stateless-finite-field.js b/test/parallel/test-crypto-dh-stateless-finite-field.js
new file mode 100644
index 00000000000..d01cbc3ca7c
--- /dev/null
+++ b/test/parallel/test-crypto-dh-stateless-finite-field.js
@@ -0,0 +1,185 @@
+'use strict';
+const common = require('../common');
+if (!common.hasCrypto)
+  common.skip('missing crypto');
+
+const assert = require('assert');
+const crypto = require('crypto');
+const { hasOpenSSL, isBoringSSL } = require('../common/crypto');
+const { test, testDH, testDHError } = require('../common/crypto-dh');
+
+if (isBoringSSL)
+  common.skip('finite-field DH KeyObject import and generation unsupported by BoringSSL');
+
+{
+  const alicePrivateKey = crypto.createPrivateKey({
+    key: '-----BEGIN PRIVATE KEY-----\n' +
+       'MIIBoQIBADCB1QYJKoZIhvcNAQMBMIHHAoHBAP//////////yQ/aoiFowjTExmKL\n' +
+       'gNwc0SkCTgiKZ8x0Agu+pjsTmyJRSgh5jjQE3e+VGbPNOkMbMCsKbfJfFDdP4TVt\n' +
+       'bVHCReSFtXZiXn7G9ExC6aY37WsL/1y29Aa37e44a/taiZ+lrp8kEXxLH+ZJKGZR\n' +
+       '7ORbPcIAfLihY78FmNpINhxV05ppFj+o/STPX4NlXSPco62WHGLzViCFUrue1SkH\n' +
+       'cJaWbWcMNU5KvJgE8XRsCMojcyf//////////wIBAgSBwwKBwEh82IAVnYNf0Kjb\n' +
+       'qYSImDFyg9sH6CJ0GzRK05e6hM3dOSClFYi4kbA7Pr7zyfdn2SH6wSlNS14Jyrtt\n' +
+       'HePrRSeYl1T+tk0AfrvaLmyM56F+9B3jwt/nzqr5YxmfVdXb2aQV53VS/mm3pB2H\n' +
+       'iIt9FmvFaaOVe2DupqSr6xzbf/zyON+WF5B5HNVOWXswgpgdUsCyygs98hKy/Xje\n' +
+       'TGzJUoWInW39t0YgMXenJrkS0m6wol8Rhxx81AGgELNV7EHZqg==\n' +
+       '-----END PRIVATE KEY-----',
+    format: 'pem'
+  });
+  const alicePublicKey = crypto.createPublicKey({
+    key: '-----BEGIN PUBLIC KEY-----\n' +
+       'MIIBnzCB1QYJKoZIhvcNAQMBMIHHAoHBAP//////////yQ/aoiFowjTExmKLgNwc\n' +
+       '0SkCTgiKZ8x0Agu+pjsTmyJRSgh5jjQE3e+VGbPNOkMbMCsKbfJfFDdP4TVtbVHC\n' +
+       'ReSFtXZiXn7G9ExC6aY37WsL/1y29Aa37e44a/taiZ+lrp8kEXxLH+ZJKGZR7ORb\n' +
+       'PcIAfLihY78FmNpINhxV05ppFj+o/STPX4NlXSPco62WHGLzViCFUrue1SkHcJaW\n' +
+       'bWcMNU5KvJgE8XRsCMojcyf//////////wIBAgOBxAACgcBR7+iL5qx7aOb9K+aZ\n' +
+       'y2oLt7ST33sDKT+nxpag6cWDDWzPBKFDCJ8fr0v7yW453px8N4qi4R7SYYxFBaYN\n' +
+       'Y3JvgDg1ct2JC9sxSuUOLqSFn3hpmAjW7cS0kExIVGfdLlYtIqbhhuo45cTEbVIM\n' +
+       'rDEz8mjIlnvbWpKB9+uYmbjfVoc3leFvUBqfG2In2m23Md1swsPxr3n7g68H66JX\n' +
+       'iBJKZLQMqNdbY14G9rdKmhhTJrQjC+i7Q/wI8JPhOFzHIGA=\n' +
+       '-----END PUBLIC KEY-----',
+    format: 'pem'
+  });
+
+  const bobPrivateKey = crypto.createPrivateKey({
+    key: '-----BEGIN PRIVATE KEY-----\n' +
+       'MIIBoQIBADCB1QYJKoZIhvcNAQMBMIHHAoHBAP//////////yQ/aoiFowjTExmKL\n' +
+       'gNwc0SkCTgiKZ8x0Agu+pjsTmyJRSgh5jjQE3e+VGbPNOkMbMCsKbfJfFDdP4TVt\n' +
+       'bVHCReSFtXZiXn7G9ExC6aY37WsL/1y29Aa37e44a/taiZ+lrp8kEXxLH+ZJKGZR\n' +
+       '7ORbPcIAfLihY78FmNpINhxV05ppFj+o/STPX4NlXSPco62WHGLzViCFUrue1SkH\n' +
+       'cJaWbWcMNU5KvJgE8XRsCMojcyf//////////wIBAgSBwwKBwHxnT7Zw2Ehh1vyw\n' +
+       'eolzQFHQzyuT0y+3BF+FxK2Ox7VPguTp57wQfGHbORJ2cwCdLx2mFM7gk4tZ6COS\n' +
+       'E3Vta85a/PuhKXNLRdP79JgLnNtVtKXB+ePDS5C2GgXH1RHvqEdJh7JYnMy7Zj4P\n' +
+       'GagGtIy3dV5f4FA0B/2C97jQ1pO16ah8gSLQRKsNpTCw2rqsZusE0rK6RaYAef7H\n' +
+       'y/0tmLIsHxLIn+WK9CANqMbCWoP4I178BQaqhiOBkNyNZ0ndqA==\n' +
+       '-----END PRIVATE KEY-----',
+    format: 'pem'
+  });
+
+  const bobPublicKey = crypto.createPublicKey({
+    key: '-----BEGIN PUBLIC KEY-----\n' +
+       'MIIBoDCB1QYJKoZIhvcNAQMBMIHHAoHBAP//////////yQ/aoiFowjTExmKLgNwc\n' +
+       '0SkCTgiKZ8x0Agu+pjsTmyJRSgh5jjQE3e+VGbPNOkMbMCsKbfJfFDdP4TVtbVHC\n' +
+       'ReSFtXZiXn7G9ExC6aY37WsL/1y29Aa37e44a/taiZ+lrp8kEXxLH+ZJKGZR7ORb\n' +
+       'PcIAfLihY78FmNpINhxV05ppFj+o/STPX4NlXSPco62WHGLzViCFUrue1SkHcJaW\n' +
+       'bWcMNU5KvJgE8XRsCMojcyf//////////wIBAgOBxQACgcEAi26oq8z/GNSBm3zi\n' +
+       'gNt7SA7cArUBbTxINa9iLYWp6bxrvCKwDQwISN36/QUw8nUAe8aRyMt0oYn+y6vW\n' +
+       'Pw5OlO+TLrUelMVFaADEzoYomH0zVGb0sW4aBN8haC0mbrPt9QshgCvjr1hEPEna\n' +
+       'QFKfjzNaJRNMFFd4f2Dn8MSB4yu1xpA1T2i0JSk24vS2H55jx24xhUYtfhT2LJgK\n' +
+       'JvnaODey/xtY4Kql10ZKf43Lw6gdQC3G8opC9OxVxt9oNR7Z\n' +
+       '-----END PUBLIC KEY-----',
+    format: 'pem'
+  });
+
+  assert.throws(() => crypto.diffieHellman({ privateKey: alicePrivateKey }), {
+    name: 'TypeError',
+    code: 'ERR_INVALID_ARG_TYPE',
+  });
+
+  assert.throws(() => crypto.diffieHellman({ publicKey: alicePublicKey }), {
+    name: 'TypeError',
+    code: 'ERR_INVALID_ARG_TYPE',
+  });
+
+  const privateKey = Buffer.from(
+    '487CD880159D835FD0A8DBA9848898317283DB07E822741B344AD397BA84CDDD3920A51588' +
+  'B891B03B3EBEF3C9F767D921FAC1294D4B5E09CABB6D1DE3EB4527989754FEB64D007EBBDA' +
+  '2E6C8CE7A17EF41DE3C2DFE7CEAAF963199F55D5DBD9A415E77552FE69B7A41D87888B7D16' +
+  '6BC569A3957B60EEA6A4ABEB1CDB7FFCF238DF961790791CD54E597B3082981D52C0B2CA0B' +
+  '3DF212B2FD78DE4C6CC95285889D6DFDB746203177A726B912D26EB0A25F11871C7CD401A0' +
+  '10B355EC41D9AA', 'hex');
+  const publicKey = Buffer.from(
+    '8b6ea8abccff18d4819b7ce280db7b480edc02b5016d3c4835af622d85a9e9bc6bbc22b00d' +
+  '0c0848ddfafd0530f275007bc691c8cb74a189fecbabd63f0e4e94ef932eb51e94c5456800' +
+  'c4ce8628987d335466f4b16e1a04df21682d266eb3edf50b21802be3af58443c49da40529f' +
+  '8f335a25134c1457787f60e7f0c481e32bb5c690354f68b4252936e2f4b61f9e63c76e3185' +
+  '462d7e14f62c980a26f9da3837b2ff1b58e0aaa5d7464a7f8dcbc3a81d402dc6f28a42f4ec' +
+  '55c6df68351ed9', 'hex');
+
+  const group = crypto.getDiffieHellman('modp5');
+  const dh = crypto.createDiffieHellman(group.getPrime(), group.getGenerator());
+  dh.setPrivateKey(privateKey);
+
+  // Test simple Diffie-Hellman, no curves involved.
+  test({ publicKey: alicePublicKey, privateKey: alicePrivateKey },
+       { publicKey: bobPublicKey, privateKey: bobPrivateKey },
+       dh.computeSecret(publicKey));
+
+  test(crypto.generateKeyPairSync('dh', { group: 'modp5' }),
+       crypto.generateKeyPairSync('dh', { group: 'modp5' }));
+
+  test(crypto.generateKeyPairSync('dh', { group: 'modp5' }),
+       crypto.generateKeyPairSync('dh', { prime: group.getPrime() }));
+
+  // DH parameter mismatch tests
+  {
+    const list = [
+    // Same generator, but different primes.
+      [{ group: 'modp5' }, { group: 'modp18' }]];
+
+    // TODO(danbev): Take a closer look if there should be a check in OpenSSL3
+    // when the dh parameters differ.
+    if (!hasOpenSSL(3)) {
+    // Same primes, but different generator.
+      list.push([{ group: 'modp5' }, { prime: group.getPrime(), generator: 5 }]);
+      // Same generator, but different primes.
+      list.push([{ primeLength: 1024 }, { primeLength: 1024 }]);
+    }
+
+    for (const [params1, params2] of list) {
+      const options = {
+        privateKey: crypto.generateKeyPairSync('dh', params1).privateKey,
+        publicKey: crypto.generateKeyPairSync('dh', params2).publicKey,
+      };
+      testDHError(options, {
+        name: 'Error',
+        code: hasOpenSSL(3) ?
+          'ERR_OSSL_MISMATCHING_DOMAIN_PARAMETERS' :
+          'ERR_OSSL_EVP_DIFFERENT_PARAMETERS'
+      });
+    }
+  }
+
+  // This key combination will result in an unusually short secret, and should
+  // not cause an assertion failure.
+  {
+    const shortPrivateKey = crypto.createPrivateKey({
+      key: '-----BEGIN PRIVATE KEY-----\n' +
+         'MIIBoQIBADCB1QYJKoZIhvcNAQMBMIHHAoHBAP//////////yQ/aoiFowjTExmKL\n' +
+         'gNwc0SkCTgiKZ8x0Agu+pjsTmyJRSgh5jjQE3e+VGbPNOkMbMCsKbfJfFDdP4TVt\n' +
+         'bVHCReSFtXZiXn7G9ExC6aY37WsL/1y29Aa37e44a/taiZ+lrp8kEXxLH+ZJKGZR\n' +
+         '7ORbPcIAfLihY78FmNpINhxV05ppFj+o/STPX4NlXSPco62WHGLzViCFUrue1SkH\n' +
+         'cJaWbWcMNU5KvJgE8XRsCMojcyf//////////wIBAgSBwwKBwHu9fpiqrfJJ+tl9\n' +
+         'ujFtEWv4afub6A/1/7sgishOYN3YQ+nmWQlmPpveIY34an5dG82CTrixHwUzQTMF\n' +
+         'JaiCW3ax9+qk31f2jTNKrQznmKgopVKXF0FEJC6H79W/8Y0U14gsI9sHpovKhfou\n' +
+         'RQD0QogW7ejSwMG8hCYibfrvMm0b5PHlwimISyEKh7VtDQ1frYN/Wr9ZbiV+FePJ\n' +
+         '2j6RUKYNj1Pv+B4zdMgiLLjILAs8WUfbHciU21KSJh1izVQaUQ==\n' +
+         '-----END PRIVATE KEY-----'
+    });
+    const shortPublicKey = crypto.createPublicKey({
+      key: '-----BEGIN PUBLIC KEY-----\n' +
+         'MIIBoDCB1QYJKoZIhvcNAQMBMIHHAoHBAP//////////yQ/aoiFowjTExmKLgNwc\n' +
+         '0SkCTgiKZ8x0Agu+pjsTmyJRSgh5jjQE3e+VGbPNOkMbMCsKbfJfFDdP4TVtbVHC\n' +
+         'ReSFtXZiXn7G9ExC6aY37WsL/1y29Aa37e44a/taiZ+lrp8kEXxLH+ZJKGZR7ORb\n' +
+         'PcIAfLihY78FmNpINhxV05ppFj+o/STPX4NlXSPco62WHGLzViCFUrue1SkHcJaW\n' +
+         'bWcMNU5KvJgE8XRsCMojcyf//////////wIBAgOBxQACgcEAmG9LpD8SAA6/W7oK\n' +
+         'E4MCuuQtf5E8bqtcEAfYTOOvKyCS+eiX3TtZRsvHJjUBEyeO99PR/KrGVlkSuW52\n' +
+         'ZOSXUOFu1L/0tqHrvRVHo+QEq3OvZ3EAyJkdtSEUTztxuUrMOyJXHDc1OUdNSnk0\n' +
+         'taGX4mP3247golVx2DS4viDYs7UtaMdx03dWaP6y5StNUZQlgCIUzL7MYpC16V5y\n' +
+         'KkFrE+Kp/Z77gEjivaG6YuxVj4GPLxJYbNFVTel42oSVeKuq\n' +
+         '-----END PUBLIC KEY-----',
+      format: 'pem'
+    });
+
+    testDH({ publicKey: shortPublicKey, privateKey: shortPrivateKey },
+           Buffer.from(
+             '0099d0fa242af5db9ea7330e23937a27db041f79c581500fc7f9976' +
+           '554d59d5b9ced934778d72e19a1fefc81e9d981013198748c0b5c6c' +
+           '762985eec687dc5bec5c9367b05837daee9d0bcc29024ed7f3abba1' +
+           '2794b65a745117fb0d87bc5b1b2b68c296c3f686cc29e450e4e1239' +
+          '21f56a5733fe58aabf71f14582954059c2185d342b9b0fa10c2598a' +
+          '5426c2baee7f9a686fc1e16cd4757c852bf7225a2732250548efe28' +
+          'debc26f1acdec51efe23d20786a6f8a14d360803bbc71972e87fd3',
+             'hex'));
+  }
+}
diff --git a/test/parallel/test-crypto-dh-stateless.js b/test/parallel/test-crypto-dh-stateless.js
index 9c0270304f2..4a949d0fcb2 100644
--- a/test/parallel/test-crypto-dh-stateless.js
+++ b/test/parallel/test-crypto-dh-stateless.js
@@ -5,6 +5,7 @@ if (!common.hasCrypto)
 
 const assert = require('assert');
 const crypto = require('crypto');
+const { test, testDH, testDHError } = require('../common/crypto-dh');
 const {
   hasOpenSSL,
   isBoringSSL: commonIsBoringSSL,
@@ -152,70 +153,6 @@ assert.throws(() => crypto.diffieHellman(
   });
 }
 
-// Runs diffieHellman for key pairs in both directions,
-// verifies results match, and checks both sync and async paths.
-function test({ publicKey: alicePublicKey, privateKey: alicePrivateKey },
-              { publicKey: bobPublicKey, privateKey: bobPrivateKey },
-              expectedValue) {
-  const buf1 = crypto.diffieHellman({
-    privateKey: alicePrivateKey,
-    publicKey: bobPublicKey
-  });
-  const buf2 = crypto.diffieHellman({
-    privateKey: bobPrivateKey,
-    publicKey: alicePublicKey
-  });
-  const buf3 = crypto.diffieHellman({
-    privateKey: bobPrivateKey,
-    publicKey: alicePrivateKey
-  });
-  assert.deepStrictEqual(buf1, buf2);
-  assert.deepStrictEqual(buf1, buf3);
-
-  if (expectedValue !== undefined)
-    assert.deepStrictEqual(buf1, expectedValue);
-
-  // Verify async produces the same results
-  crypto.diffieHellman({
-    privateKey: alicePrivateKey,
-    publicKey: bobPublicKey
-  }, common.mustSucceed((asyncBuf) => {
-    assert.deepStrictEqual(asyncBuf, buf1);
-  }));
-  crypto.diffieHellman({
-    privateKey: bobPrivateKey,
-    publicKey: alicePublicKey
-  }, common.mustSucceed((asyncBuf) => {
-    assert.deepStrictEqual(asyncBuf, buf1);
-  }));
-}
-
-// Verifies diffieHellman succeeds sync and async with expected result.
-function testDH(options, expected) {
-  const syncResult = crypto.diffieHellman(options);
-  if (expected !== undefined) {
-    assert.deepStrictEqual(syncResult, expected);
-  }
-  crypto.diffieHellman(options, common.mustSucceed((asyncResult) => {
-    assert.deepStrictEqual(asyncResult, syncResult);
-  }));
-}
-
-// Verifies diffieHellman fails with expected error, both sync and async.
-function testDHError(options, expected) {
-  assert.throws(() => crypto.diffieHellman(options), expected);
-  crypto.diffieHellman(options, common.mustCall((err) => {
-    assert.ok(err);
-    for (const [key, value] of Object.entries(expected)) {
-      if (value instanceof RegExp) {
-        assert.match(err[key], value);
-      } else {
-        assert.strictEqual(err[key], value);
-      }
-    }
-  }));
-}
-
 {
   const { privateKey, publicKey } = crypto.generateKeyPairSync('ec', {
     namedCurve: 'P-256',
@@ -232,182 +169,6 @@ function testDHError(options, expected) {
   });
 }
 
-if (isBoringSSL) {
-  common.printSkipMessage('Skipping finite-field DH KeyObject import and ' +
-                          'generation tests unsupported by BoringSSL');
-} else {
-  const alicePrivateKey = crypto.createPrivateKey({
-    key: '-----BEGIN PRIVATE KEY-----\n' +
-       'MIIBoQIBADCB1QYJKoZIhvcNAQMBMIHHAoHBAP//////////yQ/aoiFowjTExmKL\n' +
-       'gNwc0SkCTgiKZ8x0Agu+pjsTmyJRSgh5jjQE3e+VGbPNOkMbMCsKbfJfFDdP4TVt\n' +
-       'bVHCReSFtXZiXn7G9ExC6aY37WsL/1y29Aa37e44a/taiZ+lrp8kEXxLH+ZJKGZR\n' +
-       '7ORbPcIAfLihY78FmNpINhxV05ppFj+o/STPX4NlXSPco62WHGLzViCFUrue1SkH\n' +
-       'cJaWbWcMNU5KvJgE8XRsCMojcyf//////////wIBAgSBwwKBwEh82IAVnYNf0Kjb\n' +
-       'qYSImDFyg9sH6CJ0GzRK05e6hM3dOSClFYi4kbA7Pr7zyfdn2SH6wSlNS14Jyrtt\n' +
-       'HePrRSeYl1T+tk0AfrvaLmyM56F+9B3jwt/nzqr5YxmfVdXb2aQV53VS/mm3pB2H\n' +
-       'iIt9FmvFaaOVe2DupqSr6xzbf/zyON+WF5B5HNVOWXswgpgdUsCyygs98hKy/Xje\n' +
-       'TGzJUoWInW39t0YgMXenJrkS0m6wol8Rhxx81AGgELNV7EHZqg==\n' +
-       '-----END PRIVATE KEY-----',
-    format: 'pem'
-  });
-  const alicePublicKey = crypto.createPublicKey({
-    key: '-----BEGIN PUBLIC KEY-----\n' +
-       'MIIBnzCB1QYJKoZIhvcNAQMBMIHHAoHBAP//////////yQ/aoiFowjTExmKLgNwc\n' +
-       '0SkCTgiKZ8x0Agu+pjsTmyJRSgh5jjQE3e+VGbPNOkMbMCsKbfJfFDdP4TVtbVHC\n' +
-       'ReSFtXZiXn7G9ExC6aY37WsL/1y29Aa37e44a/taiZ+lrp8kEXxLH+ZJKGZR7ORb\n' +
-       'PcIAfLihY78FmNpINhxV05ppFj+o/STPX4NlXSPco62WHGLzViCFUrue1SkHcJaW\n' +
-       'bWcMNU5KvJgE8XRsCMojcyf//////////wIBAgOBxAACgcBR7+iL5qx7aOb9K+aZ\n' +
-       'y2oLt7ST33sDKT+nxpag6cWDDWzPBKFDCJ8fr0v7yW453px8N4qi4R7SYYxFBaYN\n' +
-       'Y3JvgDg1ct2JC9sxSuUOLqSFn3hpmAjW7cS0kExIVGfdLlYtIqbhhuo45cTEbVIM\n' +
-       'rDEz8mjIlnvbWpKB9+uYmbjfVoc3leFvUBqfG2In2m23Md1swsPxr3n7g68H66JX\n' +
-       'iBJKZLQMqNdbY14G9rdKmhhTJrQjC+i7Q/wI8JPhOFzHIGA=\n' +
-       '-----END PUBLIC KEY-----',
-    format: 'pem'
-  });
-
-  const bobPrivateKey = crypto.createPrivateKey({
-    key: '-----BEGIN PRIVATE KEY-----\n' +
-       'MIIBoQIBADCB1QYJKoZIhvcNAQMBMIHHAoHBAP//////////yQ/aoiFowjTExmKL\n' +
-       'gNwc0SkCTgiKZ8x0Agu+pjsTmyJRSgh5jjQE3e+VGbPNOkMbMCsKbfJfFDdP4TVt\n' +
-       'bVHCReSFtXZiXn7G9ExC6aY37WsL/1y29Aa37e44a/taiZ+lrp8kEXxLH+ZJKGZR\n' +
-       '7ORbPcIAfLihY78FmNpINhxV05ppFj+o/STPX4NlXSPco62WHGLzViCFUrue1SkH\n' +
-       'cJaWbWcMNU5KvJgE8XRsCMojcyf//////////wIBAgSBwwKBwHxnT7Zw2Ehh1vyw\n' +
-       'eolzQFHQzyuT0y+3BF+FxK2Ox7VPguTp57wQfGHbORJ2cwCdLx2mFM7gk4tZ6COS\n' +
-       'E3Vta85a/PuhKXNLRdP79JgLnNtVtKXB+ePDS5C2GgXH1RHvqEdJh7JYnMy7Zj4P\n' +
-       'GagGtIy3dV5f4FA0B/2C97jQ1pO16ah8gSLQRKsNpTCw2rqsZusE0rK6RaYAef7H\n' +
-       'y/0tmLIsHxLIn+WK9CANqMbCWoP4I178BQaqhiOBkNyNZ0ndqA==\n' +
-       '-----END PRIVATE KEY-----',
-    format: 'pem'
-  });
-
-  const bobPublicKey = crypto.createPublicKey({
-    key: '-----BEGIN PUBLIC KEY-----\n' +
-       'MIIBoDCB1QYJKoZIhvcNAQMBMIHHAoHBAP//////////yQ/aoiFowjTExmKLgNwc\n' +
-       '0SkCTgiKZ8x0Agu+pjsTmyJRSgh5jjQE3e+VGbPNOkMbMCsKbfJfFDdP4TVtbVHC\n' +
-       'ReSFtXZiXn7G9ExC6aY37WsL/1y29Aa37e44a/taiZ+lrp8kEXxLH+ZJKGZR7ORb\n' +
-       'PcIAfLihY78FmNpINhxV05ppFj+o/STPX4NlXSPco62WHGLzViCFUrue1SkHcJaW\n' +
-       'bWcMNU5KvJgE8XRsCMojcyf//////////wIBAgOBxQACgcEAi26oq8z/GNSBm3zi\n' +
-       'gNt7SA7cArUBbTxINa9iLYWp6bxrvCKwDQwISN36/QUw8nUAe8aRyMt0oYn+y6vW\n' +
-       'Pw5OlO+TLrUelMVFaADEzoYomH0zVGb0sW4aBN8haC0mbrPt9QshgCvjr1hEPEna\n' +
-       'QFKfjzNaJRNMFFd4f2Dn8MSB4yu1xpA1T2i0JSk24vS2H55jx24xhUYtfhT2LJgK\n' +
-       'JvnaODey/xtY4Kql10ZKf43Lw6gdQC3G8opC9OxVxt9oNR7Z\n' +
-       '-----END PUBLIC KEY-----',
-    format: 'pem'
-  });
-
-  assert.throws(() => crypto.diffieHellman({ privateKey: alicePrivateKey }), {
-    name: 'TypeError',
-    code: 'ERR_INVALID_ARG_TYPE',
-  });
-
-  assert.throws(() => crypto.diffieHellman({ publicKey: alicePublicKey }), {
-    name: 'TypeError',
-    code: 'ERR_INVALID_ARG_TYPE',
-  });
-
-  const privateKey = Buffer.from(
-    '487CD880159D835FD0A8DBA9848898317283DB07E822741B344AD397BA84CDDD3920A51588' +
-  'B891B03B3EBEF3C9F767D921FAC1294D4B5E09CABB6D1DE3EB4527989754FEB64D007EBBDA' +
-  '2E6C8CE7A17EF41DE3C2DFE7CEAAF963199F55D5DBD9A415E77552FE69B7A41D87888B7D16' +
-  '6BC569A3957B60EEA6A4ABEB1CDB7FFCF238DF961790791CD54E597B3082981D52C0B2CA0B' +
-  '3DF212B2FD78DE4C6CC95285889D6DFDB746203177A726B912D26EB0A25F11871C7CD401A0' +
-  '10B355EC41D9AA', 'hex');
-  const publicKey = Buffer.from(
-    '8b6ea8abccff18d4819b7ce280db7b480edc02b5016d3c4835af622d85a9e9bc6bbc22b00d' +
-  '0c0848ddfafd0530f275007bc691c8cb74a189fecbabd63f0e4e94ef932eb51e94c5456800' +
-  'c4ce8628987d335466f4b16e1a04df21682d266eb3edf50b21802be3af58443c49da40529f' +
-  '8f335a25134c1457787f60e7f0c481e32bb5c690354f68b4252936e2f4b61f9e63c76e3185' +
-  '462d7e14f62c980a26f9da3837b2ff1b58e0aaa5d7464a7f8dcbc3a81d402dc6f28a42f4ec' +
-  '55c6df68351ed9', 'hex');
-
-  const group = crypto.getDiffieHellman('modp5');
-  const dh = crypto.createDiffieHellman(group.getPrime(), group.getGenerator());
-  dh.setPrivateKey(privateKey);
-
-  // Test simple Diffie-Hellman, no curves involved.
-  test({ publicKey: alicePublicKey, privateKey: alicePrivateKey },
-       { publicKey: bobPublicKey, privateKey: bobPrivateKey },
-       dh.computeSecret(publicKey));
-
-  test(crypto.generateKeyPairSync('dh', { group: 'modp5' }),
-       crypto.generateKeyPairSync('dh', { group: 'modp5' }));
-
-  test(crypto.generateKeyPairSync('dh', { group: 'modp5' }),
-       crypto.generateKeyPairSync('dh', { prime: group.getPrime() }));
-
-  // DH parameter mismatch tests
-  {
-    const list = [
-    // Same generator, but different primes.
-      [{ group: 'modp5' }, { group: 'modp18' }]];
-
-    // TODO(danbev): Take a closer look if there should be a check in OpenSSL3
-    // when the dh parameters differ.
-    if (!hasOpenSSL(3)) {
-    // Same primes, but different generator.
-      list.push([{ group: 'modp5' }, { prime: group.getPrime(), generator: 5 }]);
-      // Same generator, but different primes.
-      list.push([{ primeLength: 1024 }, { primeLength: 1024 }]);
-    }
-
-    for (const [params1, params2] of list) {
-      const options = {
-        privateKey: crypto.generateKeyPairSync('dh', params1).privateKey,
-        publicKey: crypto.generateKeyPairSync('dh', params2).publicKey,
-      };
-      testDHError(options, {
-        name: 'Error',
-        code: hasOpenSSL(3) ?
-          'ERR_OSSL_MISMATCHING_DOMAIN_PARAMETERS' :
-          'ERR_OSSL_EVP_DIFFERENT_PARAMETERS'
-      });
-    }
-  }
-
-  // This key combination will result in an unusually short secret, and should
-  // not cause an assertion failure.
-  {
-    const shortPrivateKey = crypto.createPrivateKey({
-      key: '-----BEGIN PRIVATE KEY-----\n' +
-         'MIIBoQIBADCB1QYJKoZIhvcNAQMBMIHHAoHBAP//////////yQ/aoiFowjTExmKL\n' +
-         'gNwc0SkCTgiKZ8x0Agu+pjsTmyJRSgh5jjQE3e+VGbPNOkMbMCsKbfJfFDdP4TVt\n' +
-         'bVHCReSFtXZiXn7G9ExC6aY37WsL/1y29Aa37e44a/taiZ+lrp8kEXxLH+ZJKGZR\n' +
-         '7ORbPcIAfLihY78FmNpINhxV05ppFj+o/STPX4NlXSPco62WHGLzViCFUrue1SkH\n' +
-         'cJaWbWcMNU5KvJgE8XRsCMojcyf//////////wIBAgSBwwKBwHu9fpiqrfJJ+tl9\n' +
-         'ujFtEWv4afub6A/1/7sgishOYN3YQ+nmWQlmPpveIY34an5dG82CTrixHwUzQTMF\n' +
-         'JaiCW3ax9+qk31f2jTNKrQznmKgopVKXF0FEJC6H79W/8Y0U14gsI9sHpovKhfou\n' +
-         'RQD0QogW7ejSwMG8hCYibfrvMm0b5PHlwimISyEKh7VtDQ1frYN/Wr9ZbiV+FePJ\n' +
-         '2j6RUKYNj1Pv+B4zdMgiLLjILAs8WUfbHciU21KSJh1izVQaUQ==\n' +
-         '-----END PRIVATE KEY-----'
-    });
-    const shortPublicKey = crypto.createPublicKey({
-      key: '-----BEGIN PUBLIC KEY-----\n' +
-         'MIIBoDCB1QYJKoZIhvcNAQMBMIHHAoHBAP//////////yQ/aoiFowjTExmKLgNwc\n' +
-         '0SkCTgiKZ8x0Agu+pjsTmyJRSgh5jjQE3e+VGbPNOkMbMCsKbfJfFDdP4TVtbVHC\n' +
-         'ReSFtXZiXn7G9ExC6aY37WsL/1y29Aa37e44a/taiZ+lrp8kEXxLH+ZJKGZR7ORb\n' +
-         'PcIAfLihY78FmNpINhxV05ppFj+o/STPX4NlXSPco62WHGLzViCFUrue1SkHcJaW\n' +
-         'bWcMNU5KvJgE8XRsCMojcyf//////////wIBAgOBxQACgcEAmG9LpD8SAA6/W7oK\n' +
-         'E4MCuuQtf5E8bqtcEAfYTOOvKyCS+eiX3TtZRsvHJjUBEyeO99PR/KrGVlkSuW52\n' +
-         'ZOSXUOFu1L/0tqHrvRVHo+QEq3OvZ3EAyJkdtSEUTztxuUrMOyJXHDc1OUdNSnk0\n' +
-         'taGX4mP3247golVx2DS4viDYs7UtaMdx03dWaP6y5StNUZQlgCIUzL7MYpC16V5y\n' +
-         'KkFrE+Kp/Z77gEjivaG6YuxVj4GPLxJYbNFVTel42oSVeKuq\n' +
-         '-----END PUBLIC KEY-----',
-      format: 'pem'
-    });
-
-    testDH({ publicKey: shortPublicKey, privateKey: shortPrivateKey },
-           Buffer.from(
-             '0099d0fa242af5db9ea7330e23937a27db041f79c581500fc7f9976' +
-           '554d59d5b9ced934778d72e19a1fefc81e9d981013198748c0b5c6c' +
-           '762985eec687dc5bec5c9367b05837daee9d0bcc29024ed7f3abba1' +
-           '2794b65a745117fb0d87bc5b1b2b68c296c3f686cc29e450e4e1239' +
-          '21f56a5733fe58aabf71f14582954059c2185d342b9b0fa10c2598a' +
-          '5426c2baee7f9a686fc1e16cd4757c852bf7225a2732250548efe28' +
-          'debc26f1acdec51efe23d20786a6f8a14d360803bbc71972e87fd3',
-             'hex'));
-  }
-}
-
 // Test ECDH.
 
 test(crypto.generateKeyPairSync('ec', { namedCurve: 'P-256' }),
diff --git a/test/parallel/test-crypto-keygen-rsa-parameters.js b/test/parallel/test-crypto-keygen-rsa-parameters.js
new file mode 100644
index 00000000000..d1cb7cff8a8
--- /dev/null
+++ b/test/parallel/test-crypto-keygen-rsa-parameters.js
@@ -0,0 +1,106 @@
+'use strict';
+const common = require('../common');
+if (!common.hasCrypto)
+  common.skip('missing crypto');
+
+const assert = require('assert');
+const { generateKeyPair } = require('crypto');
+const { inspect } = require('util');
+const { hasOpenSSL, isBoringSSL } = require('../common/crypto');
+
+// Test RSA parameters.
+{
+  // Test invalid modulus lengths. (non-number)
+  for (const modulusLength of [undefined, null, 'a', true, {}, []]) {
+    assert.throws(() => generateKeyPair('rsa', {
+      modulusLength
+    }, common.mustNotCall()), {
+      name: 'TypeError',
+      code: 'ERR_INVALID_ARG_TYPE',
+      message:
+        'The "options.modulusLength" property must be of type number.' +
+        common.invalidArgTypeHelper(modulusLength)
+    });
+  }
+
+  // Test invalid modulus lengths. (non-integer)
+  for (const modulusLength of [512.1, 1.3, 1.1, 5000.9, 100.5]) {
+    assert.throws(() => generateKeyPair('rsa', {
+      modulusLength
+    }, common.mustNotCall()), {
+      name: 'RangeError',
+      code: 'ERR_OUT_OF_RANGE',
+      message:
+        'The value of "options.modulusLength" is out of range. ' +
+        'It must be an integer. ' +
+        `Received ${inspect(modulusLength)}`
+    });
+  }
+
+  // Test invalid modulus lengths. (out of range)
+  for (const modulusLength of [-1, -9, 4294967297]) {
+    assert.throws(() => generateKeyPair('rsa', {
+      modulusLength
+    }, common.mustNotCall()), {
+      name: 'RangeError',
+      code: 'ERR_OUT_OF_RANGE',
+    });
+  }
+
+  // Test invalid exponents. (non-number)
+  for (const publicExponent of ['a', true, {}, []]) {
+    assert.throws(() => generateKeyPair('rsa', {
+      modulusLength: 4096,
+      publicExponent
+    }, common.mustNotCall()), {
+      name: 'TypeError',
+      code: 'ERR_INVALID_ARG_TYPE',
+      message:
+        'The "options.publicExponent" property must be of type number.' +
+        common.invalidArgTypeHelper(publicExponent)
+    });
+  }
+
+  // Test invalid exponents. (non-integer)
+  for (const publicExponent of [3.5, 1.1, 50.5, 510.5]) {
+    assert.throws(() => generateKeyPair('rsa', {
+      modulusLength: 4096,
+      publicExponent
+    }, common.mustNotCall()), {
+      name: 'RangeError',
+      code: 'ERR_OUT_OF_RANGE',
+      message:
+        'The value of "options.publicExponent" is out of range. ' +
+        'It must be an integer. ' +
+        `Received ${inspect(publicExponent)}`
+    });
+  }
+
+  // Test invalid exponents. (out of range)
+  for (const publicExponent of [-5, -3, 4294967297]) {
+    assert.throws(() => generateKeyPair('rsa', {
+      modulusLength: 4096,
+      publicExponent
+    }, common.mustNotCall()), {
+      name: 'RangeError',
+      code: 'ERR_OUT_OF_RANGE',
+    });
+  }
+
+  // Test invalid exponents. (caught by OpenSSL)
+  let invalidExponentError = /bad e value/;
+  if (isBoringSSL) {
+    invalidExponentError = /BAD_E_VALUE/;
+  } else if (hasOpenSSL(3)) {
+    invalidExponentError = /exponent/;
+  }
+  for (const publicExponent of [1, 1 + 0x10001]) {
+    generateKeyPair('rsa', {
+      modulusLength: 4096,
+      publicExponent
+    }, common.mustCall((err) => {
+      assert.strictEqual(err.name, 'Error');
+      assert.match(err.message, invalidExponentError);
+    }));
+  }
+}
diff --git a/test/parallel/test-crypto-keygen.js b/test/parallel/test-crypto-keygen.js
index a68c7c07c93..d41dc345835 100644
--- a/test/parallel/test-crypto-keygen.js
+++ b/test/parallel/test-crypto-keygen.js
@@ -15,7 +15,6 @@ const {
 const { inspect } = require('util');
 
 const {
-  hasOpenSSL,
   isBoringSSL: commonIsBoringSSL,
 } = require('../common/crypto');
 const isBoringSSL = commonIsBoringSSL;
@@ -299,103 +298,6 @@ const isBoringSSL = commonIsBoringSSL;
   }
 }
 
-// Test RSA parameters.
-{
-  // Test invalid modulus lengths. (non-number)
-  for (const modulusLength of [undefined, null, 'a', true, {}, []]) {
-    assert.throws(() => generateKeyPair('rsa', {
-      modulusLength
-    }, common.mustNotCall()), {
-      name: 'TypeError',
-      code: 'ERR_INVALID_ARG_TYPE',
-      message:
-        'The "options.modulusLength" property must be of type number.' +
-        common.invalidArgTypeHelper(modulusLength)
-    });
-  }
-
-  // Test invalid modulus lengths. (non-integer)
-  for (const modulusLength of [512.1, 1.3, 1.1, 5000.9, 100.5]) {
-    assert.throws(() => generateKeyPair('rsa', {
-      modulusLength
-    }, common.mustNotCall()), {
-      name: 'RangeError',
-      code: 'ERR_OUT_OF_RANGE',
-      message:
-        'The value of "options.modulusLength" is out of range. ' +
-        'It must be an integer. ' +
-        `Received ${inspect(modulusLength)}`
-    });
-  }
-
-  // Test invalid modulus lengths. (out of range)
-  for (const modulusLength of [-1, -9, 4294967297]) {
-    assert.throws(() => generateKeyPair('rsa', {
-      modulusLength
-    }, common.mustNotCall()), {
-      name: 'RangeError',
-      code: 'ERR_OUT_OF_RANGE',
-    });
-  }
-
-  // Test invalid exponents. (non-number)
-  for (const publicExponent of ['a', true, {}, []]) {
-    assert.throws(() => generateKeyPair('rsa', {
-      modulusLength: 4096,
-      publicExponent
-    }, common.mustNotCall()), {
-      name: 'TypeError',
-      code: 'ERR_INVALID_ARG_TYPE',
-      message:
-        'The "options.publicExponent" property must be of type number.' +
-        common.invalidArgTypeHelper(publicExponent)
-    });
-  }
-
-  // Test invalid exponents. (non-integer)
-  for (const publicExponent of [3.5, 1.1, 50.5, 510.5]) {
-    assert.throws(() => generateKeyPair('rsa', {
-      modulusLength: 4096,
-      publicExponent
-    }, common.mustNotCall()), {
-      name: 'RangeError',
-      code: 'ERR_OUT_OF_RANGE',
-      message:
-        'The value of "options.publicExponent" is out of range. ' +
-        'It must be an integer. ' +
-        `Received ${inspect(publicExponent)}`
-    });
-  }
-
-  // Test invalid exponents. (out of range)
-  for (const publicExponent of [-5, -3, 4294967297]) {
-    assert.throws(() => generateKeyPair('rsa', {
-      modulusLength: 4096,
-      publicExponent
-    }, common.mustNotCall()), {
-      name: 'RangeError',
-      code: 'ERR_OUT_OF_RANGE',
-    });
-  }
-
-  // Test invalid exponents. (caught by OpenSSL)
-  let invalidExponentError = /bad e value/;
-  if (isBoringSSL) {
-    invalidExponentError = /BAD_E_VALUE/;
-  } else if (hasOpenSSL(3)) {
-    invalidExponentError = /exponent/;
-  }
-  for (const publicExponent of [1, 1 + 0x10001]) {
-    generateKeyPair('rsa', {
-      modulusLength: 4096,
-      publicExponent
-    }, common.mustCall((err) => {
-      assert.strictEqual(err.name, 'Error');
-      assert.match(err.message, invalidExponentError);
-    }));
-  }
-}
-
 // Test DSA parameters.
 {
   // Test invalid modulus lengths. (non-number)