This is a backport of the test fixes comprising JDK-8309740. -------------
Commit messages: - Backport 5ca4cdd2caceba9dad8025e5a8851740a3961921 Changes: https://git.openjdk.org/jdk21/pull/58/files Webrev: https://webrevs.openjdk.org/?repo=jdk21&pr=58&range=00 Issue: https://bugs.openjdk.org/browse/JDK-8309740 Stats: 21 lines in 3 files changed: 5 ins; 0 del; 16 mod Patch: https://git.openjdk.org/jdk21/pull/58.diff Fetch: git fetch https://git.openjdk.org/jdk21.git pull/58/head:pull/58 PR: https://git.openjdk.org/jdk21/pull/58
